diff --git a/rtdata/icons/rawtherapee/scalable/apps/add-small.svg b/rtdata/icons/rawtherapee/scalable/apps/add-small.svg
index 13abbdc25..9d5cb01c6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/add-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/add-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="add-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,32 +56,22 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 55,16 H 65 M 60,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4977" />
     <path
        id="path4979"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.5213637,16.478636 H 12.521364 m -5.0000003,-5 v 10"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 2.5213637,16.478636 H 12.521364 m -5.0000003,-5 v 10" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 24,16 H 34 M 29,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4981" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 39,16 H 49 M 44,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4983" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/add.svg b/rtdata/icons/rawtherapee/scalable/apps/add.svg
index 41fa7cc39..b8c21fdae 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/add.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/add.svg
@@ -2,64 +2,16 @@
 <!-- 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.91 r13725"
-   sodipodi:docname="add.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="20.683456"
-     inkscape:cy="15.839861"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     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-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -103,26 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="m 40,6.028485 v 11.94303 M 34.028485,12 h 11.94303"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4947" />
     <circle
        r="10"
        cy="12"
        cx="40"
        id="circle4949"
-       style="opacity:0.7;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path4951"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3.33607316;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 12.447464,4.4346736 0,15.1306544 M 5,12 19.89493,12"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3.33607316;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 12.447464,4.4346736 0,15.1306544 M 5,12 19.89493,12" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/aperture.svg b/rtdata/icons/rawtherapee/scalable/apps/aperture.svg
index 5820ee283..c08244c62 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/aperture.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/aperture.svg
@@ -2,68 +2,16 @@
 <!-- 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="aperture.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-global="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -74,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -107,289 +55,224 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.96076894;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.96076894;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m -21.732422,9 -1.732422,3 1.732422,3 h 3.464844 l 1.732422,-3 -1.732422,-3 z m 0.289063,0.5 h 2.886718 l 1.44336,2.5 -1.44336,2.5 h -2.886718 l -1.44336,-2.5 z"
        id="path855" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -20,1 a 11,11 0 0 0 -7.517578,2.9804688 L -23.464844,11 -22.207031,8.8222656 a 0.50005,0.50005 0 0 1 0.08008,-0.1386718 0.50005,0.50005 0 0 0 0.002,-0.00195 L -17.816406,1.21875 A 11,11 0 0 0 -20,1 Z"
        id="path887" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -16.810547,1.4765625 -20.865234,8.5 h 2.515625 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.605468 a 11,11 0 0 0 -7.224609,-7.0234375 z"
        id="path885" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -28.240234,4.7285156 A 11,11 0 0 0 -31,12 a 11,11 0 0 0 0.300781,2.5 h 8.09961 l -1.259766,-2.183594 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 z"
        id="path883" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -17.400391,9.5 1.259766,2.183594 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 4.304687,7.457032 A 11,11 0 0 0 -9,12 11,11 0 0 0 -9.300781,9.5 Z"
        id="path879" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -16.537109,13 -1.25586,2.177734 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.308594,7.462891 A 11,11 0 0 0 -20,23 a 11,11 0 0 0 7.517578,-2.980469 z"
        id="path877" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -30.414063,15.5 a 11,11 0 0 0 7.226563,7.023438 L -19.132812,15.5 h -2.517579 a 0.50005,0.50005 0 0 1 -0.158203,0 z"
        id="path853" />
     <g
        id="g934">
       <path
-         inkscape:connector-curvature="0"
          id="rect821"
          d="m 65.304688,1.4785156 c -0.716935,0 -1.378783,0.20836 -1.951172,0.5488282 L 68.535156,11 69.792969,8.8222656 a 0.50005,0.50005 0 0 1 0.08008,-0.1386718 0.50005,0.50005 0 0 0 0.002,-0.00195 l 4.158203,-7.203125 z m 9.882812,0 L 71.134766,8.5 h 2.515625 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.71289 V 5.3046875 c 0,-2.119507 -1.706663,-3.8261719 -3.826172,-3.8261719 z M 62.556641,2.6464844 C 61.891445,3.3342431 61.478516,4.267999 61.478516,5.3046875 V 14.5 h 7.921875 l -1.259766,-2.183594 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 z M 74.599609,9.5 l 1.259766,2.183594 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 5.505859,9.53711 c 0.665708,-0.68784 1.080078,-1.621064 1.080078,-2.658204 V 9.5 Z m 0.863282,3.5 -1.25586,2.177734 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.158203,7.203125 h 8.728515 c 0.715987,0 1.37733,-0.20724 1.949219,-0.546875 z m -13.984375,2.5 v 3.195312 c 0,2.119508 1.706665,3.826172 3.826172,3.826172 H 68.8125 L 72.867188,15.5 h -2.517579 a 0.50005,0.50005 0 0 1 -0.158203,0 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95796239;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.95796239;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
        d="M -53.732051,15 -62.963365,-0.98910441 M -50.267949,15 h -14.766534 m 16.498585,-3 -7.474673,12.946513 M -50.267949,9.0000001 -41.016448,25.02407 M -53.732051,9 H -39 m -16.464102,3 7.517028,-13.0198745"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path870"
-       inkscape:connector-curvature="0" />
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       id="path870" />
     <g
        id="g931">
       <path
-         inkscape:transform-center-y="-6.5"
-         inkscape:transform-center-x="2.741211"
-         inkscape:connector-curvature="0"
          id="path919"
          d="M 42,1 A 11,11 0 0 0 34.865234,3.6425781 L 38.537109,10 39.320312,8.640625 A 1.0001,1.0001 0 0 1 39.478516,8.3671875 L 43.652344,1.1386719 A 11,11 0 0 0 42,1 Z"
-         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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
       <path
-         inkscape:transform-center-y="-7.1777344"
-         inkscape:transform-center-x="-5.123047"
-         inkscape:connector-curvature="0"
          id="path917"
          d="M 45.669922,1.6445312 42,8 h 1.574219 a 1.0001,1.0001 0 0 1 0.310547,0 h 8.361328 A 11,11 0 0 0 45.669922,1.6445312 Z"
-         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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
       <path
-         inkscape:transform-center-y="-2.4326172"
-         inkscape:transform-center-x="7.2314455"
-         inkscape:connector-curvature="0"
          id="path915"
          d="M 33.417969,5.1347656 A 11,11 0 0 0 31,12 a 11,11 0 0 0 0.189453,2 h 7.347656 L 37.75,12.638672 a 1.0001,1.0001 0 0 1 -0.154297,-0.267578 l -0.002,-0.0039 z"
-         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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
       <path
-         inkscape:transform-center-y="2.4326405"
-         inkscape:transform-center-x="-7.2314455"
-         inkscape:connector-curvature="0"
          id="path911"
          d="M 45.462891,10 46.25,11.361328 a 1.0001,1.0001 0 0 1 0.15625,0.269531 1.0001,1.0001 0 0 0 0,0.002 l 4.175781,7.232422 A 11,11 0 0 0 53,12 11,11 0 0 0 52.810547,10 Z"
-         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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
       <path
-         inkscape:transform-center-y="6.5"
-         inkscape:transform-center-x="-2.740234"
-         inkscape:connector-curvature="0"
          id="path909"
          d="m 45.462891,14 -0.785157,1.361328 a 1.0001,1.0001 0 0 1 -0.15625,0.271484 l -4.173828,7.228516 A 11,11 0 0 0 42,23 11,11 0 0 0 49.132812,20.357422 Z"
-         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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
       <path
-         inkscape:transform-center-y="7.1777345"
-         inkscape:transform-center-x="5.123047"
-         inkscape:connector-curvature="0"
          id="path900"
          d="m 31.753906,16 a 11,11 0 0 0 6.576172,6.355469 L 42,16 h -1.574219 a 1.0001,1.0001 0 0 1 -0.310547,0 z"
-         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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
     </g>
     <path
        id="path970"
        d="M 12,1 A 11,11 0 0 0 4.482422,3.9804688 L 8.535156,11 9.792969,8.8222656 a 0.50005,0.50005 0 0 1 0.08008,-0.1386718 0.50005,0.50005 0 0 0 0.002,-0.00195 L 14.183594,1.21875 A 11,11 0 0 0 12,1 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
        id="path972"
        d="M 15.189453,1.4765625 11.134766,8.5 h 2.515625 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.605468 A 11,11 0 0 0 15.189453,1.4765625 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
        id="path974"
        d="M 3.759766,4.7285156 A 11,11 0 0 0 1,12 11,11 0 0 0 1.300781,14.5 h 8.09961 L 8.140625,12.316406 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
        id="path976"
        d="m 14.599609,9.5 1.259766,2.183594 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 4.304687,7.457032 A 11,11 0 0 0 23,12 11,11 0 0 0 22.699219,9.5 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
        id="path978"
        d="m 15.462891,13 -1.25586,2.177734 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.308594,7.462891 A 11,11 0 0 0 12,23 11,11 0 0 0 19.517578,20.019531 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
        id="path980"
        d="M 1.585937,15.5 A 11,11 0 0 0 8.8125,22.523438 L 12.867188,15.5 h -2.517579 a 0.50005,0.50005 0 0 1 -0.158203,0 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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.076172,8.5 h 1.574219 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.605468 A 11,11 0 0 0 19.652344,4.1269531 Z"
-       id="path1175"
-       inkscape:connector-curvature="0" />
+       id="path1175" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 15.072266,10.320312 0.787109,1.363282 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 4.304687,7.457032 A 11,11 0 0 0 22.650489,14.6934 Z"
-       id="path1171"
-       inkscape:connector-curvature="0" />
+       id="path1171" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 14.998047,13.806641 -0.791016,1.371093 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.308594,7.462891 A 11,11 0 0 0 12,23 11,11 0 0 0 14.998047,22.570312 Z"
-       id="path1167"
-       inkscape:connector-curvature="0" />
+       id="path1167" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 11.951172,15.5 h -1.601563 a 0.50005,0.50005 0 0 1 -0.158203,0 H 1.585938 a 11,11 0 0 0 2.771484,4.382812 z"
-       id="path1163"
-       inkscape:connector-curvature="0" />
+       id="path1163" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 8.943359,13.708984 8.140625,12.316406 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 -4.304687,-7.4550784 a 11,11 0 0 0 -2.414063,4.59375 z"
-       id="path1159"
-       inkscape:connector-curvature="0" />
+       id="path1159" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 8.998047,1.4296875 V 10.199219 L 9.792969,8.8222656 a 0.50005,0.50005 0 0 1 0.08008,-0.1386718 0.50005,0.50005 0 0 0 0.002,-0.00195 L 14.183594,1.21875 A 11,11 0 0 0 12,1 11,11 0 0 0 8.998047,1.4296875 Z"
-       id="path994"
-       inkscape:connector-curvature="0" />
+       id="path994" />
     <g
        id="g1152"
        transform="translate(-29.716822,3.9248032)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -88.3125,-2.875 a 11,11 0 0 0 -7.517578,2.98046874 l 4.052734,7.01953116 1.257813,-2.1777344 a 0.50005,0.50005 0 0 1 0.08008,-0.1386718 0.50005,0.50005 0 0 0 0.002,-0.00195 L -86.128906,-2.65625 A 11,11 0 0 0 -88.3125,-2.875 Z"
          id="path970-3" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -85.123047,-2.3984375 -4.054687,7.0234374 h 2.515625 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.605468 a 11,11 0 0 0 -7.224609,-7.0234374 z"
          id="path972-6" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -96.552734,0.85351554 A 11,11 0 0 0 -99.3125,8.1249999 11,11 0 0 0 -99.011719,10.625 h 8.09961 l -1.259766,-2.1835941 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 z"
          id="path974-7" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -85.712891,5.6249999 1.259766,2.183594 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 4.304687,7.4570321 a 11,11 0 0 0 2.759668,-7.2734791 11,11 0 0 0 -0.300781,-2.5 z"
          id="path976-5" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -84.849609,9.1249999 -1.25586,2.1777341 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.308594,7.462891 a 11,11 0 0 0 2.183643,0.218703 11,11 0 0 0 7.517578,-2.980469 z"
          id="path978-3" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 -98.726563,11.625 A 11,11 0 0 0 -91.5,18.648438 L -87.445312,11.625 h -2.517579 a 0.50005,0.50005 0 0 1 -0.158203,0 z"
          id="path980-5" />
       <path
          id="path1064"
          d="m -88.236328,4.6249999 7.576172,-4.37304686 a 11,11 0 0 0 -4.462891,-2.65039054 l -4.054687,7.0234374 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
          id="path1060"
          d="m -85.240234,6.4453119 7.578125,4.3730471 a 11,11 0 0 0 0.349609,-2.6933591 11,11 0 0 0 -0.300781,-2.5 h -8.09961 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
          id="path1056"
          d="m -85.314453,9.9316409 v 8.7636711 a 11,11 0 0 0 4.519531,-2.550781 l -4.054687,-7.0195311 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
          id="path1052"
          d="m -88.361328,11.625 -7.59375,4.382812 A 11,11 0 0 0 -91.5,18.648438 L -87.445312,11.625 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
          id="path1048"
          d="M -91.369141,9.8339839 -98.966797,5.4472655 A 11,11 0 0 0 -99.3125,8.1249999 11,11 0 0 0 -99.011719,10.625 h 8.09961 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
          id="path1046"
          d="m -91.314453,-2.4453125 a 11,11 0 0 0 -4.515625,2.55078124 l 4.052734,7.01953116 0.462891,-0.800781 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     </g>
     <g
        id="g1256"
        transform="translate(-10.75,7.25)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#ef8fef;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#ef8fef;fill-opacity:1.0;fill-rule:nonzero;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 22.75,19.75 a 11,11 0 0 0 -7.517578,2.980469 L 19.285156,29.75 20.542969,27.572266 a 0.50005,0.50005 0 0 1 0.08008,-0.138672 0.50005,0.50005 0 0 0 0.002,-0.002 L 24.933594,19.96875 A 11,11 0 0 0 22.75,19.75 Z"
          id="path970-6" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#ff8181;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#ff8181;fill-opacity:1.0;fill-rule:nonzero;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 25.939453,20.226563 21.884766,27.25 h 2.515625 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.605468 a 11,11 0 0 0 -7.224609,-7.023437 z"
          id="path972-2" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2020df;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#2020df;fill-opacity:1.0;fill-rule:nonzero;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 14.509766,23.478516 A 11,11 0 0 0 11.75,30.75 a 11,11 0 0 0 0.300781,2.5 h 8.09961 l -1.259766,-2.183594 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 z"
          id="path974-9" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#dfb220;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#dfb220;fill-opacity:1.0;fill-rule:nonzero;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 25.349609,28.25 1.259766,2.183594 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 4.304687,7.457032 A 11,11 0 0 0 33.75,30.75 11,11 0 0 0 33.449219,28.25 Z"
          id="path976-1" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#20df20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#20df20;fill-opacity:1.0;fill-rule:nonzero;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 26.212891,31.75 -1.25586,2.177734 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.308594,7.462891 A 11,11 0 0 0 22.75,41.75 11,11 0 0 0 30.267578,38.769531 Z"
          id="path978-2" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#20dfdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#20dfdf;fill-opacity:1.0;fill-rule:nonzero;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.335937,34.25 A 11,11 0 0 0 19.5625,41.273438 L 23.617188,34.25 h -2.517579 a 0.50005,0.50005 0 0 1 -0.158203,0 z"
          id="path980-7" />
       <path
-         inkscape:connector-curvature="0"
          id="path1175-0"
          d="m 22.826172,27.25 h 1.574219 a 0.50005,0.50005 0 0 1 0.158203,0 h 8.605468 a 11,11 0 0 0 -2.761718,-4.373047 z"
-         style="opacity:0.7;fill:#ff8181;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#ff8181;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
-         inkscape:connector-curvature="0"
          id="path1171-9"
          d="m 25.822266,29.070312 0.787109,1.363282 a 0.50005,0.50005 0 0 0 0.002,0.002 0.50005,0.50005 0 0 1 0.07227,0.126953 0.50005,0.50005 0 0 1 0.002,0.0039 l 4.304687,7.457032 A 11,11 0 0 0 33.400489,33.4434 Z"
-         style="opacity:0.7;fill:#dfb220;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#dfb220;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
-         inkscape:connector-curvature="0"
          id="path1167-3"
          d="m 25.748047,32.556641 -0.791016,1.371093 a 0.50005,0.50005 0 0 1 -0.08008,0.138672 l -0.002,0.002 -4.308594,7.462891 A 11,11 0 0 0 22.75,41.75 11,11 0 0 0 25.748047,41.320312 Z"
-         style="opacity:0.7;fill:#20df20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#20df20;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
-         inkscape:connector-curvature="0"
          id="path1163-6"
          d="m 22.701172,34.25 h -1.601563 a 0.50005,0.50005 0 0 1 -0.158203,0 h -8.605468 a 11,11 0 0 0 2.771484,4.382812 z"
-         style="opacity:0.7;fill:#20dfdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#20dfdf;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
-         inkscape:connector-curvature="0"
          id="path1159-0"
          d="m 19.693359,32.458984 -0.802734,-1.392578 a 0.50005,0.50005 0 0 0 -0.002,-0.002 0.50005,0.50005 0 0 1 -0.07227,-0.125 l -0.002,-0.0059 -4.304687,-7.455078 a 11,11 0 0 0 -2.414063,4.59375 z"
-         style="opacity:0.7;fill:#2020df;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#2020df;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
       <path
-         inkscape:connector-curvature="0"
          id="path994-6"
          d="m 19.748047,20.179688 v 8.769531 l 0.794922,-1.376953 a 0.50005,0.50005 0 0 1 0.08008,-0.138672 0.50005,0.50005 0 0 0 0.002,-0.002 L 24.933594,19.96875 A 11,11 0 0 0 22.75,19.75 11,11 0 0 0 19.748047,20.179688 Z"
-         style="opacity:0.7;fill:#ef8fef;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#ef8fef;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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/rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg
index d17ba4329..2911187fc 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow-down-small.svg
@@ -2,181 +2,122 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="arrow-down-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path841"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker1191"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1189"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutL"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutL"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path965"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path1076"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path968"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="EmptyTriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="EmptyTriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path986"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill-opacity:1.0"
          transform="scale(0.4) translate(-4.5,0)" />
     </marker>
     <marker
-       inkscape:stockid="SemiCircleOut"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="SemiCircleOut"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1004"
          d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.6) translate(7.125493,0.763446)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path850"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path826"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8) rotate(180) translate(12.5,0)" />
     </marker>
   </defs>
@@ -188,7 +129,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -222,11 +163,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 6 1 L 6 8 L 2 8 L 8 15 L 14 8 L 10 8 L 10 1 L 6 1 z "
        transform="translate(0,8)"
        id="rect1539" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/arrow-left-small.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow-left-small.svg
index 54eafbc29..cb5194185 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow-left-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow-left-small.svg
@@ -2,181 +2,122 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="arrow-left-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="11.536946"
-     inkscape:cy="8"
-     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="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path841"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker1191"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1189"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutL"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutL"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path965"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path1076"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path968"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="EmptyTriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="EmptyTriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path986"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill-opacity:1.0"
          transform="scale(0.4) translate(-4.5,0)" />
     </marker>
     <marker
-       inkscape:stockid="SemiCircleOut"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="SemiCircleOut"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1004"
          d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.6) translate(7.125493,0.763446)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path850"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path826"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8) rotate(180) translate(12.5,0)" />
     </marker>
   </defs>
@@ -188,7 +129,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -222,13 +163,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 15,14 H 8 v -4 l -7,6 7,6 v -4 h 7 z"
-       id="rect1539"
-       inkscape:connector-curvature="0" />
+       id="rect1539" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/arrow-right-small.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow-right-small.svg
index 43bfdd4e8..1b6d484e8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow-right-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow-right-small.svg
@@ -2,181 +2,122 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="arrow-right-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="11.536946"
-     inkscape:cy="6.8774521"
-     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="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path841"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker1191"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1189"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutL"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutL"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path965"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path1076"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path968"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="EmptyTriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="EmptyTriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path986"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill-opacity:1.0"
          transform="scale(0.4) translate(-4.5,0)" />
     </marker>
     <marker
-       inkscape:stockid="SemiCircleOut"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="SemiCircleOut"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1004"
          d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.6) translate(7.125493,0.763446)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path850"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path826"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8) rotate(180) translate(12.5,0)" />
     </marker>
   </defs>
@@ -188,7 +129,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -222,13 +163,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 1,18 h 7 v 4 l 7,-6 -7,-6 v 4 l -7,0 z"
-       id="rect1539"
-       inkscape:connector-curvature="0" />
+       id="rect1539" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/arrow-up-small.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow-up-small.svg
index b5609c5d7..7f3314246 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow-up-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow-up-small.svg
@@ -2,181 +2,122 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="arrow-up-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="11.536946"
-     inkscape:cy="6.8774521"
-     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="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path841"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker1191"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1189"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutL"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutL"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path965"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path1076"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path968"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="EmptyTriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="EmptyTriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path986"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         style="fill-rule:evenodd;fill:#ffffff;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill-opacity:1.0"
          transform="scale(0.4) translate(-4.5,0)" />
     </marker>
     <marker
-       inkscape:stockid="SemiCircleOut"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="SemiCircleOut"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path1004"
          d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.6) translate(7.125493,0.763446)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path850"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Lend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path826"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.8) rotate(180) translate(12.5,0)" />
     </marker>
   </defs>
@@ -188,7 +129,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -222,13 +163,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 10,23 0,-7 h 4 L 8,9 2,16 h 4 v 7 z"
-       id="rect1539"
-       inkscape:connector-curvature="0" />
+       id="rect1539" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/arrow-updown.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow-updown.svg
index d5b6c22a5..ed82879a5 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow-updown.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow-updown.svg
@@ -2,57 +2,16 @@
 <!-- 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="arrow-updown.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,20 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 7.0078125,1 2,7.6777344 H 5 V 22 H 9 V 7.6777344 h 3.017578 z"
-       id="path2876"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path2876" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 15,2 V 16.322266 H 11.982422 L 16.992188,23 22,16.322266 H 19 V 2 Z"
-       id="path4746"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path4746" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/arrow2-left.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow2-left.svg
index f71ee83e3..817901f8e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow2-left.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow2-left.svg
@@ -2,63 +2,16 @@
 <!-- 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="arrow2-left.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.949868"
-     inkscape:cx="8.8683181"
-     inkscape:cy="11.36098"
-     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-smooth-nodes="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.56470588;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 14.018423,3 v 4 h 8 v 10 h -8 v 4 L 2.6141976,12 Z"
-       id="path3895"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path3895" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/arrow2-right.svg b/rtdata/icons/rawtherapee/scalable/apps/arrow2-right.svg
index 8c3f60554..4a8922d3a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/arrow2-right.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/arrow2-right.svg
@@ -2,63 +2,16 @@
 <!-- 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="arrow2-right.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.56470588;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 10,3 V 7 H 2 v 10 h 8 v 4 l 11.404225,-9 z"
-       id="path3895"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       id="path3895" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/atom.svg b/rtdata/icons/rawtherapee/scalable/apps/atom.svg
index 72fb97532..22533a9b4 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/atom.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/atom.svg
@@ -2,57 +2,16 @@
 <!-- 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/1.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="atom.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="16.962963"
-     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="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -71,7 +30,7 @@
         </dc:creator>
         <dc:rights>
           <cc:Agent>
-            <dc:title></dc:title>
+            <dc:title />
           </cc:Agent>
         </dc:rights>
         <dc:description>RawTherapee icon.</dc:description>
@@ -96,26 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
        id="path4987"
-       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.7;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:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="M 6.4236453,1.0007171 C 5.1242162,1.0661783 4.2818956,1.3551405 3.4072861,2.1680463 2.0313377,3.6604057 2.0510559,6.0656441 2.8621368,8.5546635 3.6732254,11.043598 5.310644,13.766734 7.6001256,16.249906 c 2.2894736,2.483171 4.8041564,4.263447 7.0989664,5.143206 2.294838,0.879717 4.512477,0.901128 5.888414,-0.591274 1.459941,-1.892872 1.173357,-4.178274 0.629276,-6.11277 l -1.304751,1.308627 c 0.13995,1.28267 0.485305,2.529387 -0.444943,3.586763 -0.742315,0.805094 -2.239588,0.951586 -4.238937,0.184773 C 13.228945,19.002904 10.867343,17.361104 8.7224918,15.034753 6.5776052,12.708445 5.0659363,10.14926 4.3592931,7.9807808 3.8278563,5.7699345 3.7373603,4.2400511 5.122903,3.0223486 5.9515725,2.6063205 7.1829376,2.5856846 8.7705933,3.1940787 9.8156548,3.5945426 10.958198,4.2581661 12.117649,5.1091942 14.341642,6.72193 15.771084,8.4243253 17.384754,10.761068 L 18.45501,9.4589633 C 17.216394,7.4326758 15.418359,5.7024185 13.799195,4.3896672 12.282374,3.1596706 10.75444,2.1300889 9.2997088,1.5724257 8.2993769,1.1887878 7.3233517,0.98582573 6.4236453,1.0007171 Z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccc" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 6.4236453,1.0007171 C 5.1242162,1.0661783 4.2818956,1.3551405 3.4072861,2.1680463 2.0313377,3.6604057 2.0510559,6.0656441 2.8621368,8.5546635 3.6732254,11.043598 5.310644,13.766734 7.6001256,16.249906 c 2.2894736,2.483171 4.8041564,4.263447 7.0989664,5.143206 2.294838,0.879717 4.512477,0.901128 5.888414,-0.591274 1.459941,-1.892872 1.173357,-4.178274 0.629276,-6.11277 l -1.304751,1.308627 c 0.13995,1.28267 0.485305,2.529387 -0.444943,3.586763 -0.742315,0.805094 -2.239588,0.951586 -4.238937,0.184773 C 13.228945,19.002904 10.867343,17.361104 8.7224918,15.034753 6.5776052,12.708445 5.0659363,10.14926 4.3592931,7.9807808 3.8278563,5.7699345 3.7373603,4.2400511 5.122903,3.0223486 5.9515725,2.6063205 7.1829376,2.5856846 8.7705933,3.1940787 9.8156548,3.5945426 10.958198,4.2581661 12.117649,5.1091942 14.341642,6.72193 15.771084,8.4243253 17.384754,10.761068 L 18.45501,9.4589633 C 17.216394,7.4326758 15.418359,5.7024185 13.799195,4.3896672 12.282374,3.1596706 10.75444,2.1300889 9.2997088,1.5724257 8.2993769,1.1887878 7.3233517,0.98582573 6.4236453,1.0007171 Z" />
     <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:0.7;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:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 17.865768,2.6288914 c -0.292896,-5.185e-4 -0.590564,0.011264 -0.893884,0.036955 -0.715525,0.060656 -1.47107,0.2004195 -2.248741,0.3999787 0.594128,0.4643122 1.06971,0.9537435 1.535236,1.4238374 0.286816,-0.047062 0.565943,-0.083661 0.835763,-0.106516 2.114103,-0.1791993 3.527635,0.3876552 4.052543,1.3738399 0.524897,0.9860585 0.268078,2.590445 -0.931965,4.4867176 -1.200051,1.896188 -3.275525,3.94825 -5.902444,5.59318 -2.626918,1.645018 -5.2975449,2.56426 -7.411625,2.743333 C 4.7865474,18.758995 3.3770123,18.198998 2.8521156,17.212899 2.4090741,16.380593 2.5295728,15.100997 3.2970537,13.582657 2.9557874,13.034239 2.6478051,12.483866 2.3650889,11.930571 c -1.2949177,2.122748 -1.83145132,4.364593 -0.8858677,6.140977 0.9729581,1.827791 3.1191278,2.431502 5.5456917,2.225969 2.4265484,-0.2057 5.2750061,-1.217896 8.0790321,-2.973754 2.804023,-1.7559 5.04212,-3.929727 6.419535,-6.106197 1.377398,-2.1764727 1.969057,-4.4936558 0.9961,-6.3214038 C 21.668208,3.2968089 19.91604,2.6325203 17.865768,2.6288914 Z M 9.4139496,5.3287477 C 8.2641945,6.0060435 7.0645339,6.8703196 6.1350368,7.6525374 6.3145403,8.1516283 6.5549938,8.6833234 6.8425284,9.2437566 8.2368696,8.0311985 9.5435568,7.1849817 10.997287,6.3743444 10.452636,5.9735937 9.9180796,5.6107805 9.4139496,5.3287477 Z"
-       id="ellipse4751"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccccccccccsccccc" />
+       id="ellipse4751" />
     <circle
        r="3.0846999"
        cy="12"
        cx="12"
        id="circle4739"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.77952719;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.77952719;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/bayer.svg b/rtdata/icons/rawtherapee/scalable/apps/bayer.svg
index 1718ce5c4..10bd21541 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/bayer.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/bayer.svg
@@ -2,59 +2,16 @@
 <!-- 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="bayer.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="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-nodes="true"
-     inkscape:object-paths="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect1869"
        width="7.3333335"
        height="7.3333335"
@@ -114,37 +69,37 @@
        height="7.3333335"
        width="7.3333335"
        id="rect1871"
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
        y="8.333333"
        x="8.333333"
        height="7.3333335"
        width="7.3333335"
        id="rect2416"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.45;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.45;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2418"
        width="7.3333335"
        height="7.3333335"
        x="8.333334"
        y="1" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect1869-3"
        width="7.3333335"
        height="7.3333335"
        x="15.666667"
        y="1" />
     <rect
-       style="opacity:0.45;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.45;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2418-5"
        width="7.3333335"
        height="7.3333335"
        x="8.333334"
        y="15.666668" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect1869-35"
        width="7.3333335"
        height="7.3333335"
@@ -156,16 +111,16 @@
        height="7.3333335"
        width="7.3333335"
        id="rect1871-6"
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect1869-3-2"
        width="7.3333335"
        height="7.3333335"
        x="15.666667"
        y="15.666667" />
     <rect
-       style="opacity:1;fill:#30d043;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"
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;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="rect1869-9"
        width="6"
        height="6"
@@ -177,16 +132,16 @@
        height="6"
        width="6"
        id="rect1871-1"
-       style="opacity:1;fill:#d03030;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" />
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;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" />
     <rect
        y="7"
        x="40"
        height="6"
        width="6"
        id="rect2416-2"
-       style="opacity:1;fill:#30d043;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" />
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;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" />
     <rect
-       style="opacity:1;fill:#3030d0;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"
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;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="rect2418-7"
        width="6"
        height="6"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/beforeafter.svg b/rtdata/icons/rawtherapee/scalable/apps/beforeafter.svg
index 8c4eaab48..798870b91 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/beforeafter.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/beforeafter.svg
@@ -2,57 +2,16 @@
 <!-- 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="beforeafter.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,24 +55,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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: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:2;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"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;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 1,6 v 1 16 h 14 v -5 h -2 v 3 H 3 V 8 H 9 V 6 Z"
        id="path1780" />
     <path
-       inkscape:connector-curvature="0"
        id="path1773"
        d="M 9,1 V 2 18 H 23 V 1 Z m 2,2 H 21 V 16 H 11 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.7;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:2;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" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;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
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:0.37647059;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.95909089;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.95909089;paint-order:normal"
        d="M 3 8 L 3 21 L 13 21 L 13 18 L 9 18 L 9 8 L 3 8 z "
        id="rect1782" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.75294119;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.95909089;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.95909089;paint-order:normal"
        id="rect1787"
        width="10"
        height="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-hicontrast.svg
index f2712cee9..e960e9efc 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-hicontrast.svg
@@ -1,68 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="bidirectional-arrow-horizontal-hicontrast.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="29.288994"
-     inkscape:cx="11.864052"
-     inkscape:cy="11.292624"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1041"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:object-paths="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,21 +53,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 5.75,13.5 h 12.5 v -3 H 5.75 Z"
-       id="path857"
-       sodipodi:nodetypes="ccccc" />
+       id="path857" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0"
        d="m 6.4999667,13.5 v 2.25 l -5,-3.75 5,-3.75 v 2.25"
-       id="path853"
-       sodipodi:nodetypes="ccccc" />
+       id="path853" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0"
        d="m 17.5,13.5 v 2.25 l 5,-3.75 -5,-3.75 v 2.25"
        id="path855" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-prelight.svg b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-prelight.svg
index 6382cc546..1692d094f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-prelight.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-horizontal-prelight.svg
@@ -1,68 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="bidirectional-arrow-horizontal-prelight.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="29.288994"
-     inkscape:cx="11.864052"
-     inkscape:cy="11.292624"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1041"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:object-paths="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,21 +53,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="fill:#ff6400;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#ff6400;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 5.75,13.5 h 12.5 v -3 H 5.75 Z"
-       id="path857"
-       sodipodi:nodetypes="ccccc" />
+       id="path857" />
     <path
-       style="fill:#ff6400;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ff6400;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0"
        d="m 6.4999667,13.5 v 2.25 l -5,-3.75 5,-3.75 v 2.25"
-       id="path853"
-       sodipodi:nodetypes="ccccc" />
+       id="path853" />
     <path
-       style="fill:#ff6400;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ff6400;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0"
        d="m 17.5,13.5 v 2.25 l 5,-3.75 -5,-3.75 v 2.25"
        id="path855" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-hicontrast.svg
index 93cb21a43..9ea09d595 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-hicontrast.svg
@@ -1,68 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="bidirectional-arrow-vertical-hicontrast.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="29.288994"
-     inkscape:cx="11.864052"
-     inkscape:cy="11.292624"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1041"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:document-rotation="0"
-     inkscape:object-paths="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-page="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,21 +53,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 10.5,5.75 v 12.5 h 3 V 5.75 Z"
-       id="path857"
-       sodipodi:nodetypes="ccccc" />
+       id="path857" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0"
        d="M 10.5,6.4999667 H 8.25 l 3.75,-5 3.75,5 H 13.5"
-       id="path853"
-       sodipodi:nodetypes="ccccc" />
+       id="path853" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0"
        d="M 10.5,17.5 H 8.25 l 3.75,5 3.75,-5 H 13.5"
        id="path855" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-prelight.svg b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-prelight.svg
index 76f4312cb..b2658187a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-prelight.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/bidirectional-arrow-vertical-prelight.svg
@@ -1,68 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   sodipodi:docname="bidirectional-arrow-vertical-prelight.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-page="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-center="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:document-rotation="0"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1041"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="11.292624"
-     inkscape:cx="11.864052"
-     inkscape:zoom="29.288994"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,22 +53,18 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       sodipodi:nodetypes="ccccc"
        id="path857"
        d="m 10.5,5.75 v 12.5 h 3 V 5.75 Z"
-       style="fill:#ff6400;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:#ff6400;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccc"
        id="path853"
        d="m 10.49995,6.4999667 h -2.25 l 3.75,-5 3.75,5 h -2.25"
-       style="fill:#ff6400;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1" />
+       style="fill:#ff6400;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0" />
     <path
        id="path855"
        d="M 10.5,17.5 H 8.25 l 3.75,5 3.75,-5 H 13.5"
-       style="fill:#ff6400;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1" />
+       style="fill:#ff6400;fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:round;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/box.svg b/rtdata/icons/rawtherapee/scalable/apps/box.svg
index 2ebee4b8c..bf31f9860 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/box.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/box.svg
@@ -2,57 +2,16 @@
 <!-- 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.91 r13725"
-   sodipodi:docname="box.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.944444"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.7;fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2.34782624;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#ffffff;fill-opacity:0.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2.34782624;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="rect3335"
        width="15.652174"
        height="15.652174"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/cancel-small.svg b/rtdata/icons/rawtherapee/scalable/apps/cancel-small.svg
index 3bbe99bc1..7fab7ab2b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/cancel-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/cancel-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="cancel-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,32 +56,22 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="m 56.464466,12.464466 7.071068,7.071068 m 0,-7.071068 -7.071068,7.071068"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4977" />
     <path
        id="path4979"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 3.9858298,12.943102 7.0710682,7.071068 m 0,-7.071068 -7.0710682,7.071068"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 3.9858298,12.943102 7.0710682,7.071068 m 0,-7.071068 -7.0710682,7.071068" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="m 25.464466,12.464466 7.071068,7.071068 m 0,-7.071068 -7.071068,7.071068"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4981" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="m 40.464466,12.464466 7.071068,7.071068 m 0,-7.071068 -7.071068,7.071068"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4983" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/cancel.svg b/rtdata/icons/rawtherapee/scalable/apps/cancel.svg
index c42837e61..899e2a5ec 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/cancel.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/cancel.svg
@@ -2,64 +2,16 @@
 <!-- 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="cancel.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -103,26 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="m 44.222499,7.7775012 -8.444998,8.4449978 m 0,-8.4449978 8.444998,8.4449978"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4947" />
     <circle
        r="10"
        cy="12"
        cx="40"
        id="circle4949"
-       style="opacity:0.7;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path4951"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 18.363961,5.636039 5.636039,18.363961 m 0,-12.727922 12.727922,12.727922"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 18.363961,5.636039 5.636039,18.363961 m 0,-12.727922 12.727922,12.727922" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-black-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-black-small.svg
index 2b314c556..3cfc3579b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-black-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-black-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-black.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.25;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path3234"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-green-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-green-small.svg
index 5068447b3..7eab6adb1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-green-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-green-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-blue-green.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:#0000ff;fill-opacity:0.98823529;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97254902;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-red-small.svg
index 6445577c1..a84ca3301 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-red-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-blue-red.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076021;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-small.svg
index b92577051..84061538f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-blue.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        style="opacity:0.7;fill:#0000ff;fill-opacity:0.98830411;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-yellow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-yellow-small.svg
index 5f2e7f04d..c0fbbb819 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-blue-yellow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-blue-yellow-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-blue-yellow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076021;stroke:#ffe400;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076021;stroke:#ffe400;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-red-small.svg
index 6b34c50ec..bbae1bec4 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-red-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-cyan-red.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#00fcff;fill-opacity:1;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#00fcff;fill-opacity:1.0;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-small.svg
index b376821cb..fec09867a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-cyan-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-cyan.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#00fcff;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#00fcff;fill-opacity:1.0;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-darkgray-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-darkgray-small.svg
index 8183c820f..b2d61f119 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-darkgray-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-darkgray-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-darkgray-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#606060;fill-opacity:1.0;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-blue-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-blue-small.svg
index e9004ae63..568543846 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-blue-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-blue-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-blue.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-darkgray-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-darkgray-small.svg
index 21b4db7ab..347e87a80 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-darkgray-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-darkgray-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-darkgray.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#606060;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#606060;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-gray-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-gray-small.svg
index 9bca30ae1..dee5089b6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-gray-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-gray-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-gray.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#c0c0c0;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98979594;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-green-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-green-small.svg
index b99c6d43e..6a3ce79e3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-green-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-green-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-green.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97254902;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-purple-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-purple-small.svg
index 751525ff2..5d9a46aef 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-purple-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-purple-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-purple.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#800080;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#800080;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-red-small.svg
index fcb7123cf..6e705b5f3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-red-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-red.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-yellow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-yellow-small.svg
index 65d9fd4cf..9ac07e1c7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-empty-yellow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-empty-yellow-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-empty-yellow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="5.1581509"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#ffff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98431373;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-blue-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-blue-small.svg
index 0804edcd7..fea164c86 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-blue-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-blue-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-gray-blue.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#0000fc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#0000fc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-green-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-green-small.svg
index 609f6d0e7..ce2372a44 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-green-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-green-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-gray-green.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-red-small.svg
index 6e203cdbb..2bbe27e10 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-red-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-gray-red.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#fc0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#fc0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-small.svg
index 6ed1fd51d..046159a6b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-gray-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-gray-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-gray-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.98823529;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-green-blue-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-green-blue-small.svg
index 650f9fc44..3f47b1f9c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-green-blue-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-green-blue-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-green-blue.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:#00ff00;fill-opacity:0.97254902;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-green-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-green-red-small.svg
index 21e153062..7ee0d4bd4 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-green-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-green-red-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-green-red.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.1358025"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:#00ff00;fill-opacity:0.97254902;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-green-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-green-small.svg
index dc1b0217a..2198304d7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-green-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-green-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-green.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        style="opacity:0.7;fill:#00ff00;fill-opacity:0.97076021;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-magenta-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-magenta-small.svg
index 9f2e485f9..2f39a4ada 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-magenta-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-magenta-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-magenta.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#ff4bff;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#ff4bff;fill-opacity:1.0;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-orange-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-orange-small.svg
index addf840d1..a86be7111 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-orange-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-orange-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-orange.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#ff8000;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#ff8000;fill-opacity:1.0;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-purple-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-purple-small.svg
index 2c4a3f225..0d651db56 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-purple-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-purple-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-purple.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#800080;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#800080;fill-opacity:1.0;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-red-blue-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-red-blue-small.svg
index 274cb68fa..9dc833071 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-red-blue-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-red-blue-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-red-blue.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#f80707;fill-opacity:1;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#f80707;fill-opacity:1.0;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-red-cyan-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-red-cyan-small.svg
index e2feb97e1..53598563a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-red-cyan-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-red-cyan-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-red-cyan.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#f80707;fill-opacity:1;stroke:#00fcff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#f80707;fill-opacity:1.0;stroke:#00fcff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-red-green-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-red-green-small.svg
index 96cc892dd..edc01a6b9 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-red-green-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-red-green-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-red-green.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#f80707;fill-opacity:1;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97254902;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#f80707;fill-opacity:1.0;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97254902;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-red-small.svg
index a56b0d328..7e1536ac2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-red-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-red.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        style="opacity:0.7;fill:#ff0000;fill-opacity:0.99415205;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-white-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-white-small.svg
index 5a485d954..7db255963 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-white-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-white-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-white.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.1160494"
-     inkscape:cy="8"
-     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="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        style="opacity:0.7;fill:#ffffff;fill-opacity:0.9;stroke:none;stroke-width:0.24999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-blue-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-blue-small.svg
index f6e134941..c0f123bb2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-blue-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-blue-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-yellow-blue.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
        style="opacity:0.7;fill:#ffff00;fill-opacity:0.98830411;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94736843;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-small.svg
index 7d86fdb19..ca825ec78 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/circle-yellow-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="circle-yellow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        style="opacity:0.7;fill:#ffff00;fill-opacity:0.98245616;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-circles.svg b/rtdata/icons/rawtherapee/scalable/apps/color-circles.svg
index f7f6ad657..61b331d7a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-circles.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-circles.svg
@@ -2,57 +2,16 @@
 <!-- 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-circles.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.916667"
-     inkscape:cx="4.6171408"
-     inkscape:cy="11.861124"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,120 +55,99 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g4033"
        transform="matrix(0.02345382,0,0,0.02345382,13.398463,11.353058)">
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3249"
          d="m 641.1875,672.46875 c 4.74855,-2.29034 9.47619,-4.64572 14.09375,-7.15625 4.61756,-2.51053 9.17655,-5.15115 13.65625,-7.875 -4.47991,2.72356 -9.0385,5.3335 -13.65625,7.84375 -4.61775,2.51026 -9.34502,4.89741 -14.09375,7.1875 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3247"
          d="m 565.625,698.03125 c 5.3006,-1.08654 10.54608,-2.28399 15.75,-3.625 5.20392,-1.34102 10.36839,-2.81761 15.46875,-4.40625 -5.10049,1.58845 -10.26472,3.03415 -15.46875,4.375 -5.20403,1.34086 -10.44931,2.56986 -15.75,3.65625 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3245"
          d="m 516.75,704.21875 c 5.5495,-0.28193 11.05785,-0.66177 16.53125,-1.21875 5.4734,-0.55699 10.92206,-1.2998 16.3125,-2.125 -5.3905,0.82509 -10.83905,1.53683 -16.3125,2.09375 -5.47345,0.55692 -10.98172,0.96812 -16.53125,1.25 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3243"
          d="m 477.96875,703.84375 c 1.76231,0.11574 3.5087,0.28495 5.28125,0.375 5.5495,0.28193 11.13125,0.4375 16.75,0.4375 -7.40695,0 -14.74439,-0.32711 -22.03125,-0.8125 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3241"
          d="m 452.90625,701.1875 c 4.57867,0.67064 9.17737,1.34081 13.8125,1.8125 1.87249,0.19055 3.7776,0.25052 5.65625,0.40625 -6.54764,-0.55236 -13.03637,-1.28437 -19.46875,-2.21875 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3239"
          d="m 429.4375,696.90625 c 1.65152,0.36263 3.27665,0.78455 4.9375,1.125 4.65998,0.95522 9.36486,1.74783 14.09375,2.5 -6.40587,-1.01936 -12.755,-2.23749 -19.03125,-3.625 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3237"
          d="m 403.53125,690.09375 c 4.98146,1.54555 10.01483,3.00369 15.09375,4.3125 1.81609,0.46799 3.67195,0.8163 5.5,1.25 -6.94759,-1.66332 -13.82407,-3.46364 -20.59375,-5.5625 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3235"
          d="m 383.28125,683 c 1.57949,0.60569 3.12712,1.26023 4.71875,1.84375 4.98996,1.8294 10.05589,3.56761 15.15625,5.15625 0.12251,0.0382 0.2524,0.0557 0.375,0.0937 -6.85066,-2.12396 -13.5979,-4.53787 -20.25,-7.09375 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3233"
          d="m 361.9375,673.90625 c 3.7329,1.75965 7.46733,3.51002 11.28125,5.125 1.80344,0.76365 3.64951,1.42666 5.46875,2.15625 -5.66823,-2.2779 -11.24481,-4.69865 -16.75,-7.28125 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3231"
          d="m 340.5,662.875 c 1.41514,0.79766 2.79158,1.66156 4.21875,2.4375 4.25013,2.31076 8.60506,4.47347 12.96875,6.59375 -5.82529,-2.83534 -11.56105,-5.8653 -17.1875,-9.03125 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3229"
          d="m 318.5,649.375 c 4.13419,2.78183 8.29567,5.46807 12.5625,8.0625 1.63899,0.99657 3.34109,1.90526 5,2.875 -5.96833,-3.49046 -11.84024,-7.08844 -17.5625,-10.9375 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3227"
          d="m 500,913.9375 c 6.24772,-3.06649 12.39051,-6.30332 18.40625,-9.75 6.02794,-3.45367 11.93964,-7.08669 17.71875,-10.90625 5.77911,-3.81956 11.42313,-7.83041 16.9375,-12 5.51437,-4.16959 10.89128,-8.49624 16.125,-13 5.23372,-4.50376 10.31286,-9.17793 15.25,-14 4.93714,-4.82207 9.7191,-9.81297 14.34375,-14.9375 4.62465,-5.12453 9.11,-10.37013 13.40625,-15.78125 4.29625,-5.41112 8.42307,-10.9744 12.375,-16.65625 3.95193,-5.68185 7.72081,-11.50078 11.3125,-17.4375 3.59169,-5.93672 7.00321,-11.98051 10.21875,-18.15625 3.21554,-6.17574 6.23903,-12.47611 9.0625,-18.875 2.82347,-6.39889 5.42827,-12.89381 7.84375,-19.5 2.41548,-6.60619 4.63342,-13.32738 6.625,-20.125 1.99158,-6.79762 3.76073,-13.68305 5.3125,-20.65625 1.55177,-6.9732 2.90397,-14.02333 4,-21.15625 1.09603,-7.13292 1.93812,-14.34822 2.5625,-21.625 -4.13415,2.78148 -8.29566,5.46847 -12.5625,8.0625 -4.4797,2.72385 -9.03869,5.36447 -13.65625,7.875 -4.61756,2.51053 -9.3452,4.86591 -14.09375,7.15625 -4.74873,2.2901 -9.5334,4.49943 -14.40625,6.5625 -4.87285,2.06306 -9.79114,3.98331 -14.78125,5.8125 -4.99011,1.82919 -10.05576,3.5678 -15.15625,5.15625 -5.10036,1.58864 -10.26483,3.06523 -15.46875,4.40625 -5.20392,1.34101 -10.4494,2.53846 -15.75,3.625 -5.30069,1.0864 -10.64075,2.01867 -16.03125,2.84375 -5.39044,0.8252 -10.8391,1.56801 -16.3125,2.125 -5.4734,0.55698 -10.98175,0.93682 -16.53125,1.21875 -5.54953,0.28189 -11.13125,0.4375 -16.75,0.4375 -5.61875,0 -11.2005,-0.15557 -16.75,-0.4375 -1.77255,-0.0901 -3.51894,-0.25926 -5.28125,-0.375 -0.97179,-0.0647 -1.96834,-0.0515 -2.9375,-0.125 -0.89564,-0.068 -1.76254,-0.23711 -2.65625,-0.3125 -1.87865,-0.15573 -3.78376,-0.2157 -5.65625,-0.40625 -4.63513,-0.47169 -9.23383,-1.14186 -13.8125,-1.8125 -0.76354,-0.11091 -1.55075,-0.13394 -2.3125,-0.25 -0.71695,-0.10924 -1.40964,-0.29242 -2.125,-0.40625 -4.72889,-0.75217 -9.43377,-1.54478 -14.09375,-2.5 -1.66085,-0.34045 -3.28598,-0.76237 -4.9375,-1.125 -0.89742,-0.1984 -1.82403,-0.32533 -2.71875,-0.53125 -0.87957,-0.20243 -1.71717,-0.50889 -2.59375,-0.71875 -1.82805,-0.4337 -3.68391,-0.78201 -5.5,-1.25 -5.07892,-1.30881 -10.11229,-2.76695 -15.09375,-4.3125 -0.1226,-0.038 -0.25249,-0.0556 -0.375,-0.0937 -5.10036,-1.58864 -10.16629,-3.32685 -15.15625,-5.15625 -1.59163,-0.58352 -3.13926,-1.23806 -4.71875,-1.84375 -0.75076,-0.28846 -1.53342,-0.51862 -2.28125,-0.8125 -0.78549,-0.30868 -1.5306,-0.68577 -2.3125,-1 -1.81924,-0.72959 -3.66531,-1.3926 -5.46875,-2.15625 -3.81392,-1.61498 -7.54835,-3.36535 -11.28125,-5.125 -0.86458,-0.40559 -1.76381,-0.74282 -2.625,-1.15625 -0.17248,-0.0828 -0.32765,-0.19815 -0.5,-0.28125 -0.37796,-0.18223 -0.7477,-0.37886 -1.125,-0.5625 -4.36369,-2.12028 -8.71862,-4.28299 -12.96875,-6.59375 -1.42717,-0.77594 -2.80361,-1.63984 -4.21875,-2.4375 -0.68454,-0.38518 -1.4128,-0.70376 -2.09375,-1.09375 -0.80253,-0.45962 -1.54587,-1.00213 -2.34375,-1.46875 -1.65891,-0.96974 -3.36101,-1.87843 -5,-2.875 -4.26683,-2.59443 -8.42831,-5.28067 -12.5625,-8.0625 0.39999,4.66162 0.90537,9.27107 1.5,13.875 0.1087,0.84341 0.2285,1.68963 0.34375,2.53125 0.60462,4.40863 1.31427,8.80526 2.09375,13.15625 0.12651,0.70795 0.24388,1.41862 0.375,2.125 0.7951,4.27416 1.66454,8.50461 2.625,12.71875 0.21032,0.91776 0.43823,1.83518 0.65625,2.75 0.97388,4.10702 2.02836,8.20443 3.15625,12.25 0.23444,0.84706 0.47771,1.68691 0.71875,2.53125 1.19938,4.17045 2.4527,8.30586 3.8125,12.40625 0.21872,0.65755 0.43342,1.31306 0.65625,1.96875 1.37048,4.04544 2.82035,8.05852 4.34375,12.03125 0.37492,0.97234 0.77198,1.93846 1.15625,2.90625 1.55685,3.94537 3.1703,7.85014 4.875,11.71875 0.12586,0.28563 0.27959,0.55855 0.40625,0.84375 1.93325,4.35319 3.94654,8.68687 6.0625,12.9375 0.0561,0.11273 0.10001,0.23109 0.15625,0.34375 2.16611,4.33872 4.42997,8.61747 6.78125,12.84375 0.14542,0.26138 0.29138,0.52031 0.4375,0.78125 2.24786,4.01432 4.55828,7.96749 6.96875,11.875 0.40385,0.65466 0.84166,1.28592 1.25,1.9375 2.29172,3.65692 4.63164,7.28591 7.0625,10.84375 11.18225,16.36651 23.81914,31.67619 37.71875,45.71875 3.14817,3.18055 6.38041,6.26292 9.65625,9.3125 0.39383,0.36663 0.76061,0.7603 1.15625,1.125 2.67708,2.46773 5.42887,4.84063 8.1875,7.21875 1.16068,1.00428 2.29381,2.04501 3.46875,3.03125 2.12731,1.78241 4.32713,3.49012 6.5,5.21875 2.09447,1.66015 4.17595,3.3245 6.3125,4.9375 1.8834,1.42459 3.80384,2.80318 5.71875,4.1875 1.88836,1.36466 3.76995,2.73808 5.6875,4.0625 2.45849,1.69852 4.96206,3.33668 7.46875,4.96875 1.97621,1.28828 3.96194,2.56632 5.96875,3.8125 1.96609,1.22016 3.9439,2.41456 5.9375,3.59375 2.45973,1.45511 4.93722,2.88971 7.4375,4.28125 2.11476,1.17674 4.26299,2.30682 6.40625,3.4375 2.34705,1.22543 4.68381,2.44981 7.0625,3.625 0.45439,0.22571 0.91941,0.43261 1.375,0.65625 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          transform="translate(-559.61951,-472.41828)"
          id="path3141"
          d="m 824.59375,350.625 c 0.39808,4.63896 0.7407,9.31081 0.96875,14 0.22805,4.68919 0.34375,9.38407 0.34375,14.125 0,5.61875 -0.1243,11.23178 -0.40625,16.78125 -0.28196,5.54947 -0.72421,11.02668 -1.28125,16.5 -0.55704,5.47332 -1.23724,10.92218 -2.0625,16.3125 -0.82527,5.39032 -1.78836,10.73079 -2.875,16.03125 -1.08664,5.30046 -2.28386,10.54625 -3.625,15.75 -1.34114,5.20375 -2.81747,10.39983 -4.40625,15.5 -1.58879,5.10017 -3.29544,10.10401 -5.125,15.09375 -1.82955,4.98974 -3.81152,9.97131 -5.875,14.84375 -2.06348,4.87244 -4.20948,9.65795 -6.5,14.40625 -2.29052,4.7483 -4.70804,9.44522 -7.21875,14.0625 -2.51072,4.61728 -5.1197,9.14558 -7.84375,13.625 -2.72405,4.47942 -5.56948,8.91531 -8.5,13.25 -2.93052,4.33469 -5.93238,8.56688 -9.0625,12.75 -3.13012,4.18312 -6.36464,8.31908 -9.6875,12.34375 -3.32286,4.02467 -6.74126,7.95312 -10.25,11.8125 -3.50874,3.85938 -7.12474,7.62528 -10.8125,11.3125 -3.68776,3.68721 -7.45259,7.3043 -11.3125,10.8125 -3.85991,3.5082 -7.81855,6.89641 -11.84375,10.21875 -4.0252,3.32233 -8.09761,6.55789 -12.28125,9.6875 -4.18363,3.1296 -8.4773,6.19499 -12.8125,9.125 -0.20619,0.13936 -0.41855,0.26735 -0.625,0.40625 -0.62438,7.27678 -1.46647,14.49208 -2.5625,21.625 -1.09603,7.13292 -2.44823,14.18305 -4,21.15625 -1.55177,6.9732 -3.32092,13.85863 -5.3125,20.65625 -1.99158,6.79762 -4.20952,13.51881 -6.625,20.125 -2.41548,6.60619 -5.02028,13.10111 -7.84375,19.5 -2.82347,6.39889 -5.84696,12.69926 -9.0625,18.875 -3.21554,6.17574 -6.62706,12.21953 -10.21875,18.15625 -3.59169,5.93672 -7.36057,11.75565 -11.3125,17.4375 -3.95193,5.68185 -8.07875,11.24513 -12.375,16.65625 -4.29625,5.41112 -8.7816,10.65672 -13.40625,15.78125 -4.62465,5.12453 -9.40661,10.11543 -14.34375,14.9375 -4.93714,4.82207 -10.01628,9.49624 -15.25,14 -5.23372,4.50376 -10.61063,8.83041 -16.125,13 -5.51437,4.16959 -11.15839,8.18044 -16.9375,12 -5.77911,3.81956 -11.69081,7.45258 -17.71875,10.90625 -6.01574,3.44668 -12.15853,6.68351 -18.40625,9.75 43.22874,21.2203 91.77222,33.21875 143.125,33.21875 C 822.92501,947.15625 969,801.05001 969,621.25 969,508.59813 911.6534,409.17474 824.59375,350.625 Z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.55;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.55;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path3206"
          d="m 121.88959,176.95433 c 0.20626,-0.13877 0.41466,-0.27455 0.62066,-0.41377 4.3352,-2.93001 8.6089,-5.97344 12.79253,-9.10304 4.18364,-3.12961 8.2846,-6.36689 12.3098,-9.68922 4.0252,-3.32234 7.96714,-6.73272 11.82705,-10.24092 3.85991,-3.5082 7.62208,-7.10541 11.30984,-10.79262 3.68776,-3.68722 7.31836,-7.45046 10.8271,-11.30984 3.50874,-3.85938 6.91806,-7.80239 10.24092,-11.82706 3.32286,-4.02467 6.5591,-8.16115 9.68922,-12.34427 3.13012,-4.183117 6.13804,-8.423358 9.06856,-12.758049 2.93052,-4.334691 5.75833,-8.761361 8.48238,-13.240785 2.72405,-4.479424 5.351,-9.002797 7.86172,-13.620079 2.51071,-4.617283 4.91605,-9.320035 7.20657,-14.068335 2.29052,-4.7483 4.45347,-9.540703 6.51695,-14.413147 2.06348,-4.872443 4.03225,-9.837186 5.8618,-14.826921 1.82956,-4.989735 3.54892,-10.0025972 5.13771,-15.1027712 1.58878,-5.1001741 3.03797,-10.2783143 4.37911,-15.4820648 1.34114,-5.20375 2.56837,-10.457451 3.65501,-15.757914 1.08664,-5.300463 2.03667,-10.64344 2.86194,-16.033764 0.82526,-5.390323 1.51183,-10.836292 2.06887,-16.309613 0.55704,-5.473322 0.99385,-10.967034 1.27581,-16.516501 0.28195,-5.549467 0.41377,-11.13912 0.41377,-16.757869 0,-4.74093 -0.11676,-9.448107 -0.34481,-14.137297 -0.22805,-4.68919 -0.5674,-9.36041 -0.96548,-13.99937 -51.89343,-34.8996 -114.32649,-55.27339 -181.474617,-55.27339 -51.336115,0 -99.904133,11.93444 -143.131513,33.13645 4.093069,2.00743 8.142697,4.06922 12.137387,6.2411 4.617558,2.51053 9.17486,5.10338 13.65456,7.82723 4.4797,2.72385 8.905796,5.55207 13.240786,8.48238 4.334989,2.93031 8.574633,5.97314 12.7580482,9.10304 4.1834152,3.1299 8.28480366,6.36658 12.3097928,9.68922 4.0249892,3.322646 7.967367,6.732402 11.827056,10.240923 3.859689,3.508521 7.656782,7.105083 11.344319,10.792619 3.687537,3.687537 7.284098,7.48463 10.792619,11.344319 3.508522,3.859689 6.918278,7.802067 10.24092,11.827056 3.322643,4.024989 6.55932,8.126378 9.689221,12.309793 3.129901,4.183415 6.172733,8.42306 9.10304,12.758049 2.930308,4.334989 5.758528,8.761086 8.482379,13.240785 2.72385,4.4797 5.316705,9.037002 7.827235,13.6545605 2.51053,4.6175584 4.916226,9.2852995 7.206573,14.0338535 2.290347,4.748554 4.48813,9.574942 6.551431,14.447628 2.0633,4.872686 3.997923,9.802485 5.827323,14.79244 1.8294,4.989956 3.54906,10.036891 5.1377,15.137252 1.58864,5.100362 3.0381,10.243668 4.37912,15.447584 1.34101,5.203915 2.56847,10.457318 3.655,15.757914 1.08654,5.300595 2.03675,10.643329 2.86195,16.033764 0.82519,5.39043 1.51188,10.83621 2.06887,16.30961 0.55698,5.4734 0.99387,11.00148 1.2758,16.55099 0.28193,5.5495 0.41378,11.10463 0.41378,16.72338 0,5.61875 -0.13185,11.20837 -0.41378,16.75787 -0.1938,3.81489 -0.53773,7.59936 -0.86203,11.3788 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.35;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.35;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path3645-5-0-4-2-2-9-9-6"
          d="m 121.88959,176.95433 c 0.3243,-3.77944 0.66823,-7.56391 0.86203,-11.3788 0.28193,-5.5495 0.41378,-11.13912 0.41378,-16.75787 0,-5.61875 -0.13185,-11.17388 -0.41378,-16.72338 -0.28193,-5.54951 -0.71882,-11.07759 -1.2758,-16.55099 -0.55699,-5.4734 -1.24368,-10.91918 -2.06887,-16.30961 -0.8252,-5.390435 -1.77541,-10.733169 -2.86195,-16.033764 -1.08653,-5.300596 -2.31399,-10.553999 -3.655,-15.757914 -1.34102,-5.203916 -2.79048,-10.347222 -4.37912,-15.447584 -1.58864,-5.100361 -3.3083,-10.147296 -5.1377,-15.137252 -1.8294,-4.989955 -3.764023,-9.919754 -5.827323,-14.79244 C 95.482556,17.19204 93.284773,12.365652 90.994426,7.617098 88.704079,2.868544 86.298383,-1.7991971 83.787853,-6.4167555 c -2.51053,-4.6175585 -5.103385,-9.1748605 -7.827235,-13.6545605 -2.723851,-4.479699 -5.552071,-8.905796 -8.482379,-13.240785 -2.930307,-4.334989 -5.973139,-8.574634 -9.10304,-12.758049 -3.129901,-4.183415 -6.366578,-8.284804 -9.689221,-12.309793 -3.322642,-4.024989 -6.732398,-7.967367 -10.24092,-11.827056 -3.508521,-3.859689 -7.105082,-7.656782 -10.792619,-11.344319 -3.687537,-3.687536 -7.48463,-7.284098 -11.344319,-10.792619 -3.859689,-3.508521 -7.8020668,-6.918277 -11.827056,-10.240923 -4.02498914,-3.32264 -8.1263776,-6.55932 -12.3097928,-9.68922 -4.1834152,-3.1299 -8.4230592,-6.17273 -12.7580482,-9.10304 -4.33499,-2.93031 -8.761086,-5.75853 -13.240786,-8.48238 -4.4797,-2.72385 -9.037002,-5.3167 -13.65456,-7.82723 -3.99469,-2.17188 -8.044318,-4.23367 -12.137387,-6.2411 -108.17252,53.056048 -182.78491,164.281604 -182.78491,292.74549 0,9.48126 0.47976,18.85932 1.27581,28.13667 6.48724,4.36362 13.12447,8.5155 19.93014,12.41324 6.80566,3.89773 13.79437,7.55591 20.89561,10.96502 7.10125,3.40912 14.31473,6.55009 21.68869,9.44786 7.37395,2.89776 14.8924,5.53252 22.51623,7.89619 7.62382,2.36368 15.35502,4.46873 23.20585,6.27559 7.85084,1.80685 15.80601,3.3242 23.861,4.55152 8.05499,1.22731 16.210884,2.16795 24.447182,2.79297 8.236298,0.62502 16.569641,0.931 24.964398,0.931 5.618749,0 11.208336,-0.13189 16.757869,-0.41378 5.549534,-0.28188 11.043047,-0.71888 16.516501,-1.2758 5.473454,-0.55692 10.919113,-1.24379 16.309614,-2.06888 5.3904999,-0.82508 10.73306865,-1.77554 16.0337634,-2.86194 5.3006946,-1.08639 10.5538886,-2.31415 15.7579136,-3.65501 5.204026,-1.34085 10.381571,-2.79066 15.482065,-4.37911 5.100494,-1.58845 10.147142,-3.30851 15.137252,-5.1377 4.99011,-1.82919 9.919589,-3.76426 14.79244,-5.82732 4.872852,-2.06307 9.664417,-4.26134 14.413147,-6.55144 4.748731,-2.29009 9.450589,-4.69631 14.068335,-7.20657 4.61775,-2.51025 9.17465,-5.10367 13.65456,-7.82723 4.26703,-2.59415 8.45131,-5.28699 12.58564,-8.06861 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path3091"
          d="m -385.53593,-93.654223 c 0,-5.61875 0.16633,-11.208367 0.44826,-16.757867 0.19383,-3.8155 0.53766,-7.59877 0.86203,-11.3788 -0.79761,9.28595 -1.31029,18.6465 -1.31029,28.136667 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path3089"
          d="m -59.653991,-143.92783 c -0.637003,-0.31236 -1.257147,-0.65716 -1.896467,-0.96547 -4.74873,-2.2901 -9.540295,-4.48837 -14.413147,-6.55144 -4.872852,-2.06306 -9.802341,-3.99813 -14.79244,-5.82732 -4.990099,-1.82919 -10.036755,-3.54925 -15.137255,-5.1377 -5.10049,-1.58845 -10.27804,-3.03826 -15.48206,-4.37911 -5.20403,-1.34086 -10.45722,-2.56862 -15.75792,-3.65501 -5.30069,-1.0864 -10.64326,-2.03686 -16.03376,-2.86194 -5.3905,-0.82509 -10.83616,-1.51196 -16.30961,-2.06888 -5.47346,-0.55692 -10.96697,-0.99392 -16.5165,-1.2758 -5.54954,-0.28189 -11.13912,-0.41378 -16.75787,-0.41378 -8.39352,0 -16.7296,0.30573 -24.9644,0.931 -8.2348,0.62526 -16.35938,1.5653 -24.4127,2.79297 -8.05332,1.22768 -16.0119,2.74428 -23.861,4.55152 -7.84909,1.80725 -15.58374,3.91161 -23.20585,6.27559 -7.62212,2.36397 -15.14386,4.99834 -22.51624,7.89619 -7.37238,2.89786 -14.62326,6.07344 -21.72316,9.48234 -7.0999,3.40889 -14.05646,7.06793 -20.86113,10.96502 -6.80468,3.8971 -13.44346,8.0163 -19.93014,12.37876 -0.32437,3.78003 -0.6682,7.5633 -0.86203,11.3788 -0.28193,5.5495 -0.44826,11.139117 -0.44826,16.757867 0,6.206519 0.24253,12.36035 0.58618,18.48193 0.14634,2.636031 0.37996,5.24548 0.58618,7.861716 0.30746,3.825539 0.66454,7.625898 1.1034,11.413282 0.28324,2.456949 0.59336,4.904364 0.93099,7.344498 0.54607,3.928232 1.1768,7.841193 1.86199,11.723612 0.43444,2.426716 0.82628,4.866905 1.31028,7.275536 1.00174,5.006551 2.11588,9.97456 3.34468,14.895884 0.19657,0.787286 0.3494,1.59419 0.5517,2.379203 0.31707,1.230411 0.70189,2.431141 1.03444,3.6550089 1.23494,4.5684793 2.57319,9.09860441 3.99982,13.5855977 0.79976,2.5125384 1.65725,4.996576 2.51713,7.4824234 1.09133,3.162286 2.22842,6.295817 3.41364,9.413371 0.97087,2.566903 1.96672,5.119097 2.99986,7.654829 1.53046,3.736792 3.12903,7.436853 4.79289,11.10295 0.74886,1.652737 1.46427,3.325578 2.24128,4.965295 2.57151,5.422256 5.24595,10.780471 8.10308,16.033764 0.2167,0.398426 0.47132,0.774939 0.68963,1.172361 2.64086,4.807685 5.40301,9.549597 8.27549,14.20626 1.1647,1.890066 2.4187,3.719722 3.62053,5.585956 2.23372,3.461207 4.50221,6.905632 6.86176,10.275401 1.06917,1.526707 2.14691,3.044167 3.24123,4.55152 2.78557,3.837035 5.63972,7.601205 8.58582,11.309835 0.7817,0.98743 1.55051,1.98706 2.34473,2.96539 3.79856,4.67014 7.71168,9.2725 11.75809,13.72352 0.47611,0.52372 0.96876,1.03106 1.44821,1.55165 3.61124,3.92113 7.34033,7.7075 11.13743,11.44777 1.44174,1.42122 2.91239,2.81263 4.37912,4.2067 2.93942,2.79019 5.92357,5.52623 8.96511,8.20653 1.61376,1.42104 3.21998,2.85165 4.86185,4.24119 3.209,2.71773 6.51371,5.3365 9.82715,7.93068 1.39711,1.09581 2.75652,2.23769 4.17222,3.3102 4.7917,3.62754 9.66193,7.15299 14.65452,10.51677 0.0687,0.0463 0.13807,0.0916 0.20689,0.13792 -0.3243,-3.77944 -0.66823,-7.56391 -0.86203,-11.3788 -0.28193,-5.5495 -0.41378,-11.13912 -0.41378,-16.75787 0,-5.61875 0.13185,-11.20837 0.41378,-16.75787 0.28193,-5.5495 0.71882,-11.0431 1.2758,-16.5165 0.55699,-5.4734 1.24368,-10.91918 2.06887,-16.30961 0.8252,-5.390435 1.77541,-10.733169 2.86195,-16.033764 1.08653,-5.300596 2.31399,-10.553999 3.655,-15.757914 1.34102,-5.203916 2.79048,-10.347222 4.37912,-15.447584 1.58864,-5.100361 3.3083,-10.147296 5.1377,-15.137252 1.8294,-4.989955 3.7985,-9.954235 5.8618,-14.826921 2.06331,-4.872687 4.22661,-9.664593 6.51695,-14.413147 2.29035,-4.748554 4.69605,-9.4507763 7.20658,-14.0683347 2.51053,-4.6175583 5.13786,-9.1403683 7.86171,-13.6200793 2.72385,-4.479711 5.55207,-8.905796 8.48238,-13.240785 2.93031,-4.334989 5.93866,-8.609115 9.06856,-12.79253 3.1299,-4.183415 6.36658,-8.284804 9.68922,-12.309793 3.32264,-4.024989 6.7324,-7.967367 10.24092,-11.827056 3.50852,-3.859689 7.10508,-7.622301 10.79262,-11.309838 3.68754,-3.687536 7.48463,-7.284098 11.34432,-10.792619 3.85969,-3.508521 7.80207,-6.918277 11.82706,-10.240923 4.02499,-3.32264 8.12637,-6.55932 12.30979,-9.68922 4.18341,-3.1299 8.45754,-6.17273 12.792529,-9.10304 4.334989,-2.93031 8.726604,-5.75853 13.206304,-8.48238 4.4797,-2.72385 9.037002,-5.35118 13.65456,-7.86171 3.985068,-2.16665 8.023398,-4.20993 12.102906,-6.20662 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.45;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.45;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path3645-5-0-4-2-2-9-5-7-5"
          d="m -59.61951,-419.57064 c -170.30984,0 -310.29239,131.13468 -324.60613,297.77975 6.48668,-4.36246 13.12546,-8.48166 19.93014,-12.37876 6.80467,-3.89709 13.76123,-7.55613 20.86113,-10.96502 7.0999,-3.4089 14.35078,-6.58448 21.72316,-9.48234 7.37238,-2.89785 14.89412,-5.53222 22.51624,-7.89619 7.62211,-2.36398 15.35676,-4.46834 23.20585,-6.27559 7.8491,-1.80724 15.80768,-3.32384 23.861,-4.55152 8.05332,-1.22767 16.1779,-2.16771 24.4127,-2.79297 8.2348,-0.62527 16.57088,-0.931 24.9644,-0.931 5.61875,0 11.20833,0.13189 16.75787,0.41378 5.54953,0.28188 11.04304,0.71888 16.5165,1.2758 5.47345,0.55692 10.91911,1.24379 16.30961,2.06888 5.3905,0.82508 10.73307,1.77554 16.03376,2.86194 5.3007,1.08639 10.55389,2.31415 15.75792,3.65501 5.20402,1.34085 10.38157,2.79066 15.48206,4.37911 5.1005,1.58845 10.147156,3.30851 15.137255,5.1377 4.990099,1.82919 9.919588,3.76426 14.79244,5.82732 4.872852,2.06307 9.664417,4.26134 14.413147,6.55144 0.63932,0.30831 1.259464,0.65311 1.896467,0.96547 0.647485,-0.31691 1.280516,-0.65176 1.930948,-0.96547 4.748554,-2.29035 9.574941,-4.48812 14.447628,-6.55144 4.872686,-2.06331 9.802484,-3.99792 14.79244,-5.82732 4.989955,-1.8294 10.036891,-3.54906 15.137252,-5.1377 5.1003618,-1.58864 10.2436678,-3.07258 15.4475834,-4.4136 5.2039156,-1.34101 10.4573186,-2.53398 15.7579136,-3.62052 5.300596,-1.08654 10.64333,-2.03675 16.033764,-2.86194 5.390434,-0.8252 10.836215,-1.54636 16.309614,-2.10336 5.473399,-0.55699 11.001482,-0.95939 16.550982,-1.24132 5.5495,-0.28193 11.13912,-0.41378 16.757869,-0.41378 5.61875,0 11.173888,0.13185 16.723387,0.41378 5.5495,0.28193 11.07758,0.68433 16.55098,1.24132 5.4734,0.557 10.91918,1.27816 16.30962,2.10336 5.39043,0.82519 10.73317,1.7754 16.03376,2.86194 5.3006,1.08654 10.554,2.27951 15.75791,3.62052 5.20392,1.34102 10.34723,2.82496 15.44759,4.4136 5.10036,1.58864 10.14729,3.3083 15.13725,5.1377 4.98996,1.8294 9.91975,3.76401 14.79244,5.82732 4.87269,2.06332 9.69907,4.26109 14.44763,6.55144 4.74855,2.29034 9.41629,4.66156 14.03385,7.17209 4.61756,2.51053 9.17486,5.13786 13.65456,7.86171 4.25897,2.58963 8.45733,5.29221 12.58564,8.06861 -14.30081,-166.6553 -154.28798,-297.77975 -324.60613,-297.77975 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.65;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.65;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
       <path
-         inkscape:connector-curvature="0"
          id="path3116"
          d="m -241.12861,176.95433 c -0.20625,-0.13878 -0.41467,-0.27453 -0.62066,-0.41377 -4.33499,-2.93031 -8.60912,-5.97314 -12.79253,-9.10304 -4.18342,-3.1299 -8.28481,-6.36658 -12.3098,-9.68922 -4.02499,-3.32265 -7.96736,-6.7324 -11.82705,-10.24092 -3.85969,-3.50852 -7.6223,-7.10509 -11.30984,-10.79262 -3.68754,-3.68754 -7.2841,-7.45015 -10.79262,-11.30984 -3.50852,-3.85969 -6.95276,-7.80207 -10.2754,-11.82706 -3.32264,-4.02499 -6.52484,-8.12637 -9.65474,-12.30979 -3.1299,-4.183414 -6.17273,-8.45754 -9.10304,-12.792529 -2.93031,-4.334989 -5.75853,-8.761086 -8.48238,-13.240785 -2.72385,-4.4797 -5.35119,-9.002521 -7.86172,-13.620079 -2.51053,-4.617559 -4.91622,-9.319781 -7.20657,-14.068335 -2.29035,-4.748554 -4.45365,-9.54046 -6.51695,-14.413147 -2.0633,-4.872686 -3.99792,-9.836966 -5.82732,-14.826921 -1.82941,-4.989956 -3.54906,-10.0368908 -5.1377,-15.1372524 -1.58864,-5.1003617 -3.07258,-10.2436676 -4.4136,-15.4475836 -1.34101,-5.203915 -2.53399,-10.457318 -3.62053,-15.757914 -1.08654,-5.300595 -2.07122,-10.643329 -2.89642,-16.033764 -0.8252,-5.390434 -1.51189,-10.836214 -2.06887,-16.309613 -0.55699,-5.473399 -0.9594,-10.967001 -1.24132,-16.516501 -0.28193,-5.5495 -0.44826,-11.13912 -0.44826,-16.757869 0,-5.61875 0.16633,-11.208367 0.44826,-16.757867 0.19383,-3.8155 0.53766,-7.59877 0.86203,-11.3788 -87.05965,58.549736 -144.40732,157.956678 -144.40732,270.60855 0,179.80001 146.08193,325.91642 325.88194,325.91642 51.3316,0 99.88169,-11.96705 143.097029,-33.17092 -4.078813,-2.00117 -8.12181,-4.04213 -12.102906,-6.20662 -4.617558,-2.51053 -9.17486,-5.13787 -13.65456,-7.86172 -4.4797,-2.72385 -8.871315,-5.55207 -13.206304,-8.48238 -4.334989,-2.9303 -8.609119,-5.97313 -12.792529,-9.10304 -4.18342,-3.1299 -8.2848,-6.33209 -12.30979,-9.65474 -4.02499,-3.32264 -7.96737,-6.76688 -11.82706,-10.2754 -3.85969,-3.50852 -7.65678,-7.10508 -11.34432,-10.79262 -3.68754,-3.68753 -7.2841,-7.45014 -10.79262,-11.30983 -3.50852,-3.85969 -6.91828,-7.80208 -10.24092,-11.82706 -3.32264,-4.02498 -6.55932,-8.12638 -9.68922,-12.30979 -3.1299,-4.18342 -6.13825,-8.45754 -9.06856,-12.79253 -2.93031,-4.33499 -5.75853,-8.72661 -8.48238,-13.20631 -2.72385,-4.4797 -5.35118,-9.037 -7.86171,-13.65456 -2.51053,-4.61756 -4.91623,-9.31978 -7.20658,-14.06833 -2.29034,-4.74856 -4.45364,-9.54046 -6.51695,-14.41315 -2.0633,-4.87268 -4.0324,-9.80248 -5.8618,-14.79244 -1.8294,-4.98995 -3.54906,-10.03689 -5.1377,-15.13725 -1.58864,-5.10036 -3.0381,-10.27815 -4.37912,-15.48207 -1.34101,-5.20391 -2.56847,-10.45731 -3.655,-15.75791 -1.08654,-5.30059 -2.03675,-10.64333 -2.86195,-16.03376 -0.82519,-5.39044 -1.51188,-10.80174 -2.06887,-16.27514 -0.17409,-1.71082 -0.26631,-3.45369 -0.41377,-5.17218 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.86396921;marker:none;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker-add-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker-add-hicontrast.svg
index 09870ff48..93b68b655 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker-add-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker-add-hicontrast.svg
@@ -2,59 +2,16 @@
 <!-- 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="33.75"
-     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>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,39 +55,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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"
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 17.5,14.5 v 3 h -3 v 1.999999 h 3 V 22.5 h 1.999999 V 19.499999 H 22.5 V 17.5 h -3.000001 v -3 z"
-       id="rect2927"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       id="rect2927" />
     <path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.3266921"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.3266921"
        d="M 19.925781 1.0039062 C 18.339371 1.1365417 17.166512 2.369779 16.287109 3.5878906 C 15.983899 4.0023507 15.598363 4.3816065 15.080078 4.4824219 C 14.449647 4.8426999 13.927214 5.398613 13.507812 5.984375 C 12.960809 6.8828098 13.556016 7.9202525 14.148438 8.625 C 14.965672 9.5294466 15.968795 10.505312 17.255859 10.568359 C 18.145422 10.540249 18.758746 9.7583979 19.337891 9.171875 C 19.575097 8.6352599 19.779974 8.0379511 20.316406 7.7265625 C 21.40338 6.7821111 22.639686 5.7804332 22.919922 4.2832031 C 23.243079 3.0583515 22.571361 1.6511303 21.359375 1.21875 C 20.905795 1.0309215 20.412996 0.98294529 19.925781 1.0039062 z M 15.806641 5.7402344 C 16.530358 5.7208158 18.139316 6.9834451 18.199219 8.2050781 C 18.159376 8.4621105 17.647033 8.8740782 17.314453 9.1074219 C 17.04034 9.327167 16.877887 9.2353204 16.628906 9.1621094 C 15.922112 8.8485353 15.342642 8.3120018 14.8125 7.4042969 C 14.667763 7.0628521 14.490162 6.9461703 14.888672 6.484375 C 15.544761 5.8178642 14.635832 6.7326036 15.556641 5.8300781 C 15.616796 5.7711182 15.703252 5.7430085 15.806641 5.7402344 z "
        id="path9921-9-3-9-8-3" />
     <path
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
        d="M 13.361265,7.2405538 C 12.142709,8.5071436 10.869037,9.7298325 9.6482164,10.991742 8.5134581,12.131321 7.3720486,13.265681 6.2838175,14.448451 5.913391,15.123782 5.86431,15.997565 5.2416812,16.518207 c -0.5111809,0.68707 -0.218587,1.72157 0.4470727,2.19334 0.5159934,0.429344 1.3132151,0.356101 1.8118939,-0.06562 0.4568579,-0.323543 0.9441272,-0.630713 1.5013907,-0.727044 1.1485835,-0.46639 1.8411185,-1.556446 2.7365315,-2.347446 1.689349,-1.688256 3.378919,-3.376339 5.068721,-5.064147 -0.007,-0.0016 -0.01445,-0.0022 -0.02148,-0.0039 -0.07608,-0.01718 -0.151099,-0.03709 -0.225066,-0.06028 -0.07397,-0.02303 -0.147039,-0.04919 -0.218939,-0.07784 -0.07191,-0.02849 -0.14294,-0.06023 -0.212849,-0.09383 -0.06991,-0.03358 -0.138802,-0.06948 -0.206759,-0.107576 -0.03864,-0.02186 -0.07631,-0.0456 -0.114447,-0.06867 -2.261535,2.250358 -4.491866,4.534447 -6.7905862,6.741815 -0.6167308,0.35629 -1.4660616,0.286537 -1.9446344,0.87508 C 6.9051159,17.966274 6.5202631,18.130386 6.2646175,17.915803 5.9640606,17.744369 5.8147586,17.2551 6.125776,17.023207 6.4525247,16.700558 6.7519175,16.325111 6.8131497,15.855969 6.9287275,15.36596 7.0790059,14.838631 7.5058674,14.52852 9.6059945,12.41051 11.725962,10.311752 13.828038,8.1956716 13.792911,8.1439522 13.755244,8.0943793 13.72199,8.040787 13.656694,7.9356309 13.596146,7.8274696 13.541928,7.7165369 13.514994,7.6610701 13.48911,7.6052527 13.465655,7.5486933 13.44223,7.4921338 13.420876,7.4344817 13.401563,7.3770247 13.38634,7.3317451 13.373455,7.2861941 13.36112,7.2404858 Z"
-       id="path17041-7"
-       inkscape:connector-curvature="0" />
+       id="path17041-7" />
     <path
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 5.5,21 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path822" />
     <path
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
        d="m 6.408409,17.970709 c -0.2419556,-0.08377 -0.4330129,-0.342137 -0.4344249,-0.587472 -8.522e-4,-0.14806 0.030543,-0.202296 0.2604321,-0.449904 0.379501,-0.408751 0.4877811,-0.620718 0.6432726,-1.259259 0.043352,-0.178029 0.1315081,-0.425181 0.2060864,-0.577778 L 7.2141028,14.82963 10.520922,11.525926 c 2.873023,-2.870317 3.310876,-3.2966438 3.337743,-3.2498855 0.07866,0.1368893 0.498618,0.6040131 0.858755,0.9551984 0.364964,0.3558923 0.733564,0.6623936 0.968195,0.8050811 l 0.09436,0.05738 -2.688938,2.693889 c -3.3473064,3.353471 -4.0311553,4.015967 -4.2470255,4.114415 -0.087761,0.04002 -0.3728984,0.134291 -0.6336391,0.209484 -0.6433785,0.185537 -0.8456359,0.286514 -1.1001997,0.549271 -0.2917981,0.30119 -0.4830626,0.385666 -0.7017617,0.309947 z"
-       id="path3821"
-       inkscape:connector-curvature="0" />
+       id="path3821" />
     <path
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
        d="m 16.795987,9.1976036 c -0.55423,-0.145102 -1.270338,-0.740807 -1.74445,-1.4511456 -0.287392,-0.4305858 -0.41219,-0.7065701 -0.385013,-0.8514368 0.03052,-0.1626656 0.167436,-0.3386626 0.574113,-0.7379666 0.426397,-0.4186671 0.469486,-0.4400701 0.763202,-0.3790949 0.671118,0.1393235 1.645127,0.9939391 1.998794,1.7537832 0.157684,0.3387793 0.214482,0.6554251 0.140021,0.7806121 -0.124833,0.209875 -0.522707,0.5781327 -0.861306,0.7971949 -0.18876,0.1221209 -0.287097,0.1399609 -0.485361,0.088054 z"
-       id="path3823"
-       inkscape:connector-curvature="0" />
+       id="path3823" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker-add.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker-add.svg
index b42b8371d..f35c8346a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker-add.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker-add.svg
@@ -2,59 +2,16 @@
 <!-- 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.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.9;fill:#2a7fff;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"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;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 17 13 L 17 17 L 13 17 L 13 19 L 17 19 L 17 23 L 19 23 L 19 19 L 23 19 L 23 17 L 19 17 L 19 13 L 17 13 z "
        id="rect2927" />
     <g
@@ -110,27 +65,21 @@
        transform="matrix(1.0202479,0,0,1.0202479,-0.6747804,0.12719524)"
        style="stroke-width:0.98015398">
       <path
-         inkscape:connector-curvature="0"
          id="path9921-9-3-9-8"
          d="m 20.191073,0.86004269 c -1.554926,0.1300032 -2.703169,1.33895921 -3.565119,2.53289611 -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.8435681 3.044172,1.9053641 0.871909,-0.02755 1.474522,-0.7945342 2.042174,-1.369417 C 19.848788,8.3385656 20.048636,7.7544813 20.574422,7.4492725 21.639823,6.5235648 22.850934,5.5403198 23.125608,4.0728038 23.442352,2.8722607 22.785718,1.4929871 21.597786,1.0691879 21.153207,0.88508699 20.668618,0.83948244 20.191073,0.86002739 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.32020855" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.32020855" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:0.98163986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:0.98163986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1.0"
          d="m 15.910151,5.5898866 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 0.32598,-0.2287128 0.827398,-0.6333765 0.866451,-0.8853078 -0.0671,-1.3684439 -2.117412,-2.7893727 -2.589101,-2.3270546 z"
-         id="path6419-3-9-4-4"
-         sodipodi:nodetypes="ccccccs" />
+         id="path6419-3-9-4-4" />
       <path
-         inkscape:connector-curvature="0"
          id="path17041"
          d="m 13.757485,6.9721864 c -1.194372,1.241453 -2.442767,2.4398764 -3.639359,3.6767416 -1.1122378,1.116963 -2.2309948,2.228811 -3.2976288,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.1257888,-0.457134 1.8045798,-1.525557 2.6822218,-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.6558198,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.0584478,-2.075976 4.1363428,-4.133082 6.1967008,-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"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.32020855" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.32020855" />
     </g>
     <path
-       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 5.5,21 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path822" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker-bars.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker-bars.svg
index f6c57ea40..0be923d08 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker-bars.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker-bars.svg
@@ -2,59 +2,16 @@
 <!-- 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-bars.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>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.9;fill:#2a7fff;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"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2925"
        width="9"
        height="2"
@@ -110,14 +65,14 @@
        y="21"
        ry="0" />
     <rect
-       style="opacity:0.9;fill:#2a7fff;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"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2927"
        width="9"
        height="2"
        x="13"
        y="18" />
     <rect
-       style="opacity:0.9;fill:#2a7fff;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"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2929"
        width="9"
        height="2"
@@ -128,27 +83,21 @@
        transform="matrix(1.0202479,0,0,1.0202479,-1.6747804,0.12719524)"
        style="stroke-width:0.98015398">
       <path
-         inkscape:connector-curvature="0"
          id="path9921-9-3-9-8"
          d="m 20.191073,0.86004269 c -1.554926,0.1300032 -2.703169,1.33895921 -3.565119,2.53289611 -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.8435681 3.044172,1.9053641 0.871909,-0.02755 1.474522,-0.7945342 2.042174,-1.369417 C 19.848788,8.3385656 20.048636,7.7544813 20.574422,7.4492725 21.639823,6.5235648 22.850934,5.5403198 23.125608,4.0728038 23.442352,2.8722607 22.785718,1.4929871 21.597786,1.0691879 21.153207,0.88508699 20.668618,0.83948244 20.191073,0.86002739 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.32020855" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.32020855" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:0.98163986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:0.98163986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1.0"
          d="m 15.910151,5.5898866 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 0.32598,-0.2287128 0.827398,-0.6333765 0.866451,-0.8853078 -0.0671,-1.3684439 -2.117412,-2.7893727 -2.589101,-2.3270546 z"
-         id="path6419-3-9-4-4"
-         sodipodi:nodetypes="ccccccs" />
+         id="path6419-3-9-4-4" />
       <path
-         inkscape:connector-curvature="0"
          id="path17041"
          d="m 13.757485,6.9721864 c -1.194372,1.241453 -2.442767,2.4398764 -3.639359,3.6767416 -1.1122378,1.116963 -2.2309948,2.228811 -3.2976288,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.1257888,-0.457134 1.8045798,-1.525557 2.6822218,-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.6558198,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.0584478,-2.075976 4.1363428,-4.133082 6.1967008,-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"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.32020855" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.32020855" />
     </g>
     <path
-       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 4.5,21 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path822" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker-hicontrast.svg
index 20ece03b7..8e70dc54f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker-hicontrast.svg
@@ -2,59 +2,16 @@
 <!-- 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="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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     showguides="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,28 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.3266921"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.3266921"
        d="m 19.925781,1.0039062 c -1.58641,0.1326355 -2.759269,1.3658728 -3.638672,2.5839844 -0.30321,0.4144601 -0.688746,0.7937159 -1.207031,0.8945313 -0.630431,0.360278 -1.152864,0.9161911 -1.572266,1.5019531 -0.547003,0.8984348 0.0482,1.9358775 0.640626,2.640625 0.817234,0.9044466 1.820357,1.880312 3.107421,1.943359 0.889563,-0.02811 1.502887,-0.8099611 2.082032,-1.396484 C 19.575097,8.6352599 19.779974,8.0379511 20.316406,7.7265625 21.40338,6.7821111 22.639686,5.7804332 22.919922,4.2832031 23.243079,3.0583515 22.571361,1.6511303 21.359375,1.21875 20.905795,1.0309215 20.412996,0.98294526 19.925781,1.0039062 Z m -4.11914,4.7363282 c 0.723717,-0.019419 2.332675,1.2432107 2.392578,2.4648437 -0.03984,0.2570324 -0.552186,0.6690001 -0.884766,0.9023438 C 17.04034,9.327167 16.877887,9.2353204 16.628906,9.1621094 15.922112,8.8485353 15.342642,8.3120018 14.8125,7.4042969 14.667763,7.0628521 14.490162,6.9461703 14.888672,6.484375 c 0.656089,-0.6665108 -0.25284,0.2482286 0.667969,-0.6542969 0.06015,-0.05896 0.146611,-0.08707 0.25,-0.089844 z"
        id="path9921-9-3-9-8-3" />
     <path
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
        d="M 13.361265,7.2405538 C 12.142709,8.5071436 10.869037,9.7298325 9.6482164,10.991742 8.5134581,12.131321 7.3720486,13.265681 6.2838175,14.448451 5.913391,15.123782 5.86431,15.997565 5.2416812,16.518207 c -0.5111809,0.68707 -0.218587,1.72157 0.4470727,2.19334 0.5159934,0.429344 1.3132151,0.356101 1.8118939,-0.06562 0.4568579,-0.323543 0.9441272,-0.630713 1.5013907,-0.727044 1.1485835,-0.46639 1.8411185,-1.556446 2.7365315,-2.347446 1.689349,-1.688256 3.378919,-3.376339 5.068721,-5.064147 -0.007,-0.0016 -0.01445,-0.0022 -0.02148,-0.0039 -0.07608,-0.01718 -0.151099,-0.03709 -0.225066,-0.06028 -0.07397,-0.02303 -0.147039,-0.04919 -0.218939,-0.07784 -0.07191,-0.02849 -0.14294,-0.06023 -0.212849,-0.09383 -0.06991,-0.03358 -0.138802,-0.06948 -0.206759,-0.107576 -0.03864,-0.02186 -0.07631,-0.0456 -0.114447,-0.06867 -2.261535,2.250358 -4.491866,4.534447 -6.7905862,6.741815 -0.6167308,0.35629 -1.4660616,0.286537 -1.9446344,0.87508 C 6.9051159,17.966274 6.5202631,18.130386 6.2646175,17.915803 5.9640606,17.744369 5.8147586,17.2551 6.125776,17.023207 6.4525247,16.700558 6.7519175,16.325111 6.8131497,15.855969 6.9287275,15.36596 7.0790059,14.838631 7.5058674,14.52852 9.6059945,12.41051 11.725962,10.311752 13.828038,8.1956716 13.792911,8.1439522 13.755244,8.0943793 13.72199,8.040787 13.656694,7.9356309 13.596146,7.8274696 13.541928,7.7165369 c -0.02693,-0.055467 -0.05282,-0.1112842 -0.07627,-0.1678436 -0.02342,-0.05656 -0.04478,-0.1142116 -0.06409,-0.1716686 -0.01522,-0.04528 -0.02811,-0.090831 -0.04044,-0.1365389 z"
-       id="path17041-7"
-       inkscape:connector-curvature="0" />
+       id="path17041-7" />
     <path
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
        d="m 6.408409,17.970709 c -0.2419556,-0.08377 -0.4330129,-0.342137 -0.4344249,-0.587472 -8.522e-4,-0.14806 0.030543,-0.202296 0.2604321,-0.449904 0.379501,-0.408751 0.4877811,-0.620718 0.6432726,-1.259259 0.043352,-0.178029 0.1315081,-0.425181 0.2060864,-0.577778 L 7.2141028,14.82963 10.520922,11.525926 c 2.873023,-2.870317 3.310876,-3.2966438 3.337743,-3.2498855 0.07866,0.1368893 0.498618,0.6040131 0.858755,0.9551984 0.364964,0.3558923 0.733564,0.6623936 0.968195,0.8050811 l 0.09436,0.05738 -2.688938,2.693889 c -3.3473064,3.353471 -4.0311553,4.015967 -4.2470255,4.114415 -0.087761,0.04002 -0.3728984,0.134291 -0.6336391,0.209484 -0.6433785,0.185537 -0.8456359,0.286514 -1.1001997,0.549271 -0.2917981,0.30119 -0.4830626,0.385666 -0.7017617,0.309947 z"
-       id="path3821"
-       inkscape:connector-curvature="0" />
+       id="path3821" />
     <path
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
        d="m 16.795987,9.1976036 c -0.55423,-0.145102 -1.270338,-0.740807 -1.74445,-1.4511456 -0.287392,-0.4305858 -0.41219,-0.7065701 -0.385013,-0.8514368 0.03052,-0.1626656 0.167436,-0.3386626 0.574113,-0.7379666 0.426397,-0.4186671 0.469486,-0.4400701 0.763202,-0.3790949 0.671118,0.1393235 1.645127,0.9939391 1.998794,1.7537832 0.157684,0.3387793 0.214482,0.6554251 0.140021,0.7806121 -0.124833,0.209875 -0.522707,0.5781327 -0.861306,0.7971949 -0.18876,0.1221209 -0.287097,0.1399609 -0.485361,0.088054 z"
-       id="path3823"
-       inkscape:connector-curvature="0" />
+       id="path3823" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker-hide.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker-hide.svg
index be180885e..bf6d31680 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker-hide.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker-hide.svg
@@ -2,59 +2,16 @@
 <!-- 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-hide.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,30 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.3266921"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.3266921"
        d="M 19.925119,1.004652 C 18.338709,1.1372875 17.167217,2.3707223 16.287814,3.5888339 15.984604,4.003294 15.5982,4.3818046 15.079915,4.48262 c -0.630431,0.360278 -1.151972,0.9167065 -1.571373,1.5024685 -0.547003,0.8984348 0.0484,1.9345795 0.640822,2.639327 0.817234,0.9044466 1.818747,1.8808965 3.105811,1.9439435 0.889563,-0.02811 1.504378,-0.8106217 2.083523,-1.3971446 0.237206,-0.5366151 0.4411,-1.1325259 0.977532,-1.4439145 1.086974,-0.9444514 2.322607,-1.947605 2.602843,-3.4448351 C 23.24223,3.0576132 22.572301,1.6504122 21.360315,1.2180319 20.906735,1.0302034 20.412334,0.98367544 19.925119,1.0046364 Z"
-       id="path9921-9-3-9-8"
-       inkscape:connector-curvature="0" />
+       id="path9921-9-3-9-8" />
     <path
-       sodipodi:nodetypes="ccccccs"
        id="path6419-3-9-4-4"
        d="m 15.557518,5.8302653 c -0.920809,0.9025255 -0.01357,-0.011674 -0.669659,0.6548368 -0.39851,0.4617953 -0.220777,0.5776263 -0.07604,0.9190711 0.530142,0.9077049 1.110702,1.4439447 1.817496,1.7575188 0.248981,0.073211 0.411609,0.1657251 0.685722,-0.05402 0.33258,-0.2333437 0.844151,-0.646201 0.883994,-0.9032334 -0.06846,-1.396152 -2.160285,-2.8458517 -2.641524,-2.3741726 z"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:1.00151598;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:1.00151598;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1.0" />
     <path
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
        d="M 13.361265,7.2405538 C 12.142709,8.5071436 10.869037,9.7298325 9.6482164,10.991742 8.5134581,12.131321 7.3720486,13.265681 6.2838175,14.448451 5.913391,15.123782 5.86431,15.997565 5.2416812,16.518207 c -0.5111809,0.68707 -0.218587,1.72157 0.4470727,2.19334 0.5159934,0.429344 1.3132151,0.356101 1.8118939,-0.06562 0.4568579,-0.323543 0.9441272,-0.630713 1.5013907,-0.727044 1.1485835,-0.46639 1.8411185,-1.556446 2.7365315,-2.347446 1.689349,-1.688256 3.378919,-3.376339 5.068721,-5.064147 -0.007,-0.0016 -0.01445,-0.0022 -0.02148,-0.0039 -0.07608,-0.01718 -0.151099,-0.03709 -0.225066,-0.06028 -0.07397,-0.02303 -0.147039,-0.04919 -0.218939,-0.07784 -0.07191,-0.02849 -0.14294,-0.06023 -0.212849,-0.09383 -0.06991,-0.03358 -0.138802,-0.06948 -0.206759,-0.107576 -0.03864,-0.02186 -0.07631,-0.0456 -0.114447,-0.06867 -2.261535,2.250358 -4.491866,4.534447 -6.7905862,6.741815 -0.6167308,0.35629 -1.4660616,0.286537 -1.9446344,0.87508 C 6.9051159,17.966274 6.5202631,18.130386 6.2646175,17.915803 5.9640606,17.744369 5.8147586,17.2551 6.125776,17.023207 6.4525247,16.700558 6.7519175,16.325111 6.8131497,15.855969 6.9287275,15.36596 7.0790059,14.838631 7.5058674,14.52852 9.6059945,12.41051 11.725962,10.311752 13.828038,8.1956716 13.792911,8.1439522 13.755244,8.0943793 13.72199,8.040787 13.656694,7.9356309 13.596146,7.8274696 13.541928,7.7165369 13.514994,7.6610701 13.48911,7.6052527 13.465655,7.5486933 13.44223,7.4921338 13.420876,7.4344817 13.401563,7.3770247 13.38634,7.3317451 13.373455,7.2861941 13.36112,7.2404858 Z"
-       id="path17041"
-       inkscape:connector-curvature="0" />
+       id="path17041" />
     <path
-       style="opacity:0.3;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 5.5,21 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path822" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker-small.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker-small.svg
index d83400653..f085e9c2d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker-small.svg
@@ -2,59 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.5"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -99,21 +56,15 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccs"
        id="path6419-3-9-4-4"
        d="m 10.011702,12.032957 c -0.5778024,0.566702 -0.0085,-0.0073 -0.4202075,0.411177 -0.2500628,0.289964 -0.1385361,0.362695 -0.047714,0.577091 0.3326613,0.569954 0.6969595,0.906663 1.1404685,1.103558 0.156234,0.04597 0.258282,0.10406 0.430287,-0.03392 0.208692,-0.146518 0.5297,-0.405754 0.554702,-0.567147 -0.04296,-0.876653 -1.355567,-1.78693 -1.657543,-1.490759 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:1.00151598;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:1.00151598;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1.0" />
     <path
-       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 3.5000001,21.500001 c 0,0.552285 -0.4477153,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.552284 0.4477153,-1 1,-1 0.5522847,0 1,0.447716 1,1 z"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path822" />
     <g
        id="g2672"
        transform="translate(0.31818177)">
@@ -121,13 +72,11 @@
          id="path17041"
          transform="translate(0,8)"
          d="M 8.5996094,4.6132812 C 7.9891853,5.2309506 7.3674012,5.8422033 6.7597656,6.4707031 6.0490574,7.1848845 5.3334202,7.8974278 4.6464844,8.6445312 a 0.2448101,0.24497104 0 0 0 -0.035156,0.048828 C 4.4758783,8.9404628 4.4084807,9.1951286 4.328125,9.4121094 4.2477692,9.6290908 4.1597161,9.8016252 4.0136719,9.9238281 a 0.2448101,0.24497104 0 0 0 -0.037109,0.041016 c -0.414866,0.5579799 -0.1942661,1.3358159 0.3261715,1.7128899 0.4295663,0.352432 1.0465094,0.292563 1.4453125,-0.04492 l -0.017578,0.01367 c 0.2791087,-0.197793 0.554147,-0.364305 0.8417968,-0.414062 A 0.2448101,0.24497104 0 0 0 6.625,11.216797 C 7.4370634,10.886847 7.886835,10.1655 8.4121094,9.7011719 a 0.2448101,0.24497104 0 0 0 0.00977,-0.011719 C 9.3185591,8.7927604 10.214748,7.8962737 11.111328,7 11.098918,7.0008725 11.088758,7.00741 11.076168,7.00781 10.6583,6.9873298 10.291674,6.8102187 9.9609375,6.5683594 8.7783993,7.7536562 7.6035634,8.9481747 6.4023438,10.103516 c -0.1447329,0.07969 -0.3434276,0.127975 -0.5703126,0.193359 -0.2332819,0.06723 -0.5032928,0.164694 -0.7011718,0.408203 a 0.2448101,0.24497104 0 0 0 -0.013672,0.01953 c -0.018269,0.02776 -0.066987,0.06555 -0.1015625,0.07617 -0.034575,0.01062 -0.034649,0.0086 -0.044922,0 a 0.2448101,0.24497104 0 0 0 -0.035156,-0.02539 c -0.022238,-0.01269 -0.062217,-0.06429 -0.070312,-0.103516 -0.0081,-0.03923 -0.0087,-0.03651 0.00781,-0.04883 a 0.2448101,0.24497104 0 0 0 0.027344,-0.02149 c 0.2194594,-0.216848 0.450492,-0.497389 0.5,-0.8769526 L 5.3984375,9.75 C 5.4691719,9.4499134 5.5532474,9.1916878 5.7363281,9.0585938 A 0.2448101,0.24497104 0 0 0 5.765625,9.0332031 C 6.8638741,7.924874 7.9727833,6.823097 9.0761719,5.7167969 8.8267121,5.4055299 8.599334,5.0104373 8.5996094,4.6132812 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.3266921"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.3266921" />
       <path
-         inkscape:connector-curvature="0"
          id="path9921-9-3-9-8"
          d="m 12.752348,9.002921 c -0.995464,0.083283 -1.730569,0.8577651 -2.282389,1.622626 -0.190263,0.260242 -0.432729,0.497912 -0.7579501,0.561214 -0.3955923,0.226221 -0.7228561,0.575607 -0.9860282,0.943411 -0.3432413,0.564133 0.030371,1.214736 0.4021127,1.657252 0.5128098,0.567908 1.1412536,1.181028 1.9488786,1.220615 0.558196,-0.01765 0.943989,-0.508995 1.3074,-0.877277 0.148845,-0.336944 0.276788,-0.71112 0.613396,-0.906644 0.682069,-0.593027 1.457422,-1.222914 1.633269,-2.163035 C 14.833816,10.29199 14.413439,9.4083983 13.652925,9.1369038 13.368306,9.0189649 13.058072,8.9897497 12.752348,9.0029112 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.3266921" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.3266921" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/color-picker.svg b/rtdata/icons/rawtherapee/scalable/apps/color-picker.svg
index d52d96633..22f4cda36 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/color-picker.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/color-picker.svg
@@ -2,59 +2,16 @@
 <!-- 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.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     showguides="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,35 +55,27 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g820"
        transform="matrix(1.0202479,0,0,1.0202479,-0.67478044,0.12719523)"
        style="stroke-width:0.98015398">
       <path
-         inkscape:connector-curvature="0"
          id="path9921-9-3-9-8"
          d="m 20.191073,0.86004269 c -1.554926,0.1300032 -2.703169,1.33895921 -3.565119,2.53289611 -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.8435681 3.044172,1.9053641 0.871909,-0.02755 1.474522,-0.7945342 2.042174,-1.369417 C 19.848788,8.3385656 20.048636,7.7544813 20.574422,7.4492725 21.639823,6.5235648 22.850934,5.5403198 23.125608,4.0728038 23.442352,2.8722607 22.785718,1.4929871 21.597786,1.0691879 21.153207,0.88508699 20.668618,0.83948244 20.191073,0.86002739 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.32020855" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.32020855" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:0.98163986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:0.98163986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1.0"
          d="m 15.910151,5.5898866 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 0.32598,-0.2287128 0.827398,-0.6333765 0.866451,-0.8853078 -0.0671,-1.3684439 -2.117412,-2.7893727 -2.589101,-2.3270546 z"
-         id="path6419-3-9-4-4"
-         sodipodi:nodetypes="ccccccs" />
+         id="path6419-3-9-4-4" />
       <path
-         inkscape:connector-curvature="0"
          id="path17041"
          d="m 13.757485,6.9721864 c -1.194372,1.241453 -2.442767,2.4398764 -3.639359,3.6767416 -1.1122378,1.116963 -2.2309948,2.228811 -3.2976288,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.1257888,-0.457134 1.8045798,-1.525557 2.6822218,-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.6558198,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.0584478,-2.075976 4.1363428,-4.133082 6.1967008,-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"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.32020855" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.32020855" />
     </g>
     <path
-       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 5.5,21 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
-       id="path822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssscs" />
+       id="path822" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/contrastmask-off.svg b/rtdata/icons/rawtherapee/scalable/apps/contrastmask-off.svg
index ed76efbbb..ae3d093ce 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/contrastmask-off.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/contrastmask-off.svg
@@ -2,59 +2,16 @@
 <!-- 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-off.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,58 +55,31 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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" />
+       d="m -28,3 10.392305,18 -20.78461,0 z" />
     <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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
+       id="path1669" />
     <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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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:#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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:3.91079855;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        transform="matrix(0.5147247,0,0,0.50810573,-16.312048,4.4711921)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/contrastmask-on.svg b/rtdata/icons/rawtherapee/scalable/apps/contrastmask-on.svg
index 9e3504128..24432898e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/contrastmask-on.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/contrastmask-on.svg
@@ -2,59 +2,16 @@
 <!-- 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-on.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-0.36719427"
-     inkscape:cy="0.21859217"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,58 +55,31 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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" />
+       d="m -28,3 10.392305,18 -20.78461,0 z" />
     <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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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" />
+       id="path1669" />
     <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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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"
+       style="opacity:0.7;fill:#ffcc00;fill-opacity:1.0;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.0;paint-order:normal"
        transform="matrix(0.5147247,0,0,0.50810573,-16.312048,4.4711921)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/copy.svg b/rtdata/icons/rawtherapee/scalable/apps/copy.svg
index 9471e1ea7..3903eae8c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/copy.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/copy.svg
@@ -2,209 +2,146 @@
 <!-- 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="copy.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="1.4222222"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -249,29 +186,26 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
        y="6"
        x="10"
        height="16"
        width="12"
        id="rect8448"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.627451;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        ry="2" />
     <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:0.4;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:2;stroke-linecap:round;stroke-linejoin:round;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"
+       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.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;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 4 1 C 2.3552972 1 1 2.3552972 1 4 L 1 16 C 1 17.644703 2.3552972 19 4 19 L 8 19 L 8 17 L 4 17 C 3.4287028 17 3 16.571297 3 16 L 3 4 C 3 3.4287028 3.4287028 3 4 3 L 12 3 C 12.571297 3 13 3.4287028 13 4 L 15 4 C 15 2.3552972 13.644703 1 12 1 L 4 1 z "
        id="rect8450" />
     <path
-       style="opacity:0.4;fill:#2a7fff;fill-opacity:0.66666669;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.4;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 4 3 C 3.446 3 3 3.446 3 4 L 3 16 C 3 16.554 3.446 17 4 17 L 8 17 L 8 7 C 8 5.3552972 9.3552972 4 11 4 L 13 4 C 13 3.446 12.554 3 12 3 L 4 3 z "
        id="rect8473" />
     <path
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 5.9921875,8.4921875 C 5.6728578,8.4889857 5.416542,8.8315216 5.5195312,9.1367188 5.6181063,11.042494 6.9051139,12.686438 8.4421297,13.713995 9.5005123,14.414263 10.741564,14.810591 12,14.935547 c 0,0.664062 0,1.328125 0,1.992187 1.999559,-1.15506 3.999559,-2.309357 6,-3.46289 C 16,12.309896 14,11.154948 12,10 c 0,0.654297 0,1.308594 0,1.962891 C 10.530408,11.906189 8.9376429,11.733247 7.7871034,10.71553 7.1498358,10.195884 6.6848801,9.4880406 6.4160156,8.7167969 6.3257385,8.5764539 6.1592196,8.4910872 5.9921875,8.4921875 Z"
-       id="path8807"
-       inkscape:connector-curvature="0" />
+       id="path8807" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crop-auto-small.svg b/rtdata/icons/rawtherapee/scalable/apps/crop-auto-small.svg
index 6d8ac3ea7..5624463e2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crop-auto-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crop-auto-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="crop-auto-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,35 +56,27 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="m 1,11 v 2 h 10 v 10 h 2 V 11 Z"
-       id="rect1324"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect1324" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="M 7.9472656,19 C 7.9775765,19.42477 7.6864119,19.784296 7.3316451,19.980141 6.8220082,20.320094 6.3123713,20.660047 5.8027344,21 8.8684896,21 11.934245,21 15,21 c 0,-0.666667 0,-1.333333 0,-2 -2.350911,0 -4.701823,0 -7.0527344,0 z"
-       id="path879"
-       inkscape:connector-curvature="0" />
+       id="path879" />
     <path
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="M 5,16.503906 C 4.3333333,16.052083 3.6666667,15.60026 3,15.148438 3,17.098958 3,19.049479 3,21 c 0.9342448,0 1.8684896,0 2.8027344,0 0.5930099,-0.398845 1.1923238,-0.788671 1.78125,-1.193359 C 7.7956078,19.642038 8.0419175,19.203839 7.9012819,19 6.9341879,19 5.967094,19 5,19 5,18.167969 5,17.335937 5,16.503906 Z"
-       id="path877"
-       inkscape:connector-curvature="0" />
+       id="path877" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="M 3 1 L 3 7.1484375 L 5 8.5039062 L 5 1 L 3 1 z "
        id="rect1322"
        transform="translate(0,8)" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="Symbol-4-6-8"
        d="M 1,17.238584 V 15 L 6.950059,19.034097 1,23 v -2.198912 z"
-       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:0.04999533" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crop-auto.svg b/rtdata/icons/rawtherapee/scalable/apps/crop-auto.svg
index bc662e9ea..c74bc4a64 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crop-auto.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crop-auto.svg
@@ -2,57 +2,16 @@
 <!-- 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="crop-auto.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,41 +55,33 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
        id="path819"
        d="M -26,1 V 20 H -7 V 16 H -22 V 1 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal" />
     <g
        id="g832">
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
          d="m 11.712891,16 c 0.604599,0.961124 0.209593,2.336093 -0.779834,2.87075 C 10.368132,19.247167 9.8032064,19.623583 9.2382812,20 13.825521,20 18.41276,20 23,20 c 0,-1.333333 0,-2.666667 0,-4 -3.76237,0 -7.524739,0 -11.287109,0 z"
-         id="path849"
-         inkscape:connector-curvature="0" />
+         id="path849" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
          d="M 8,13.240234 C 6.6666667,12.335937 5.3333333,11.431641 4,10.527344 4,13.684896 4,16.842448 4,20 5.7460937,20 7.4921875,20 9.2382812,20 9.9048153,19.548741 10.585369,19.117421 11.242188,18.652344 12.019524,18.039287 12.235167,16.842992 11.712891,16 10.475261,16 9.2376303,16 8,16 8,15.080078 8,14.160156 8,13.240234 Z"
-         id="path847"
-         inkscape:connector-curvature="0" />
+         id="path847" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
          d="M 4 1 L 4 10.527344 L 8 13.240234 L 8 1 L 4 1 z "
          id="path826" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
          d="M 20,23 V 4 H 1 v 4 h 15 v 15 z"
          id="path828" />
     </g>
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="Symbol-4-6-8"
        d="M 1,14.357876 V 11 L 9.925089,17.051146 1,23 v -3.298368 z"
-       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:0.04999533" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crop-point-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/crop-point-hicontrast.svg
index 4a06bfcba..7ddece7e0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crop-point-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crop-point-hicontrast.svg
@@ -2,60 +2,16 @@
 <!-- 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="crop-point-hicontrast.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.125"
-     inkscape:cx="9.3254084"
-     inkscape:cy="13.601222"
-     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-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -99,53 +55,39 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path857"
        d="m 188.5,3.5 h -5 v 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" />
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccccc"
        id="path859"
        d="m 190.5,8 v 12.5 h 12 v -2 h -10 V 8 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"
-       inkscape:connector-curvature="0" />
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cccccccccccc"
-       inkscape:connector-curvature="0"
        id="path861"
        d="m 187.5,10.5 v 2 h 3 v -2 z m 11,12 h 2 v -12 h -8 v 2 h 6 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" />
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
-       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"
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 8.5,5.5 v 14 h 14 v -3 h -11 v -11 z"
-       id="path865"
-       sodipodi:nodetypes="ccccccc" />
+       id="path865" />
     <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"
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 5.5,8.5 v 3 h 3 v -3 z m 11,14 h 3 v -14 h -8 v 3 h 5 z"
-       id="path867"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path867" />
     <circle
        cy="4"
        cx="-10"
        id="circle869"
-       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"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal"
        r="1.5" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path871"
        d="m 48.5,3.5 h -5 v 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" />
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <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"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal"
        id="path1820"
        cx="3.5"
        cy="3.5"
@@ -154,20 +96,16 @@
        id="g1502"
        transform="translate(-314,-197)">
       <path
-         sodipodi:nodetypes="ccccccc"
          id="path865-3"
          d="m 284.5,205 v 12.5 h 12 v -2 h -10 V 205 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"
-         inkscape:connector-curvature="0" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
       <path
-         sodipodi:nodetypes="cccccccccccc"
-         inkscape:connector-curvature="0"
          id="path867-6"
          d="m 281.5,207.5 v 2 h 3 v -2 z m 11,12 h 2 v -12 h -8 v 2 h 6 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" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
       <circle
          r="1.5"
-         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"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal"
          id="circle869-7"
          cx="279"
          cy="202" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crop-small.svg b/rtdata/icons/rawtherapee/scalable/apps/crop-small.svg
index 94c0b43df..0266ae19e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crop-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crop-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="crop-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,20 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="M 3,9 V 21 H 15 V 19 H 5 V 9 Z"
-       id="rect1322"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect1322" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="m 1,11 v 2 h 10 v 10 h 2 V 11 Z"
-       id="rect1324"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect1324" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crop.svg b/rtdata/icons/rawtherapee/scalable/apps/crop.svg
index 8fd598f60..72653e0c0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crop.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crop.svg
@@ -2,57 +2,16 @@
 <!-- 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="crop.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,18 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="M 4 1 L 4 20 L 23 20 L 23 16 L 8 16 L 8 1 L 4 1 z "
        id="rect1322" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="m 1,4 v 4 h 15 v 15 h 4 V 4 Z"
-       id="rect1324"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect1324" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-in.svg b/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-in.svg
index 8a4c71dc8..17c4ea79a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-in.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-in.svg
@@ -2,57 +2,16 @@
 <!-- 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="crossed-arrows-in.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <linearGradient
@@ -108,27 +67,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 17.211202,6.8416774 23,6.0147076 18.038177,1.0528839 Z"
        id="path2876" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 1.052887,6.0147071 6.8416789,6.8416795 6.0147103,1.0528839 Z"
        id="path2866" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 18.038177,22.999997 23,18.038174 17.211202,17.211203 Z"
        id="path2864" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 6.0147103,22.999997 6.8416801,17.211199 1.052887,18.038174 Z"
        id="path2893" />
     <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.38613355;marker:none;enable-background:accumulate"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.38613355;marker:none;enable-background:accumulate"
        d="m 8.3521775,7.2819771 -1.0704656,1.0696776 3.6748991,3.6748993 -3.6748991,3.674899 1.0704656,1.069678 3.6741115,-3.674899 3.674899,3.674899 1.06889,-1.069678 -3.674111,-3.674899 3.674111,-3.6748993 -1.06889,-1.0696776 -3.674899,3.6748989 z"
        id="path4083" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-out.svg b/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-out.svg
index 5eb5ba4b1..6aa419d86 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-out.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crossed-arrows-out.svg
@@ -2,57 +2,16 @@
 <!-- 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="crossed-arrows-out.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <linearGradient
@@ -108,31 +67,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 20.999798,3.0002065 15.211,3.8271763 20.172823,8.789 Z"
-       id="path2876"
-       inkscape:connector-curvature="0" />
+       id="path2876" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 8.7887919,3.8271768 3,3.0002044 3.8269686,8.789 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 20.172823,15.211206 15.211,20.173029 20.999798,21 Z"
-       id="path2864"
-       inkscape:connector-curvature="0" />
+       id="path2864" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 3.8269698,15.211202 3,21 8.7887931,20.173025 Z"
-       id="path2893"
-       inkscape:connector-curvature="0" />
+       id="path2893" />
     <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.38613355;marker:none;enable-background:accumulate"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.38613355;marker:none;enable-background:accumulate"
        d="m 8.3521775,7.2819771 -1.0704656,1.0696776 3.6748991,3.6748993 -3.6748991,3.674899 1.0704656,1.069678 3.6741115,-3.674899 3.674899,3.674899 1.06889,-1.069678 -3.674111,-3.674899 3.674111,-3.6748993 -1.06889,-1.0696776 -3.674899,3.6748989 z"
        id="path4083" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crosshair-adjust.svg b/rtdata/icons/rawtherapee/scalable/apps/crosshair-adjust.svg
index 4cde3415a..26e394a0f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crosshair-adjust.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crosshair-adjust.svg
@@ -2,57 +2,16 @@
 <!-- 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="crosshair-adjust.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,23 +55,18 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 8.017077,6 4.508542,1.3219482 1,5.9999999 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
        id="path5657"
        d="M 0.982923,18 4.491458,22.678052 8,18 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <path
-       style="opacity:0.7;fill:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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 V 8.845703 C 10.955564,8.629409 11.460388,8.5 12,8.5 c 0.539612,0 1.044436,0.129409 1.5,0.345703 V 3 C 13.5,2.169 12.831,1.5 12,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 8.845703 C 8.629409,13.044436 8.5,12.539612 8.5,12 c 0,-0.539612 0.129409,-1.044436 0.345703,-1.5 z m 12.154297,0 C 15.370591,10.955564 15.5,11.460388 15.5,12 c 0,0.539612 -0.129409,1.044436 -0.345703,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,15.154297 V 21 c 0,0.831 0.669,1.5 1.5,1.5 0.831,0 1.5,-0.669 1.5,-1.5 V 15.154297 C 13.044436,15.370591 12.539612,15.5 12,15.5 c -0.539612,0 -1.044436,-0.129409 -1.5,-0.345703 z"
-       id="path1448-3"
-       inkscape:connector-curvature="0" />
+       id="path1448-3" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crosshair-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/crosshair-hicontrast.svg
index a4dcc2592..e27a576a8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crosshair-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crosshair-hicontrast.svg
@@ -2,77 +2,25 @@
 <!-- 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="crosshair.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false"
-       visible="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid1438"
-       originx="1"
-       originy="1"
-       spacingx="0.5"
-       spacingy="0.5"
-       empspacing="22" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <mask
        maskUnits="userSpaceOnUse"
        id="mask3790">
       <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         style="fill:#ffffff;fill-opacity:1.0;stroke:none"
          d="m -35.53125,1021.2997 v 38.7188 h 54.8125 v -38.7188 z M -9.5,1038.8622 c 1.1045695,0 2,0.8954 2,2 0,1.1046 -0.8954305,2 -2,2 -1.10457,0 -2,-0.8954 -2,-2 0,-1.1046 0.89543,-2 2,-2 z"
-         id="path3792"
-         inkscape:connector-curvature="0" />
+         id="path3792" />
     </mask>
   </defs>
   <metadata
@@ -83,7 +31,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -116,24 +64,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:1;fill:#ffffff;fill-opacity:0.94117647;stroke:#000000;stroke-width:0.95652175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#ffffff;fill-opacity:0.94117647;stroke:#000000;stroke-width:0.95652175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m -11.999745,1.4782609 c -1.059826,0 -1.912109,0.8522833 -1.912109,1.9121094 v 6.6972657 h -6.697266 c -1.059826,0 -1.912109,0.852283 -1.912109,1.912109 0,1.059826 0.852283,1.912109 1.912109,1.912109 h 6.697266 v 6.697266 c 0,1.059826 0.852283,1.912109 1.912109,1.912109 1.059826,0 1.912109,-0.852283 1.912109,-1.912109 v -6.697266 h 6.6972661 c 1.059826,0 1.912109,-0.852283 1.912109,-1.912109 0,-1.059826 -0.852283,-1.912109 -1.912109,-1.912109 H -10.087636 V 3.3903703 c 0,-1.0598261 -0.852283,-1.9121094 -1.912109,-1.9121094 z"
-       id="rect1419"
-       inkscape:connector-curvature="0" />
+       id="rect1419" />
     <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"
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;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,-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" />
+       id="rect1440" />
     <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"
-       id="path1448"
-       inkscape:connector-curvature="0" />
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
+       id="path1448" />
     <rect
        ry="2.5"
        rx="2.5"
@@ -142,20 +85,18 @@
        height="5"
        width="5"
        id="rect1450"
-       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" />
+       style="opacity:1;fill:#ff0000;fill-opacity:1.0;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"
+       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.0;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,-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" />
+       id="path1481" />
     <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" />
+         style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crosshair-node-curve.svg b/rtdata/icons/rawtherapee/scalable/apps/crosshair-node-curve.svg
index d72c2a929..9630c0bd6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crosshair-node-curve.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crosshair-node-curve.svg
@@ -2,57 +2,16 @@
 <!-- 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="crosshair-node-curve.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,39 +55,33 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.9;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.00000003, 2.00000002;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.00000003, 2.00000002;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
        d="m 16,10 v 4.271484 A 2,2 0 0 1 17,14 2,2 0 0 1 18,14.269531 V 10 Z m 2,7.728516 A 2,2 0 0 1 17,18 2,2 0 0 1 16,17.730469 V 22 h 2 z"
-       id="rect825"
-       inkscape:connector-curvature="0" />
+       id="rect825" />
     <path
-       style="opacity:0.9;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.00000006, 2.00000007;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.00000006, 2.00000007;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
        d="m 11,15 v 2 h 4.271484 A 2,2 0 0 1 15,16 2,2 0 0 1 15.269531,15 Z m 7.728516,0 A 2,2 0 0 1 19,16 2,2 0 0 1 18.730469,17 H 23 v -2 z"
-       id="rect829"
-       inkscape:connector-curvature="0" />
+       id="rect829" />
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;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 19.050781,1.994141 a 1.0001,1.0001 0 0 0 -0.457031,0.0918 c -1.398026,0.621345 -2.72611,1.4479 -3.990234,2.382813 A 3,3 0 0 0 13,4 3,3 0 0 0 10,7 3,3 0 0 0 10.302734,8.310547 C 9.0215195,9.659038 7.8543884,11.057116 6.8320312,12.390625 3.906506,16.206527 2.1191406,19.525391 2.1191406,19.525391 a 1.0005833,1.0005833 0 1 0 1.7617188,0.949218 c 0,0 1.7126345,-3.181136 4.5371094,-6.865234 0.9821769,-1.2811 2.1068522,-2.612414 3.3242192,-3.888672 A 3,3 0 0 0 13,10 3,3 0 0 0 16,7 3,3 0 0 0 15.84375,6.054687 c 1.152752,-0.853754 2.343176,-1.598703 3.5625,-2.140625 A 1.0001,1.0001 0 0 0 19.050781,1.994141 Z"
-       id="path853"
-       inkscape:connector-curvature="0" />
+       id="path853" />
     <g
        id="g1013"
        transform="translate(52.5,-14.5)"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none">
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none">
       <path
-         inkscape:connector-curvature="0"
          id="path1448-3-7"
          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:#2a7fff;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" />
+         style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     </g>
     <circle
        r="3"
        cy="5"
        cx="45"
        id="circle883"
-       style="opacity:0.9;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" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;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" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/crosshair-small.svg b/rtdata/icons/rawtherapee/scalable/apps/crosshair-small.svg
index 2e5e6596a..d86658cac 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/crosshair-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/crosshair-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="crosshair-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.732386"
-     inkscape:cx="13.503561"
-     inkscape:cy="7.5035611"
-     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-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,75 +56,54 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 55,16 H 65 M 60,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4977" />
     <path
        id="path4979"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 22.521364,16.478636 h 10 m -5,-5 v 10"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 22.521364,16.478636 h 10 m -5,-5 v 10" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M -12.015625,9.9863281 A 1.0001,1.0001 0 0 0 -13,11 v 2.173828 A 3,3 0 0 1 -12,13 a 3,3 0 0 1 1,0.175781 V 11 A 1.0001,1.0001 0 0 0 -12.015625,9.9863281 Z M -17,15 a 1.0001,1.0001 0 1 0 0,2 h 2.173828 A 3,3 0 0 1 -15,16 a 3,3 0 0 1 0.175781,-1 z m 7.826172,0 A 3,3 0 0 1 -9,16 3,3 0 0 1 -9.175781,17 H -7 a 1.0001,1.0001 0 1 0 0,-2 z M -13,18.824219 V 21 a 1.0001,1.0001 0 1 0 2,0 V 18.826172 A 3,3 0 0 1 -12,19 3,3 0 0 1 -13,18.824219 Z"
-       id="path4981"
-       inkscape:connector-curvature="0" />
+       id="path4981" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 39,16 H 49 M 44,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4983" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 8,19.985759 v 1.999999"
        id="path836" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 8,9.9857565 10e-8,2.0000015"
        id="path832" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 12.014242,16.000001 h 1.999999"
        id="path830" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 2.0142425,16 H 3.9930053"
        id="path4981-3" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m -32.5,20 v 2.5"
-       id="path1509"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1509" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M -32.5,10.5 V 13"
-       id="path1505"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1505" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m -29,16.5 h 2.5"
-       id="path1503"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1503" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M -38.5,16.5 H -36"
-       id="path840"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path840" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom-small.svg
index bc6378bb4..137ad3e13 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom-small.svg
@@ -2,66 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-catmullrom-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.5"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="false"
-     showborder="true"
-     borderlayer="false"
-     inkscape:showpageshadow="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -72,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -106,54 +56,46 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
        r="2.1000001"
        cy="-7.5"
        cx="10.5"
        id="circle3732"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle3734"
        cx="6.5"
        cy="0.5"
        r="2.1000001" />
     <path
-       sodipodi:nodetypes="caac"
-       inkscape:connector-curvature="0"
        id="path3736"
        d="M 2,2 C 2,2 5.336352,1.536652 6.539604,0.490099 8.782506,-1.46071 8.57285,-5.236736 10.5,-7.5 11.429492,-8.591604 14,-10 14,-10"
-       style="opacity:0.9;vector-effect:none;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:0;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.9;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal" />
     <circle
        r="2.6000001"
        cy="-8"
        cx="30"
        id="circle4393"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle4395"
        cx="26"
        cy="0"
        r="2.6000001" />
     <path
-       sodipodi:nodetypes="caac"
-       inkscape:connector-curvature="0"
        id="path4397"
        d="m 22,2 c 0,0 2.945907,-0.945907 4,-2 2.108185,-2.108185 1.891815,-5.891815 4,-8 1.054093,-1.054093 4,-2 4,-2"
-       style="opacity:0.9;vector-effect:none;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:0;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.9;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;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:0.7;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:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.957617,9.0010308 a 0.99703958,0.99930081 0 0 0 -0.445902,0.128803 c 0,0 -0.669824,0.3673832 -1.458413,0.8762522 -0.134886,0.08704 -0.27712,0.195722 -0.416691,0.288832 -0.342359,-0.177992 -0.724456,-0.288832 -1.135186,-0.288832 -1.3717587,0 -2.4923491,1.123128 -2.4923491,2.498002 0,0.549878 0.1839155,1.055935 0.4867858,1.469528 -0.3263981,0.787192 -0.5622541,1.587644 -0.8002735,2.336023 -0.202987,0.638199 -0.4127132,1.221238 -0.6522978,1.750553 -0.1713441,-0.03761 -0.3473737,-0.0605 -0.5296243,-0.0605 -1.3717594,0 -2.4923497,1.123128 -2.4923497,2.498002 0,0.01 0.00179,0.0193 0.00189,0.02928 -0.1454635,0.04365 -0.2824131,0.102887 -0.424477,0.138561 -0.9240894,0.232048 -1.7076443,0.341524 -1.7076443,0.341524 a 0.99703958,0.99930081 0 1 0 0.2726033,1.978885 c 0,0 0.8810157,-0.121637 1.9198869,-0.382506 0.2647274,-0.06648 0.5384671,-0.139215 0.8158557,-0.220527 0.4365799,0.376198 0.996262,0.612788 1.6142351,0.612788 1.3717594,0 2.4923497,-1.123127 2.4923497,-2.498002 0,-0.438945 -0.1230822,-0.846798 -0.3232278,-1.206066 0.3946885,-0.776236 0.6653676,-1.595807 0.9132168,-2.375054 0.2181704,-0.685981 0.4272682,-1.338908 0.6620272,-1.939855 0.08137,0.0081 0.159969,0.02537 0.243393,0.02537 1.37176,0 2.49235,-1.123128 2.49235,-2.498002 0,-0.226332 -0.0405,-0.44107 -0.09736,-0.649871 0.08068,-0.05425 0.158822,-0.11703 0.237551,-0.167834 0.724416,-0.467449 1.33575,-0.804045 1.33575,-0.804045 A 0.99703958,0.99930081 0 0 0 13.957617,9.0010308 Z"
-       id="circle4399"
-       inkscape:connector-curvature="0" />
+       id="circle4399" />
     <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:0.7;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:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 33.95898,8.996094 a 1.0001,1.0001 0 0 0 -0.26562,0.05273 c 0,0 -0.77575,0.247246 -1.68945,0.634765 -0.026,0.01104 -0.0539,0.02398 -0.0801,0.03516 C 31.40115,9.277093 30.735,9 30,9 c -1.65212,0 -3,1.347884 -3,3 0,0.717059 0.26501,1.367657 0.6875,1.884766 -0.24334,0.608424 -0.45019,1.221586 -0.63867,1.808593 -0.15423,0.480329 -0.31093,0.93057 -0.47461,1.363282 C 26.38812,17.020277 26.19646,17 26,17 c -1.65212,0 -3,1.347884 -3,3 0,0.183819 0.0228,0.362261 0.0547,0.537109 -0.74094,0.305136 -1.36133,0.511719 -1.36133,0.511719 a 1.0001,1.0001 0 1 0 0.61328,1.902344 c 0,0 0.77575,-0.247247 1.68945,-0.634766 0.026,-0.01103 0.0539,-0.02398 0.0801,-0.03516 C 24.59885,22.722907 25.265,23 26,23 c 1.65212,0 3,-1.347884 3,-3 0,-0.717059 -0.26501,-1.367657 -0.6875,-1.884766 0.24334,-0.608424 0.45019,-1.221586 0.63867,-1.808593 0.15423,-0.480329 0.31093,-0.93057 0.47461,-1.363282 C 29.61188,14.979723 29.80354,15 30,15 c 1.65212,0 3,-1.347884 3,-3 0,-0.183819 -0.0228,-0.362261 -0.0547,-0.537109 0.74094,-0.305136 1.36133,-0.511719 1.36133,-0.511719 a 1.0001,1.0001 0 0 0 -0.24805,-1.955078 1.0001,1.0001 0 0 0 -0.0996,0 z"
-       id="circle4405"
-       inkscape:connector-curvature="0" />
+       id="circle4405" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom.svg
index b59954885..2b9f2f9e8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-catmullrom.svg
@@ -2,62 +2,16 @@
 <!-- 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="curve-catmullrom.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.666667"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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="true"
-     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="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -68,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,16 +55,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;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 21.961385,1.0008339 a 0.99786946,0.99965853 0 0 0 -0.446268,0.1249448 c 0,0 -1.320539,0.7149725 -2.872486,1.7101822 -0.726935,0.4661586 -1.500431,0.9886892 -2.23134,1.5422877 -0.422327,-0.229707 -0.896874,-0.3728822 -1.407011,-0.3728822 -1.641341,0 -2.993309,1.3543922 -2.993309,2.9986757 0,0.7218688 0.270322,1.3795002 0.701557,1.8995517 -0.64861,1.4824552 -1.035206,3.0616262 -1.445987,4.5448682 -0.377799,1.364155 -0.775111,2.628847 -1.331009,3.713203 -0.2915113,-0.09608 -0.5961135,-0.162037 -0.9178702,-0.162037 -1.6413407,0 -2.9933091,1.354392 -2.9933091,2.998676 0,0.08674 0.017964,0.168817 0.025334,0.253794 -0.4669772,0.137993 -0.9444077,0.264577 -1.4089603,0.357264 -1.453702,0.290044 -2.689301,0.392405 -2.689301,0.392405 a 0.99786946,0.99965853 0 1 0 0.1636965,1.991308 c 0,0 1.336573,-0.108641 2.9153582,-0.423641 0.6045648,-0.120624 1.2415233,-0.274321 1.8708182,-0.458782 0.543473,0.546411 1.293738,0.886327 2.1163631,0.886327 1.6413416,0 2.9933096,-1.354391 2.9933096,-2.998675 0,-0.580391 -0.175599,-1.119993 -0.465756,-1.581333 0.775824,-1.387713 1.230097,-2.936322 1.644762,-4.433589 0.394368,-1.423985 0.765718,-2.808151 1.268648,-4.0353276 0.177472,0.033413 0.359151,0.054663 0.545655,0.054663 1.641341,0 2.993309,-1.3543916 2.993309,-2.998675 0,-0.3989768 -0.08399,-0.7787742 -0.228006,-1.1284079 C 18.400516,5.4015772 19.076546,4.930379 19.718352,4.518811 21.202494,3.5670816 22.462218,2.8867193 22.462218,2.8867193 A 0.99786946,0.99965853 0 0 0 21.961385,1.0008339 Z"
-       id="circle817"
-       inkscape:connector-curvature="0" />
+       id="circle817" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="circle5141"
        cx="-25"
        cy="7"
@@ -120,12 +71,10 @@
        cy="20"
        cx="-31"
        id="circle5143"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
-       sodipodi:nodetypes="caac"
-       inkscape:connector-curvature="0"
        id="path5145"
        d="m -38,22 c 0,0 5.157064,-0.421242 7,-2 3.62451,-3.104949 2.956624,-9.323638 6,-13 1.828498,-2.2088042 7,-5 7,-5"
-       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;vector-effect:none;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints-small.svg
index fc85b8774..104d5ffc9 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints-small.svg
@@ -2,63 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-controlpoints-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -103,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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:0.7;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:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 11 3 C 9.9976127 3 9.1696615 3.7497134 9.0292969 4.7148438 C 8.5630586 5.0807339 8.1929514 5.532524 7.9179688 5.9453125 C 7.3330813 6.8233135 7.0507812 7.6835936 7.0507812 7.6835938 C 7.0507812 7.6835938 6.8323192 8.3233135 6.4179688 8.9453125 C 6.3216042 9.0899695 6.2200054 9.2226333 6.1152344 9.34375 C 5.7958935 9.1275184 5.4124369 9 5 9 C 4.5891195 9 4.207296 9.1270558 3.8886719 9.3417969 C 3.7842484 9.2209738 3.6820029 9.0895206 3.5859375 8.9453125 C 3.1715869 8.3233135 2.953125 7.6835938 2.953125 7.6835938 A 1.0001 1.0001 0 1 0 1.0566406 8.3164062 C 1.0566406 8.3164062 1.3369876 9.176686 1.921875 10.054688 C 2.1960022 10.466191 2.5651323 10.915949 3.0292969 11.28125 C 3.1680082 12.248225 3.9962917 13 5 13 C 6.0023873 13 6.8303385 12.250287 6.9707031 11.285156 C 7.4369414 10.919266 7.8070486 10.467476 8.0820312 10.054688 C 8.6669189 9.176686 8.9492186 8.3164063 8.9492188 8.3164062 C 8.9492188 8.3164062 9.1676808 7.6766865 9.5820312 7.0546875 C 9.6783959 6.9100305 9.7799946 6.7773667 9.8847656 6.65625 C 10.204106 6.8724816 10.587563 7 11 7 C 11.410881 7 11.792704 6.8729442 12.111328 6.6582031 C 12.215751 6.7790262 12.317998 6.9104794 12.414062 7.0546875 C 12.828413 7.6766865 13.046875 8.3164063 13.046875 8.3164062 A 1.0001 1.0001 0 1 0 14.943359 7.6835938 C 14.943359 7.6835938 14.663012 6.8233135 14.078125 5.9453125 C 13.803998 5.5338082 13.434868 5.0840511 12.970703 4.71875 C 12.831992 3.7517748 12.003709 3 11 3 z "
        transform="translate(0,8)"
        id="path1472" />
@@ -116,17 +67,16 @@
        cy="19"
        cx="-15"
        id="circle828"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle830"
        cx="-9"
        cy="13"
        r="1.6" />
     <path
-       inkscape:connector-curvature="0"
        id="path832"
        d="m -17.995428,16 c 0,0 0.999238,3 2.997714,3 C -12.999238,19 -12,16 -12,16 c 0,0 0.999238,-3 2.997714,-3 1.998476,0 2.997714,3 2.997714,3"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints.svg
index 2d432264c..c3121e735 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-controlpoints.svg
@@ -2,65 +2,16 @@
 <!-- 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="curve-controlpoints.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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -71,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -104,16 +55,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <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:0.7;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:2;stroke-linecap:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;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 -9.957031,7.4179688 c -0.51829,0.5176139 -0.99857,1.1345934 -1.478516,1.8085937 -0.997011,1.4001275 -1.952209,3.0390595 -2.869141,4.3261715 -0.296263,0.415872 -0.588114,0.767418 -0.873046,1.085938 0.562116,0.436199 0.974595,1.057776 1.11914,1.777344 0.481249,-0.497847 0.933245,-1.07206 1.382813,-1.703125 0.997124,-1.399682 1.95405,-3.038343 2.871093,-4.326172 C -9.502772,9.9627322 -9.205729,9.6056346 -8.916016,9.2832031 -9.469355,8.8171412 -9.85025,8.1630592 -9.957031,7.4179688 Z M -4.050781,7.5 c -0.124269,0.7238673 -0.513156,1.354204 -1.060547,1.8046875 0.705476,0.8243165 1.481866,1.9867555 2.263672,3.2050785 a 1.0001,1.0001 0 1 0 1.68164,-1.080078 C -2.085298,9.9971273 -3.008848,8.5567404 -4.050781,7.5 Z m -18.134766,3.4375 a 1.0001,1.0001 0 0 0 -0.759766,1.572266 c 0.951249,1.482374 1.90403,2.981887 2.990235,4.046875 0.111312,-0.732029 0.489432,-1.373462 1.033203,-1.833985 -0.726123,-0.827885 -1.530936,-2.029367 -2.341797,-3.292968 A 1.0001,1.0001 0 0 0 -22.185547,10.9375 Z"
-       id="path15207"
-       inkscape:connector-curvature="0" />
+       id="path15207" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path4884"
        cx="-7"
        cy="7"
@@ -123,69 +71,63 @@
        cy="17"
        cx="-17"
        id="circle15251"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;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: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:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m -23,6.5 v 1 H -9.949219 C -9.977282,7.3365314 -10,7.1709256 -10,7 -10,6.8290744 -9.97728,6.6634686 -9.94922,6.5 Z m 18.949219,0 C -4.022718,6.6634686 -4,6.8290744 -4,7 -4,7.1709256 -4.02272,7.3365314 -4.05078,7.5 H -1 v -1 z"
-       id="path15253"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccscccscccc" />
+       id="path15253" />
     <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: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:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m -23,16.5 v 1 h 3.050781 C -19.977282,17.336531 -20,17.170926 -20,17 c 0,-0.170926 0.02272,-0.336531 0.05078,-0.5 z m 8.949219,0 C -14.022718,16.663469 -14,16.829074 -14,17 c 0,0.170926 -0.02272,0.336531 -0.05078,0.5 H -1 v -1 z"
-       id="path15255"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccscccscccc" />
+       id="path15255" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="m 10,17.5 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
        id="path902" />
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="M 1 17 L 1 18 L 4.0410156 18 A 3 3 0 0 1 4.0078125 17.710938 C 3.6503369 17.500786 3.3243046 17.26425 3.0410156 17 L 1 17 z M 10.958984 17 C 10.67446 17.265403 10.347647 17.504066 9.9882812 17.714844 A 3 3 0 0 1 9.953125 18 L 23 18 L 23 17 L 10.958984 17 z "
        id="rect940" />
     <path
-       sodipodi:nodetypes="cscsc"
-       inkscape:connector-curvature="0"
        id="path942"
        d="m 42,12 c 0,0 0,5.5 5,5.5 5,0 5,-5.5 5,-5.5 0,0 0,-5.5 5,-5.5 5,0 5,5.5 5,5.5"
-       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <circle
        r="3"
        cy="6.5"
        cx="57"
        id="circle944"
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <circle
        r="3"
        cy="17.5"
        cx="47"
        id="circle946"
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <rect
        y="6"
        x="41"
        height="1"
        width="22"
        id="rect948"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <rect
        y="17"
        x="41"
        height="1"
        width="22"
        id="rect950"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="M 1 6 L 1 7 L 13.041016 7 C 13.32554 6.7345973 13.652353 6.4959338 14.011719 6.2851562 A 3 3 0 0 1 14.046875 6 L 1 6 z M 19.958984 6 A 3 3 0 0 1 19.992188 6.2890625 C 20.349663 6.4992137 20.675695 6.7357496 20.958984 7 L 23 7 L 23 6 L 19.958984 6 z "
        id="rect938" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="m 20,6.5 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
        id="path900" />
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 14.011719 6.2851562 C 12.897364 6.9387554 12.138313 7.9043051 11.714844 8.8359375 C 10.985921 10.439568 11 12 11 12 C 11 12 10.98592 13.189568 10.464844 14.335938 C 10.222123 14.869923 9.9102466 15.37147 9.4375 15.759766 A 3 3 0 0 1 10 17.5 A 3 3 0 0 1 9.9882812 17.714844 C 11.102636 17.061245 11.861687 16.095696 12.285156 15.164062 C 13.014079 13.560434 13 12 13 12 C 13 12 13.014079 10.810432 13.535156 9.6640625 C 13.777877 9.1300763 14.089753 8.6285297 14.5625 8.2402344 A 3 3 0 0 1 14 6.5 A 3 3 0 0 1 14.011719 6.2851562 z M 19.992188 6.2890625 A 3 3 0 0 1 20 6.5 A 3 3 0 0 1 19.439453 8.2421875 C 19.910971 8.6302493 20.222492 9.1308899 20.464844 9.6640625 C 20.985921 10.810432 21 12 21 12 A 1.0001 1.0001 0 1 0 23 12 C 23 12 23.01408 10.439568 22.285156 8.8359375 C 21.86228 7.9056094 21.103957 6.9426447 19.992188 6.2890625 z M 1.984375 10.986328 A 1.0001 1.0001 0 0 0 1 12 C 1 12 0.9859205 13.560432 1.7148438 15.164062 C 2.1377201 16.094391 2.8960429 17.057355 4.0078125 17.710938 A 3 3 0 0 1 4 17.5 A 3 3 0 0 1 4.5605469 15.757812 C 4.0890292 15.369751 3.7775075 14.86911 3.5351562 14.335938 C 3.0140795 13.189566 3 12 3 12 A 1.0001 1.0001 0 0 0 1.984375 10.986328 z "
        id="path1020" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-flat-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-flat-small.svg
index 59585c64a..377a73269 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-flat-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-flat-small.svg
@@ -2,63 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-flat-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -103,13 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="M 2,16 H 14"
-       id="path1480"
-       inkscape:connector-curvature="0" />
+       id="path1480" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-flat.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-flat.svg
index 89888b4d1..47d5af103 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-flat.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-flat.svg
@@ -2,57 +2,16 @@
 <!-- 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="curve-flat.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,13 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="M 2,12 H 22"
-       id="path814"
-       inkscape:connector-curvature="0" />
+       id="path814" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-linear-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-linear-small.svg
index c2a3f7915..286c9207b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-linear-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-linear-small.svg
@@ -2,63 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-linear-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -103,13 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="M 2,22 14,10"
-       id="path1501"
-       inkscape:connector-curvature="0" />
+       id="path1501" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-linear.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-linear.svg
index b016121aa..34a7207b8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-linear.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-linear.svg
@@ -2,57 +2,16 @@
 <!-- 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="curve-linear.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,13 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.7"
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.7"
        d="M 22,2 2,22"
-       id="path7133"
-       inkscape:connector-curvature="0" />
+       id="path7133" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs-small.svg
index 1ff3a1a76..6519af88b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs-small.svg
@@ -2,63 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-nurbs-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -103,23 +56,19 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path4882"
        d="M 14,10 C 7.9823832,12.506489 4.3404687,16.798 2,22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <circle
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path2188"
        cx="3"
        cy="11"
        r="1" />
     <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: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:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 12.351562 1.6484375 L 4.8730469 2.328125 C 4.9504536 2.5396006 5 2.7639372 5 3 C 5 3.1106048 4.984639 3.2181625 4.9667969 3.3242188 L 10.167969 2.8515625 C 10.858728 2.420884 11.584657 2.0194702 12.351562 1.6484375 z M 2.328125 4.8730469 L 1.6367188 12.480469 C 2.0065544 11.740561 2.4054403 11.019073 2.8378906 10.318359 L 3.3242188 4.9667969 C 3.2181625 4.984639 3.1106048 5 3 5 C 2.7639372 5 2.5396006 4.9504536 2.328125 4.8730469 z "
        transform="translate(0,8)"
        id="path2190" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs.svg
index 1d7ef10ce..e4b73b9ed 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-nurbs.svg
@@ -2,57 +2,16 @@
 <!-- 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="curve-nurbs.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,30 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g4919"
        transform="translate(-26.00658,-0.02511662)">
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 48,2.0000003 C 37.949603,6.1862437 31.908963,13.311815 28,22"
-         id="path4882"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path4882" />
       <circle
          r="2"
          cy="7"
          cx="31"
          id="path4884"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
       <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
          id="path4886"
          d="M 44.65625,2.4609375 33.681641,5.6894531 c 0.147149,0.2973649 0.242336,0.619632 0.283203,0.9609375 L 41.068359,4.5605469 C 42.198468,3.8115598 43.393985,3.1103733 44.65625,2.4609375 Z M 29.931641,9.7910156 27.925781,19.822266 c 0.50448,-1.015124 1.042035,-2.007802 1.615235,-2.976563 L 30.912109,9.9902344 C 30.567587,9.9798636 30.238666,9.9101416 29.931641,9.7910156 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:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-parametric-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-parametric-small.svg
index 2334def2d..0b2f22b9b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-parametric-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-parametric-small.svg
@@ -2,63 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-parametric-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -103,31 +56,27 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path4882"
        d="M 14,10 C 7.9823832,12.506489 4.3404687,16.798 2,22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        id="rect1479"
        width="6"
        height="1"
        x="9"
        y="22" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        id="rect1481"
        width="6"
        height="1"
        x="9"
        y="20" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        id="rect1483"
        width="6"
        height="1"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-parametric.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-parametric.svg
index 88a1f0389..ce228bec6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-parametric.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-parametric.svg
@@ -2,57 +2,16 @@
 <!-- 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="curve-parametric.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="7.684729"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.7;fill:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2925"
        width="9"
        height="2"
@@ -108,24 +65,22 @@
        y="21"
        ry="0" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2927"
        width="9"
        height="2"
        x="14"
        y="18" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2929"
        width="9"
        height="2"
        x="14"
        y="15" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 22.029557,1.9704433 C 11.97916,6.1566867 5.9385193,13.282258 2.0295567,21.970443"
-       id="path4163"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path4163" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-spline-small.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-spline-small.svg
index 990df0c0d..63633af65 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-spline-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-spline-small.svg
@@ -2,63 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="curve-spline-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -103,22 +56,18 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 13.974609 0.99609375 A 1.0001 1.0001 0 0 0 13.615234 1.0761719 C 12.576383 1.5088798 11.609913 1.9991523 10.699219 2.5332031 C 10.215351 2.1986036 9.6304881 2 9 2 C 7.3478835 2 6 3.347884 6 5 C 6 5.3593385 6.0746158 5.699716 6.1914062 6.0195312 C 4.0081553 8.2133688 2.3491701 10.786484 1.0878906 13.589844 A 1.0001 1.0001 0 1 0 2.9121094 14.410156 C 4.0694649 11.837781 5.5342131 9.5274529 7.4570312 7.5585938 C 7.9095143 7.8327927 8.4342621 8 9 8 C 10.652116 8 12 6.652116 12 5 C 12 4.7081931 11.945536 4.4311365 11.867188 4.1640625 C 12.654836 3.7143137 13.488642 3.2970861 14.384766 2.9238281 A 1.0001 1.0001 0 0 0 13.974609 0.99609375 z "
        transform="translate(0,8)"
        id="path4882" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m -6,10 c -6.017617,2.506489 -9.659531,6.798 -12,12"
-       id="path818"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path818" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle820"
        cx="-11"
        cy="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/curve-spline.svg b/rtdata/icons/rawtherapee/scalable/apps/curve-spline.svg
index f0a28a1a9..21e0cda92 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/curve-spline.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/curve-spline.svg
@@ -2,62 +2,16 @@
 <!-- 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="curve-spline.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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -101,24 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 21.966797 0.97070312 A 1.0001 1.0001 0 0 0 21.609375 1.0527344 C 19.066954 2.1117166 16.773453 3.3600206 14.697266 4.7714844 C 14.215622 4.4413072 13.635985 4.2460938 13.013672 4.2460938 C 11.368662 4.2460938 10.013672 5.6010841 10.013672 7.2460938 C 10.013672 7.6379109 10.095022 8.0109492 10.234375 8.3554688 C 6.2631295 12.104952 3.3150123 16.601359 1.0820312 21.564453 A 1.0001 1.0001 0 1 0 2.90625 22.384766 C 5.0484798 17.623378 7.8143858 13.376143 11.546875 9.8417969 C 11.983434 10.091107 12.479475 10.246094 13.013672 10.246094 C 14.658681 10.246094 16.013672 8.8911034 16.013672 7.2460938 C 16.013672 6.9443551 15.953746 6.6584631 15.869141 6.3828125 C 17.820874 5.0663897 19.977813 3.8977397 22.376953 2.8984375 A 1.0001 1.0001 0 0 0 21.966797 0.97070312 z "
        id="path4882" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m -2.00658,1.9748837 c -10.050397,4.1862434 -16.091037,11.3118143 -20,19.9999993"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path815" />
     <circle
        r="2"
        cy="7.2466049"
        cx="-10.986821"
        id="circle817"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/detail.svg b/rtdata/icons/rawtherapee/scalable/apps/detail.svg
index 89aab821b..9b1fe5acd 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/detail.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/detail.svg
@@ -2,57 +2,16 @@
 <!-- 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="detail.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="23.982705"
-     inkscape:cx="12.31753"
-     inkscape:cy="11.474855"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,70 +55,48 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g6269">
       <path
          transform="matrix(0.02394956,0,0,0.02394956,13.393024,47.647006)"
-         inkscape:connector-curvature="0"
          id="path5163-1-9-5-9-9"
          d="m -141.74797,-1319.4902 c -69.72952,-69.7295 -69.72961,-182.7833 0,-252.5129 69.72953,-69.7296 182.783466,-69.7296 252.51299,0 l -84.170994,84.171 c -23.243147,-23.2432 -60.927849,-23.2432 -84.170996,0 -23.243231,23.2432 -23.243147,60.9278 0,84.1709 z"
-         style="opacity:0.7;fill:#2a7fff;fill-rule:evenodd;stroke:none" />
+         style="opacity:0.7;fill:#cccccc;fill-rule:evenodd;stroke:none;fill-opacity:1.0" />
       <path
-         sodipodi:end="3.1415927"
-         sodipodi:start="0"
          d="m -1351.111,2388.6467 a 385.77777,385.77777 0 0 1 -192.8889,334.0934 385.77777,385.77777 0 0 1 -385.7778,0 385.77777,385.77777 0 0 1 -192.8889,-334.0934 l 385.7778,0 z"
-         sodipodi:ry="385.77777"
-         sodipodi:rx="385.77777"
-         sodipodi:cy="2388.6467"
-         sodipodi:cx="-1736.8888"
          id="path5163-1-9-6-0-8"
-         style="opacity:0.05;fill:#2a7fff;fill-rule:evenodd;stroke:none"
-         sodipodi:type="arc"
+         style="opacity:0.05;fill:#cccccc;fill-rule:evenodd;stroke:none;fill-opacity:1.0"
          transform="matrix(0.00261272,-0.00261272,-0.00261272,-0.00261272,23.800878,14.72487)" />
       <path
          transform="matrix(0.02394956,0,0,0.02394956,13.393024,47.647006)"
-         inkscape:connector-curvature="0"
          id="path5163-1-9-5-3-9-8-4"
          d="m -225.91895,-1235.3192 c -116.21599,-116.2158 -116.21591,-304.639 0,-420.8549 116.21582,-116.2159 304.639072,-116.2159 420.85498,0 l -84.171,84.171 c -69.729526,-69.7296 -182.783462,-69.7296 -252.51299,0 -69.72961,69.7296 -69.72952,182.7834 0,252.513 z"
-         style="opacity:0.1;fill:#2a7fff;fill-rule:evenodd;stroke:none" />
+         style="opacity:0.1;fill:#cccccc;fill-rule:evenodd;stroke:none;fill-opacity:1.0" />
       <path
          transform="matrix(0.02394956,0,0,0.02394956,13.393024,47.647006)"
-         inkscape:connector-curvature="0"
          id="path5163-1-9-5-3-8-8-8"
          d="m -310.08995,-1151.1482 c -162.70228,-162.7022 -162.70228,-426.4946 0,-589.1969 162.7022,-162.7022 426.49469,-162.7023 589.19697,0 l -84.17099,84.171 c -116.215908,-116.2159 -304.63925,-116.2159 -420.85498,0 -116.21591,116.2159 -116.21591,304.639 0,420.8549 z"
-         style="opacity:0.7;fill:#2a7fff;fill-rule:evenodd;stroke:none" />
+         style="opacity:0.7;fill:#cccccc;fill-rule:evenodd;stroke:none;fill-opacity:1.0" />
     </g>
     <g
        id="g6401">
       <path
-         inkscape:connector-curvature="0"
          id="path5163-1-9-5-3-9-85"
          d="m 7.982364,18.061657 c 2.783318,2.78332 7.295972,2.78332 10.079292,0 2.783318,-2.78332 2.78332,-7.295972 0,-10.079292 l -2.015858,2.0158584 c 1.669991,1.6699906 1.669991,4.3775816 0,6.0475756 -1.669994,1.669993 -4.377584,1.669991 -6.047575,0 z"
-         style="opacity:0.7;fill:#2a7fff;fill-rule:evenodd;stroke:none;stroke-width:0.02394956" />
+         style="opacity:0.7;fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.02394956;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="path5163-1-9-5-3-8-6"
          d="m 5.9665061,20.077516 c 3.8966481,3.896646 10.2143599,3.896646 14.1110079,0 3.896646,-3.896647 3.896648,-10.2143609 0,-14.1110094 L 18.061656,7.982365 c 2.78332,2.78332 2.78332,7.295975 0,10.079292 -2.78332,2.78332 -7.295972,2.78332 -10.0792917,0 z"
-         style="opacity:0.2;fill:#2a7fff;fill-rule:evenodd;stroke:none;stroke-width:0.02394956" />
+         style="opacity:0.2;fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.02394956;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="path5163-1-9-5-6"
          d="m 9.9982227,16.045799 c 1.6699913,1.669991 4.3775813,1.669993 6.0475753,0 1.669991,-1.669994 1.669991,-4.377585 0,-6.0475756 l -2.015859,2.0158586 c 0.556664,0.556662 0.556664,1.459194 0,2.015858 -0.556665,0.556665 -1.459195,0.556662 -2.015858,0 z"
-         style="opacity:0.2;fill:#2a7fff;fill-rule:evenodd;stroke:none;stroke-width:0.02394956" />
+         style="opacity:0.2;fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.02394956;fill-opacity:1.0" />
       <path
-         sodipodi:end="3.1415927"
-         sodipodi:start="0"
          d="m 1.4254259,18.415905 a 1.4254273,1.4254273 0 0 1 -0.71271366,1.234456 1.4254273,1.4254273 0 0 1 -1.42542734,0 1.4254273,1.4254273 0 0 1 -0.7127136,-1.234456 l 1.425427300329,0 z"
-         sodipodi:ry="1.4254273"
-         sodipodi:rx="1.4254273"
-         sodipodi:cy="18.415905"
-         sodipodi:cx="-1.399671e-06"
          id="path5163-1-9-6-3"
-         style="opacity:0.7;fill:#2a7fff;fill-rule:evenodd;stroke:none;stroke-width:0.00369494"
-         sodipodi:type="arc"
+         style="opacity:0.7;fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:0.00369494;fill-opacity:1.0"
          transform="rotate(-45)" />
     </g>
     <g
@@ -173,9 +110,9 @@
          height="4"
          width="4"
          id="rect1755"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0"
          id="rect6271"
          width="4"
          height="4"
@@ -191,9 +128,9 @@
          height="3"
          width="3"
          id="rect6273"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.75" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke-width:0.75" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.75"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke-width:0.75"
          id="rect6275"
          width="3"
          height="3"
@@ -209,9 +146,9 @@
          height="2"
          width="2"
          id="rect6277"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.5" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke-width:0.5" />
       <rect
-         style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke-width:0.75"
+         style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke-width:0.75"
          id="rect6295"
          width="3"
          height="3"
@@ -227,9 +164,9 @@
          height="3"
          width="3"
          id="rect6297"
-         style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke-width:0.75" />
+         style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke-width:0.75" />
       <rect
-         style="opacity:0.1;fill:#2a7fff;fill-opacity:1;stroke-width:0.5"
+         style="opacity:0.1;fill:#cccccc;fill-opacity:1.0;stroke-width:0.5"
          id="rect6299"
          width="2"
          height="2"
@@ -245,9 +182,9 @@
          height="2"
          width="2"
          id="rect6301"
-         style="opacity:0.1;fill:#2a7fff;fill-opacity:1;stroke-width:0.5" />
+         style="opacity:0.1;fill:#cccccc;fill-opacity:1.0;stroke-width:0.5" />
       <rect
-         style="opacity:0.1;fill:#2a7fff;fill-opacity:1;stroke-width:0.5"
+         style="opacity:0.1;fill:#cccccc;fill-opacity:1.0;stroke-width:0.5"
          id="rect6303"
          width="2"
          height="2"
@@ -263,9 +200,9 @@
          height="2"
          width="2"
          id="rect6305"
-         style="opacity:0.1;fill:#2a7fff;fill-opacity:1;stroke-width:0.5" />
+         style="opacity:0.1;fill:#cccccc;fill-opacity:1.0;stroke-width:0.5" />
       <rect
-         style="opacity:0.5;fill:#2a7fff;fill-opacity:1;stroke-width:0.5"
+         style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;stroke-width:0.5"
          id="rect6307"
          width="2"
          height="2"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/device-floppy.svg b/rtdata/icons/rawtherapee/scalable/apps/device-floppy.svg
index 29b855e4b..93b2d75b1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/device-floppy.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/device-floppy.svg
@@ -2,60 +2,16 @@
 <!-- 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="device-floppy.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="15.81375"
-     inkscape:cy="17.845039"
-     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-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -66,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -99,17 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        transform="matrix(1,0,0,-1,-60,24)"
        id="g35014">
       <path
          id="path35010"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <rect
          ry="1"
          rx="1"
@@ -118,10 +71,10 @@
          height="5"
          width="3"
          id="rect35012"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35224"
        width="12"
        height="2"
@@ -130,7 +83,7 @@
        rx="1"
        ry="1" />
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19089031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.19089031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35226"
        width="12"
        height="2"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/device-hdd.svg b/rtdata/icons/rawtherapee/scalable/apps/device-hdd.svg
index b93a1d698..cca56b954 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/device-hdd.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/device-hdd.svg
@@ -2,60 +2,16 @@
 <!-- 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="device-hdd.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="false"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:measure-start="27,9"
-     inkscape:measure-end="30,5"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -66,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -99,15 +55,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 6 1 C 3.784 1 2 2.784 2 5 L 2 19 C 2 21.216 3.784 23 6 23 L 18 23 C 20.216 23 22 21.216 22 19 L 22 5 C 22 2.784 20.216 1 18 1 L 6 1 z M 12 3 A 8 8 0 0 1 20 11 A 8 8 0 0 1 18.580078 15.548828 C 18.431224 15.456106 18.275984 15.370069 18.107422 15.302734 C 17.95668 15.242524 17.801891 15.204508 17.648438 15.169922 C 14.609106 14.680156 11.462691 14.184383 8.7402344 13.771484 C 8.3061894 13.725724 7.8769199 13.953612 7.7070312 14.378906 C 7.5366475 14.805438 7.692697 15.267768 8.0410156 15.533203 C 9.6562014 16.669723 11.308471 17.801517 12.953125 18.933594 A 8 8 0 0 1 12 19 A 8 8 0 0 1 4 11 A 8 8 0 0 1 12 3 z M 8.78125 14.808594 C 11.443572 15.213154 14.483511 15.691756 17.439453 16.167969 C 17.569015 16.197656 17.668889 16.22345 17.730469 16.248047 C 18.758018 16.658514 19.244654 17.796162 18.833984 18.824219 C 18.423407 19.852044 17.285178 20.340081 16.257812 19.929688 C 16.126627 19.877284 15.994851 19.800621 15.851562 19.699219 A 1.0183847 1.0183847 0 0 0 15.841797 19.693359 C 13.485125 18.067462 11.100225 16.438224 8.78125 14.808594 z M 5 19 A 1 1 0 0 1 6 20 A 1 1 0 0 1 5 21 A 1 1 0 0 1 4 20 A 1 1 0 0 1 5 19 z "
        id="rect2001" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path2005"
        cx="12"
        cy="11"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/device-network.svg b/rtdata/icons/rawtherapee/scalable/apps/device-network.svg
index d17821545..05980c038 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/device-network.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/device-network.svg
@@ -2,59 +2,16 @@
 <!-- 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="device-network.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="17.275862"
-     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="true"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 12 1 A 11 11 0 0 0 1 12 A 11 11 0 0 0 12 23 A 11 11 0 0 0 23 12 A 11 11 0 0 0 12 1 z M 10.5 3 L 13.5 3 C 14.054 3 14.5 3.446 14.5 4 L 14.5 6 C 14.5 6.554 14.054 7 13.5 7 L 10.5 7 C 9.946 7 9.5 6.554 9.5 6 L 9.5 4 C 9.5 3.446 9.946 3 10.5 3 z M 11 8 L 13 8 L 13 9.0488281 C 14.394164 9.1550621 15.663522 9.4714093 16.689453 9.984375 C 17.625268 10.452282 18.435165 11.128334 18.796875 12 L 16.173828 12 C 16.055628 11.924138 15.944949 11.848447 15.794922 11.773438 C 15.095145 11.423549 14.112595 11.155637 13 11.050781 L 13 16 L 11 16 L 11 11.050781 C 9.8874049 11.155637 8.9048545 11.423547 8.2050781 11.773438 C 8.0550507 11.84845 7.9443723 11.924138 7.8261719 12 L 5.203125 12 C 5.5648349 11.128334 6.3747329 10.452282 7.3105469 9.984375 C 8.3364783 9.4714093 9.6058362 9.1550621 11 9.0488281 L 11 8 z M 4.5 13 L 7.5 13 C 8.054 13 8.5 13.446 8.5 14 L 8.5 16 C 8.5 16.554 8.054 17 7.5 17 L 4.5 17 C 3.946 17 3.5 16.554 3.5 16 L 3.5 14 C 3.5 13.446 3.946 13 4.5 13 z M 16.5 13 L 19.5 13 C 20.054 13 20.5 13.446 20.5 14 L 20.5 16 C 20.5 16.554 20.054 17 19.5 17 L 16.5 17 C 15.946 17 15.5 16.554 15.5 16 L 15.5 14 C 15.5 13.446 15.946 13 16.5 13 z M 10.5 17 L 13.5 17 C 14.054 17 14.5 17.446 14.5 18 L 14.5 20 C 14.5 20.554 14.054 21 13.5 21 L 10.5 21 C 9.946 21 9.5 20.554 9.5 20 L 9.5 18 C 9.5 17.446 9.946 17 10.5 17 z "
        id="path1371" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/device-optical.svg b/rtdata/icons/rawtherapee/scalable/apps/device-optical.svg
index de73e9422..5b374de3a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/device-optical.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/device-optical.svg
@@ -2,57 +2,16 @@
 <!-- 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="device-optical.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4915534"
-     inkscape:cx="-99.213535"
-     inkscape:cy="-50.53758"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,21 +55,18 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:butt;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;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 12.398926 1 12.792039 1.0219806 13.179688 1.0644531 C 12.791905 1.0228648 12.398602 1 12 1 z M 13.359375 1.09375 C 13.686188 1.1351721 14.010869 1.1840892 14.328125 1.2539062 C 14.010263 1.185018 13.686707 1.134398 13.359375 1.09375 z M 14.498047 1.2988281 C 14.826057 1.3766102 15.150613 1.4620032 15.466797 1.5683594 C 15.150556 1.462919 14.82621 1.3755241 14.498047 1.2988281 z M 15.507812 1.5839844 C 15.861955 1.7046773 16.209415 1.8420023 16.546875 1.9960938 C 16.20878 1.8417124 15.863082 1.7040343 15.507812 1.5839844 z M 16.546875 1.9960938 L 13.236328 9.2792969 C 13.961239 9.6130018 14.52876 10.22562 14.806641 10.978516 L 22.326172 8.2460938 C 21.959187 7.2405324 21.452155 6.3057922 20.824219 5.4609375 L 20.814453 5.4492188 L 19.746094 4.2011719 C 18.82566 3.2869027 17.741352 2.5415174 16.546875 1.9960938 z M 19.746094 4.2011719 C 19.860486 4.3148524 19.96579 4.4373029 20.074219 4.5566406 C 19.964813 4.4380617 19.860545 4.3148563 19.746094 4.2011719 z M 20.814453 5.4492188 C 20.658346 5.2397876 20.498388 5.0335589 20.328125 4.8359375 C 20.496557 5.0350931 20.658407 5.2397255 20.814453 5.4492188 z M 22.326172 8.2480469 C 22.429253 8.5306355 22.520549 8.8189841 22.601562 9.1113281 C 22.521537 8.8182607 22.429349 8.5309065 22.326172 8.2480469 z M 22.626953 9.2089844 C 22.696186 9.4678436 22.756027 9.7303118 22.806641 9.9960938 C 22.757301 9.7298088 22.695178 9.4682365 22.626953 9.2089844 z M 22.869141 10.394531 C 22.898264 10.585818 22.928382 10.776301 22.947266 10.970703 C 22.92908 10.775999 22.897393 10.586192 22.869141 10.394531 z M 9.1933594 13.021484 L 1.6738281 15.753906 C 2.0408126 16.759468 2.5478455 17.694208 3.1757812 18.539062 L 3.1796875 18.542969 C 3.181632 18.545583 3.1836007 18.548168 3.1855469 18.550781 L 4.2539062 19.798828 C 4.2549005 19.799816 4.2568179 19.799794 4.2578125 19.800781 C 4.2594578 19.802415 4.2600722 19.805008 4.2617188 19.806641 C 5.180448 20.717405 6.2620355 21.460029 7.453125 22.003906 L 10.763672 14.720703 C 10.038761 14.386998 9.4712398 13.77438 9.1933594 13.021484 z M 7.453125 22.003906 C 7.7912201 22.158288 8.1369179 22.295966 8.4921875 22.416016 C 8.1380454 22.295323 7.790585 22.157998 7.453125 22.003906 z M 4.2539062 19.798828 C 4.1395143 19.685148 4.03421 19.562697 3.9257812 19.443359 C 4.0351865 19.561938 4.1394553 19.685144 4.2539062 19.798828 z M 3.1855469 18.550781 C 3.3416535 18.760212 3.5016125 18.966441 3.671875 19.164062 C 3.5034429 18.964907 3.3415932 18.760275 3.1855469 18.550781 z M 1.0527344 13.029297 C 1.07092 13.224001 1.1026072 13.413808 1.1308594 13.605469 C 1.1017362 13.414182 1.0716184 13.223699 1.0527344 13.029297 z M 1.1933594 14.003906 C 1.2426991 14.270191 1.3048224 14.531763 1.3730469 14.791016 C 1.3038143 14.532156 1.2439729 14.269688 1.1933594 14.003906 z M 1.3984375 14.888672 C 1.478463 15.181739 1.5706511 15.469094 1.6738281 15.751953 C 1.5707472 15.469365 1.4794514 15.181016 1.3984375 14.888672 z M 8.5332031 22.431641 C 8.849444 22.537081 9.1737898 22.624476 9.5019531 22.701172 C 9.1739427 22.62339 8.8493868 22.537997 8.5332031 22.431641 z M 9.671875 22.746094 C 9.989737 22.814982 10.313293 22.865602 10.640625 22.90625 C 10.313812 22.864828 9.9891306 22.815911 9.671875 22.746094 z M 10.820312 22.935547 C 11.208095 22.977135 11.601398 23 12 23 C 11.601074 23 11.207961 22.978019 10.820312 22.935547 z "
        id="path2680" />
     <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:0.7;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:2;stroke-linecap:butt;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;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 8 C 9.806653 8 8 9.806653 8 12 C 8 14.193346 9.806653 16 12 16 C 14.193346 16 16 14.193346 16 12 C 16 9.806653 14.193346 8 12 8 z M 12 9 C 13.64501 9 15 10.35499 15 12 C 15 13.64501 13.64501 15 12 15 C 10.35499 15 9 13.64501 9 12 C 9 10.35499 10.35499 9 12 9 z "
        id="path2698" />
     <path
        id="path2720"
        d="M 12,1 C 5.936712,1 1,5.9367124 1,12 1,18.063288 5.936712,23 12,23 18.063288,23 23,18.063288 23,12 23,5.9367124 18.063288,1 12,1 Z m 0,8 c 1.64501,0 3,1.35499 3,3 0,1.64501 -1.35499,3 -3,3 -1.64501,0 -3,-1.35499 -3,-3 0,-1.64501 1.35499,-3 3,-3 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.7;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:2;stroke-linecap:butt;stroke-linejoin:round;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"
-       inkscape:connector-curvature="0" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;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" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/device-usb.svg b/rtdata/icons/rawtherapee/scalable/apps/device-usb.svg
index 116a6e1f5..bc68214eb 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/device-usb.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/device-usb.svg
@@ -2,57 +2,16 @@
 <!-- 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="device-usb.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="-145.42228"
-     inkscape:cy="-143.74722"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 12 1 L 8.5351562 7 L 11 7 L 11 17.972656 C 10.435229 17.599949 9.7843951 17.277344 8.9628906 17.277344 C 8.124075 17.277344 7.6770327 17.087309 7.4042969 16.878906 C 7.1315611 16.670504 6.9868907 16.407195 6.8964844 16.078125 C 6.8778378 16.010253 6.875278 15.940481 6.8632812 15.871094 A 3 3 0 0 0 9 13 A 3 3 0 0 0 6 10 A 3 3 0 0 0 3 13 A 3 3 0 0 0 4.8222656 15.759766 C 4.8446021 16.029149 4.8877936 16.314702 4.96875 16.609375 C 5.1440535 17.247462 5.5148544 17.951784 6.1914062 18.46875 C 6.8679584 18.985716 7.8016916 19.277344 8.9628906 19.277344 C 9.5154797 19.277344 9.8243092 19.422624 10.083984 19.636719 C 10.34366 19.850814 10.549952 20.172035 10.697266 20.535156 C 10.984625 21.243487 10.9991 21.966846 11 22.003906 L 11 22.037109 L 11 23 L 13 23 L 13 22.037109 L 13.007812 22.037109 C 13.007812 22.037109 13 21.998697 13 21.998047 L 13 21.978516 C 13 20.589627 13.25238 19.239356 13.748047 18.351562 C 14.243713 17.463766 14.830864 17 16 17 C 17.027778 17 17.908803 16.521686 18.478516 15.888672 C 19.048228 15.255658 19.368169 14.499983 19.582031 13.787109 C 19.718988 13.330586 19.801349 12.900742 19.863281 12.5 L 21.5 12.5 L 21.5 7.5 L 16.5 7.5 L 16.5 12.5 L 17.835938 12.5 C 17.791784 12.732763 17.739874 12.973172 17.667969 13.212891 C 17.506831 13.750017 17.264272 14.244342 16.990234 14.548828 C 16.716197 14.853314 16.472222 15 16 15 C 14.741758 15 13.78535 15.574955 13 16.316406 L 13 7 L 15.464844 7 L 12 1 z "
        id="path2597" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/distortion-auto-small.svg b/rtdata/icons/rawtherapee/scalable/apps/distortion-auto-small.svg
index 6a8ac0a03..dd9726fb6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/distortion-auto-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/distortion-auto-small.svg
@@ -2,66 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="distortion-auto-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-center="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -72,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -106,36 +56,28 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path1207"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path1207" />
     <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:0.7;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:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1.4648438 2 A 0.50005 0.50005 0 0 0 1.0605469 2.7382812 C 1.7855476 4.0821021 2.2401998 5.4168812 2.4199219 6.7539062 L 3.3691406 7.3984375 C 3.3517325 7.0972624 3.3261672 6.7966526 3.2832031 6.4960938 C 4.1451658 6.6228297 4.8005195 6.6504813 5.5136719 6.7226562 C 5.5511757 7.3450003 5.5452904 8.1550837 5.4980469 8.8417969 L 7.2636719 10.037109 C 7.5172118 10.007091 7.7705212 9.9800391 7.9804688 9.9804688 C 8.4406081 9.9814098 9.0961971 10.105542 9.578125 10.138672 C 9.642009 10.643734 9.65881 11.084646 9.7675781 11.707031 C 9.0985287 11.626933 8.4311692 11.596927 7.765625 11.607422 A 1.0001 1.0001 0 0 1 7.5039062 11.865234 L 6.4179688 12.589844 C 9.0079035 12.283983 11.619457 12.717729 14.291016 13.953125 A 0.50005 0.50005 0 0 0 14.9375 13.257812 C 12.914817 9.6135385 13.09896 6.189511 14.941406 2.734375 A 0.50005 0.50005 0 0 0 14.291016 2.046875 C 10.072838 3.993726 5.9271618 3.993726 1.7089844 2.046875 A 0.50005 0.50005 0 0 0 1.515625 2 A 0.50005 0.50005 0 0 0 1.4648438 2 z M 3.3691406 7.3984375 C 3.3834522 7.646041 3.3810541 7.894472 3.3789062 8.1425781 C 3.3818473 7.8944257 3.3834573 7.6461277 3.3691406 7.3984375 z M 2.4199219 6.7539062 C 2.4646549 7.0866933 2.4863602 7.4185862 2.4960938 7.7519531 C 2.4860947 7.4191265 2.464587 7.0861885 2.4199219 6.7539062 z M 2.3710938 3.3261719 C 3.3283846 3.6958169 4.2865235 3.9992695 5.2480469 4.1796875 C 5.3616719 4.8264315 5.3478309 5.2075886 5.4082031 5.7128906 C 4.6769083 5.6333376 4.0613378 5.6169696 3.1425781 5.4785156 C 2.9710126 4.7554796 2.6846397 4.0403569 2.3710938 3.3261719 z M 13.628906 3.3261719 C 13.308715 4.0596719 13.029462 4.7960518 12.855469 5.5429688 C 11.919921 5.6834678 11.299685 5.6797579 10.558594 5.7480469 C 10.625614 5.2362169 10.626644 4.8389855 10.742188 4.1796875 C 11.706931 3.9993015 12.668418 3.6970509 13.628906 3.3261719 z M 6.2597656 4.2949219 C 7.4156215 4.4319599 8.5706967 4.432786 9.7265625 4.296875 C 9.6245487 4.900954 9.6091682 5.3446878 9.5507812 5.8398438 C 8.6013765 5.8916137 7.3599926 5.8904394 6.4140625 5.8183594 C 6.3622955 5.3259274 6.3599345 4.8954359 6.2597656 4.2949219 z M 12.708984 6.5566406 C 12.575175 7.5129706 12.574561 8.4749175 12.701172 9.4453125 C 11.828248 9.3171325 11.178721 9.2965136 10.462891 9.2285156 C 10.397301 8.4964236 10.384403 7.4699734 10.439453 6.7558594 C 11.164709 6.6952994 11.826549 6.6840586 12.708984 6.5566406 z M 6.515625 6.8261719 C 7.3988855 6.8868719 8.549521 6.8873031 9.4375 6.8457031 C 9.39426 7.5130501 9.4048063 8.4501564 9.4570312 9.1308594 C 8.5557139 9.0762794 7.3846785 9.0768762 6.4863281 9.1289062 C 6.5504751 8.4507423 6.548227 7.5095219 6.515625 6.8261719 z M 2.4980469 8.171875 C 2.4928762 8.5099422 2.4773437 8.8482539 2.4355469 9.1875 C 2.4768085 8.8486538 2.493227 8.5095617 2.4980469 8.171875 z M 2.3867188 9.4824219 C 2.3384644 9.7946911 2.2770092 10.108172 2.1972656 10.421875 C 2.2766344 10.108025 2.3388782 9.7948369 2.3867188 9.4824219 z M 10.587891 10.238281 C 11.312022 10.313221 11.911724 10.32271 12.826172 10.460938 C 12.993904 11.196559 13.297189 11.934468 13.626953 12.673828 C 12.678558 12.307455 11.732132 11.999535 10.787109 11.820312 C 10.665129 11.145843 10.660447 10.758776 10.587891 10.238281 z M 2.1328125 10.677734 C 2.0253573 11.059724 1.8930949 11.443357 1.7382812 11.828125 C 1.892857 11.443144 2.0257947 11.059915 2.1328125 10.677734 z M 7.7636719 11.607422 C 7.2214496 11.616044 6.6804397 11.64996 6.140625 11.71875 C 6.6804421 11.649959 7.2214472 11.616032 7.7636719 11.607422 z M 1.6464844 12.046875 C 1.4752404 12.449645 1.2864123 12.853194 1.0625 13.259766 C 1.2864631 12.853102 1.4755216 12.44969 1.6464844 12.046875 z M 6.1464844 12.632812 C 5.7626054 12.685803 5.3792017 12.754663 4.9960938 12.839844 C 5.3794134 12.754407 5.7624075 12.685881 6.1464844 12.632812 z M 4.5410156 12.953125 C 4.2056652 13.038834 3.8701852 13.135966 3.5351562 13.246094 C 3.8700723 13.13581 4.2057783 13.039011 4.5410156 12.953125 z M 3.1132812 13.386719 C 2.6451188 13.554906 2.1770797 13.73976 1.7089844 13.955078 C 2.1771153 13.739744 2.6450595 13.555153 3.1132812 13.386719 z "
        transform="translate(0,8)"
        id="path108" />
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="m -17.188754,17.975283 c 4.307652,-0.659705 6.017459,-0.654403 10.377016,0.0192 m -10.402955,-4.050537 c 4.307652,0.659705 6.060977,0.7413 10.420534,0.0677 m -2.922632,-2.196722 c -0.64221,3.591664 -0.643552,4.629432 0.04721,8.376771 m -4.620178,-8.377834 c 0.666666,3.666667 0.5279,4.730262 -0.138767,8.396929 M -18.5,10.5 c 4.333333,2 8.666667,2 13,0 -1.90259,3.567911 -2.095481,7.224565 0,11 -4.413626,-2.041021 -8.742142,-1.958561 -13,0 2.048632,-3.719835 1.950877,-7.383964 0,-11 z"
-       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;stroke-opacity:1;paint-order:normal"
-       id="path838"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path838" />
     <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:0.3;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:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 2.4199219 6.7539062 C 2.7080154 8.8971508 2.2808894 11.04746 1.0625 13.259766 A 0.50005 0.50005 0 0 0 1.7089844 13.955078 C 3.276596 13.233997 4.8432265 12.775814 6.4179688 12.589844 L 7.5039062 11.865234 A 1.0001 1.0001 0 0 0 7.765625 11.607422 C 7.222748 11.615982 6.6810887 11.649877 6.140625 11.71875 C 6.2505764 11.097816 6.2806286 10.643647 6.3515625 10.136719 C 6.6257689 10.118408 6.9465343 10.074658 7.2636719 10.037109 L 5.4980469 8.8417969 C 5.4895563 8.9652133 5.4905156 9.1110987 5.4785156 9.2226562 C 4.7794414 9.2877362 4.1454062 9.3048964 3.2988281 9.4277344 C 3.3876834 8.7494679 3.4081315 8.073014 3.3691406 7.3984375 L 2.4199219 6.7539062 z M 5.3398438 10.234375 C 5.2602187 10.759119 5.2418128 11.161186 5.1191406 11.839844 C 4.1976905 12.021265 3.2839357 12.318901 2.3730469 12.669922 C 2.7027209 11.926919 2.9989976 11.185131 3.1679688 10.441406 C 4.0512207 10.309213 4.6348775 10.306375 5.3398438 10.234375 z "
        transform="translate(0,8)"
        id="path844" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="Symbol-4-6-8"
        d="M 1,17.238584 V 15 L 6.950059,19.034097 1,23 v -2.198912 z"
-       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:0.04999533" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/distortion-auto.svg b/rtdata/icons/rawtherapee/scalable/apps/distortion-auto.svg
index 8cfadb130..2d14f873f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/distortion-auto.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/distortion-auto.svg
@@ -2,57 +2,16 @@
 <!-- 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="distortion-auto.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,23 +55,18 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.72779667;marker:none;enable-background:accumulate"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.72779667;marker:none;enable-background:accumulate"
        d="M 2.7324219 10.466797 C 2.8664433 11.324961 2.9046109 12.195226 2.7832031 13.068359 C 2.5578634 14.86295 1.8840469 16.566826 1.1601562 18.212891 C 1.1088982 18.503715 1.0932627 19.01928 1.3671875 19.214844 C 1.9987238 19.571255 2.7393686 19.160882 3.2890625 19.087891 C 5.8393725 18.435152 8.4631567 17.946848 11.099609 17.839844 A 1.414355 1.414355 0 0 0 10.792969 15.9375 C 10.282483 15.961257 9.7719917 15.994499 9.2636719 16.046875 C 9.2712719 15.657299 9.2759109 15.279015 9.2792969 14.908203 L 9.2832031 14.908203 L 6.4746094 13.003906 C 5.8871228 13.008733 5.3000311 13.020719 4.7128906 12.996094 C 4.7523674 12.61409 4.7704998 12.229735 4.7675781 11.845703 L 2.7324219 10.466797 z M 4.3671875 14.908203 L 7.3613281 14.908203 L 7.3613281 16.300781 C 6.1367495 16.49137 4.9201355 16.73163 3.7167969 17.023438 C 3.973593 16.331103 4.1940008 15.626652 4.3671875 14.908203 z "
        id="path4473" />
     <path
-       inkscape:connector-curvature="0"
        id="path986"
        d="M 2.0253906,4.5 2.0039056,4.5078 C 1.7275596,4.55203 1.4823264,4.5174 1.330078,4.748037 1.1778296,4.97868 1.1491382,5.48189 1.2207033,5.773427 c 0.080002,0.370521 0.344078,0.665265 0.4374999,1.033203 0.4693901,1.174627 0.8781079,2.404424 1.0742186,3.660157 l 2.0351563,1.378906 c -0.00284,-0.373637 -0.025588,-0.747956 -0.068359,-1.119141 H 7.361328 v 2.28125 c -0.295641,-0.0028 -0.591022,-0.0063 -0.886719,-0.0039 l 2.808594,1.904297 h 5.230469 v 1.107422 c -1.236271,-0.113987 -2.48056,-0.135837 -3.720703,-0.07813 a 1.414355,1.414355 0 0 1 0.30664,1.902344 c 1.319527,-0.05355 2.641206,-0.01885 3.958985,0.152344 2.43534,0.273017 4.831276,0.830818 7.185547,1.507812 0.132596,-0.209473 0.117017,-0.134573 0.419921,-0.283203 0.302906,-0.14863 0.245189,-1.10836 0,-1.425781 C 22.141935,16.680108 21.735535,15.509575 21.435547,14.31835 21.07312,12.798067 21.022228,11.179759 21.412107,9.6621 21.71115,8.312612 22.225988,7.021944 22.808592,5.773428 22.885152,5.476736 22.817892,4.844005 22.63867,4.718741 22.042145,4.39249 21.386849,4.707731 20.82617,4.787101 17.0036,5.791632 13.01082,6.417292 9.056641,5.935538 6.67531,5.675839 4.3334793,5.134572 2.0253906,4.5 Z m 18.2324214,2.392578 -0.01172,0.03516 -0.002,0.0039 c -0.22587,0.62336 -0.433693,1.253101 -0.587891,1.898437 H 16.408203 V 7.640619 C 17.703306,7.456476 18.98653,7.194525 20.257812,6.892572 Z M 3.7421874,6.910158 3.9101563,6.951178 C 5.0503877,7.223078 6.201861,7.448206 7.361328,7.623053 V 8.830084 H 4.3398438 C 4.1824206,8.177852 3.9718529,7.54003 3.7421874,6.910156 Z M 9.259766,7.871096 c 0.02971,0.0031 0.06013,0.0067 0.08984,0.0098 1.715698,0.167029 3.44809,0.168489 5.164063,0.0039 V 8.8301 H 9.255856 c 9.7e-5,-0.316258 0.0011,-0.636128 0.0039,-0.958984 z m 0.0059,2.855468 h 5.248047 v 2.294922 c -0.603288,0.03044 -4.151509,-0.01531 -5.230469,0.06445 -0.0031,-0.805696 -0.01092,-1.585466 -0.01758,-2.359376 z m 7.142578,0 h 2.890625 c -0.09363,0.756787 -0.09178,1.524973 -0.01563,2.283204 h -2.875 z m 0,4.181641 h 3.21875 c 0.169088,0.712935 0.392889,1.410204 0.644531,2.097656 -1.275689,-0.305989 -2.563419,-0.566493 -3.863281,-0.748047 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.72779661;marker:none;enable-background:accumulate" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.72779661;marker:none;enable-background:accumulate" />
     <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
        id="Symbol-4-6-8"
        d="M 1,14.357876 V 11 L 9.925089,17.051146 1,23 v -3.298368 z"
-       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:0.04999533" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel-small.svg b/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel-small.svg
index b769bd0aa..70bdae4ec 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel-small.svg
@@ -2,68 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="distortion-barrel-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-center="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -74,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -108,20 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path1207"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path1207" />
     <path
-       inkscape:connector-curvature="0"
        id="path936"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       d="m 1.5,17.5 c 4.3333333,0.666667 8.666667,0.666667 13,0 m -13,-3 c 4.3333333,-0.666667 8.666667,-0.666667 13,0 m -4,-4 c 0.650292,3.616036 0.682877,7.280165 0,11 m -5,-11 c -0.6584443,3.641034 -0.6748477,7.307062 0,11 M 2,11.5 c 4.2825076,-1.305586 7.61369,-1.360845 12,0 0.666667,3 0.666667,6 0,9 -4.413583,1.374278 -7.7421039,1.291863 -12,0 -0.676645,-3.026341 -0.6566267,-6.025562 0,-9 z"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       d="m 1.5,17.5 c 4.3333333,0.666667 8.666667,0.666667 13,0 m -13,-3 c 4.3333333,-0.666667 8.666667,-0.666667 13,0 m -4,-4 c 0.650292,3.616036 0.682877,7.280165 0,11 m -5,-11 c -0.6584443,3.641034 -0.6748477,7.307062 0,11 M 2,11.5 c 4.2825076,-1.305586 7.61369,-1.360845 12,0 0.666667,3 0.666667,6 0,9 -4.413583,1.374278 -7.7421039,1.291863 -12,0 -0.676645,-3.026341 -0.6566267,-6.025562 0,-9 z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel.svg b/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel.svg
index 012651e87..762f0771b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/distortion-barrel.svg
@@ -2,57 +2,16 @@
 <!-- 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="distortion-barrel.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="23.864854"
-     inkscape:cx="7.0384481"
-     inkscape:cy="12.320274"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,13 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path12050"
-       style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.67007041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.67007041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 21.911199,14.123368 c -6.600755,0.71961 -13.2015094,0.75593 -19.8022638,0 M 21.911199,9.8963864 c -6.547167,-0.6162539 -13.149694,-0.5958768 -19.8022638,0 M 15.317045,5.6874681 c 0.745272,4.2149396 0.677069,8.4298789 0,12.6448179 M 8.7030887,5.6874681 c -0.6694844,4.1881603 -0.648054,8.4039569 0,12.6448179 M 21.317131,6.2293888 c 1.126377,3.8798542 1.139893,7.7338272 0,11.5609772 -6.23134,1.11845 -12.4354929,1.095083 -18.6141279,0 -1.2446021,-3.825373 -1.0716944,-7.682961 0,-11.5609772 6.1513941,-1.1462631 12.3573259,-1.1199636 18.6141279,0 z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion-small.svg b/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion-small.svg
index 8c26277d2..8f262e176 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion-small.svg
@@ -2,66 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="distortion-pincushion-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-center="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,20 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path1207"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path1207" />
     <path
-       inkscape:connector-curvature="0"
        id="path108"
-       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;stroke-opacity:1;paint-order:normal"
-       d="M 2.8112464,17.975283 C 7.1188978,17.315578 8.8287055,17.32088 13.188262,17.99448 M 2.7853074,13.943943 c 4.3076514,0.659705 6.0609769,0.7413 10.4205336,0.0677 m -2.922632,-2.196722 c -0.6422099,3.591664 -0.6435523,4.629432 0.04721,8.376771 M 5.7102407,11.813858 c 0.6666667,3.666667 0.5279002,4.730262 -0.1387665,8.396929 M 1.5,10.5 c 4.3333333,2 8.666667,2 13,0 -1.90259,3.567911 -2.095481,7.224565 0,11 -4.413626,-2.041021 -8.7421418,-1.958561 -13,0 2.0486318,-3.719835 1.9508767,-7.383964 0,-11 z"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       d="M 2.8112464,17.975283 C 7.1188978,17.315578 8.8287055,17.32088 13.188262,17.99448 M 2.7853074,13.943943 c 4.3076514,0.659705 6.0609769,0.7413 10.4205336,0.0677 m -2.922632,-2.196722 c -0.6422099,3.591664 -0.6435523,4.629432 0.04721,8.376771 M 5.7102407,11.813858 c 0.6666667,3.666667 0.5279002,4.730262 -0.1387665,8.396929 M 1.5,10.5 c 4.3333333,2 8.666667,2 13,0 -1.90259,3.567911 -2.095481,7.224565 0,11 -4.413626,-2.041021 -8.7421418,-1.958561 -13,0 2.0486318,-3.719835 1.9508767,-7.383964 0,-11 z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion.svg b/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion.svg
index c893eb99a..50b3a923c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/distortion-pincushion.svg
@@ -2,57 +2,16 @@
 <!-- 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="distortion-pincushion.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,15 +55,12 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g2962"
        transform="matrix(0.03657136,0,0,0.03657136,10.902008,7.6984958)">
       <path
-         inkscape:connector-curvature="0"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:30;marker:none;enable-background:accumulate"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:30;marker:none;enable-background:accumulate"
          d="m 88.923828,42.087891 -0.894531,0.330078 c -11.391097,1.823014 -21.493806,0.41863 -27.769531,9.925781 -6.275726,9.507166 -7.496793,30.207364 -4.546875,42.224609 3.297708,15.272981 14.197948,27.419421 18.048828,42.585941 32.571051,81.50751 58.675051,169.45401 46.347661,258.10937 -9.28857,73.97358 -37.055544,144.23269 -66.894536,212.08399 -2.112858,11.98786 -2.787381,33.26495 8.503906,41.32617 26.032116,14.69134 56.5602,-2.29596 79.21875,-5.30469 157.73866,-40.37242 322.35432,-66.29093 485.20508,-45.13476 100.38546,11.25387 199.13983,34.2523 296.18359,62.1582 5.46565,-8.63453 4.7798,-5.54727 17.26563,-11.67383 12.48584,-6.12658 10.16336,-45.65212 0.0566,-58.73633 C 918.12615,544.19083 901.36367,495.94444 888.99805,446.8418 874.0587,384.17524 871.9602,317.39038 888.03125,254.83203 900.35786,199.20569 921.53566,146.03257 945.55078,94.568359 948.70652,82.33862 945.99229,56.284508 938.60352,51.121094 914.0146,37.672927 886.99027,50.640635 863.87891,53.912109 706.31131,95.319237 541.7171,121.13148 378.72461,101.27344 280.56544,90.568185 184.06396,68.245158 88.923828,42.087891 Z m 751.527342,98.646489 -0.51562,1.41601 -0.0508,0.13867 c -9.31043,25.69509 -17.85679,51.64708 -24.21289,78.24805 h -133.8828 v -48.99414 c 53.38455,-7.59043 106.25945,-18.36201 158.66211,-30.80859 z m -680.8164,0.70703 c 2.30833,0.54959 4.61549,1.09884 6.92382,1.64843 47.00069,11.2078 94.47596,20.49196 142.26953,27.69922 v 49.74805 H 184.27148 c -6.48903,-26.88495 -15.16983,-53.13211 -24.63671,-79.0957 z m 227.48828,39.61914 c 1.22483,0.12562 2.449,0.24937 3.67383,0.375 70.72158,6.885 142.10497,6.97361 212.83789,0.18945 v 38.91211 H 386.95898 c 0.004,-13.03626 0.0498,-26.16831 0.16407,-39.47656 z m -188.0586,117.72461 h 109.76367 v 93.98242 c -36.39816,-0.34497 -72.81555,1.05328 -109.19921,-0.47266 3.21045,-31.06643 3.01067,-62.48342 -0.56446,-93.50976 z m 188.29493,0 h 216.27539 v 94.59375 c -24.86773,1.25455 -171.07379,-0.67088 -215.54883,2.61718 -0.12829,-33.211 -0.45213,-65.31015 -0.72656,-97.21093 z m 294.42968,0 h 119.08985 c -3.85963,31.19497 -3.7505,62.82168 -0.61133,94.07617 H 681.78906 Z M 185.44922,471.10938 h 123.3789 v 57.42578 c -50.4775,7.85612 -100.62848,17.7431 -150.23046,29.77148 10.58521,-28.53821 19.71275,-57.58257 26.85156,-87.19726 z m 202.48047,0 h 215.70508 v 45.69531 c -71.93613,-6.63266 -144.51577,-6.13217 -216.3711,1.27148 0.31343,-16.05844 0.52647,-31.68182 0.66602,-46.96679 z m 293.85937,0 h 132.65821 c 6.96986,29.38741 16.19558,58.15323 26.56835,86.49023 -52.58429,-12.61297 -105.64584,-23.37178 -159.22656,-30.85547 z"
          transform="matrix(0.66335753,0,0,0.66335753,-301.68363,-115.37838)"
          id="path4473" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/draw.svg b/rtdata/icons/rawtherapee/scalable/apps/draw.svg
index 30ea04ea4..db922ba0c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/draw.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/draw.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="draw.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14.298358"
-     inkscape:cx="-1.7458856"
-     inkscape:cy="16.76612"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1041"
-     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="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -95,14 +53,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 19.761765,1 c 1.135523,0 3.238095,2.1025723 3.238095,3.238095 0,1.1355228 -1.57952,1.57952 -1.57952,1.57952 L 18.182245,2.57952 c 0,0 0.443997,-1.57952 1.57952,-1.57952 z M 17.372721,3.3890438 20.610816,6.6271387 7.515719,19.722235 4.277625,16.484141 Z M 3.468101,17.293664 6.706195,20.531759 6.666665,20.571289 1,22.999859 3.42857,17.333193 Z"
-       id="path1658"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzcczccccccccccc" />
+       id="path1658" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/edit-point.svg b/rtdata/icons/rawtherapee/scalable/apps/edit-point.svg
index 9f686d6e9..24374ed02 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/edit-point.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/edit-point.svg
@@ -2,57 +2,16 @@
 <!-- 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="edit-point.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,60 +55,51 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.9;fill:#2a7fff;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"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2927"
        width="9"
        height="2"
        x="2"
        y="21" />
     <rect
-       style="opacity:0.9;fill:#2a7fff;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"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2929"
        width="9"
        height="2"
        x="13"
        y="21" />
     <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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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="17"
        cy="16"
        r="3" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 17.761905,2 C 18.897428,2 21,4.1025723 21,5.238095 c 0,1.1355228 -1.57952,1.57952 -1.57952,1.57952 L 16.182385,3.57952 c 0,0 0.443997,-1.57952 1.57952,-1.57952 z M 15.372861,4.3890438 18.610956,7.6271387 10.515719,15.722376 7.277624,12.484281 Z M 6.4681002,13.293805 9.7061953,16.5319 9.6666663,16.571429 4,19 6.4285712,13.333334 Z"
-       id="path1658"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzcczccccccccccc" />
+       id="path1658" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m -34.951172,1.048828 c -1.402705,0 -4,2.5972953 -4,4 0,1.4027047 1.951172,1.9511719 1.951172,1.9511719 l 4,-4 c 0,0 -0.548467,-1.9511719 -1.951172,-1.9511719 z M -32,3.9999999 l -4,4 L -26,18 -22,14 Z M -21,15 l -4,4 0.04883,0.04883 7,3 -3,-7 z"
-       id="path1658-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzcczccccccccccc" />
+       id="path1658-3" />
     <path
-       style="fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M -34,6.9999999 -25,16 l -1,1 -9,-9.0000001 z"
-       id="path1682"
-       inkscape:connector-curvature="0" />
+       id="path1682" />
     <path
-       style="fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m -24,19 5,2 -4,-3 z"
-       id="path1686"
-       inkscape:connector-curvature="0" />
+       id="path1686" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path1690"
        cx="-35"
        cy="19"
        r="3" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M -36.898437,16.679688 A 3,3 0 0 0 -38,19 a 3,3 0 0 0 3,3 3,3 0 0 0 2.322266,-1.101562 A 3.5,3.5 0 0 1 -33.5,21 3.5,3.5 0 0 1 -37,17.5 a 3.5,3.5 0 0 1 0.101563,-0.820312 z"
        id="circle1692" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/edit-small.svg b/rtdata/icons/rawtherapee/scalable/apps/edit-small.svg
index 6306f06df..359c1973f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/edit-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/edit-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    version="1.1"
    id="SVGRoot"
-   inkscape:export-filename="/tmp/template.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="edit-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.04"
-     inkscape:cx="8"
-     inkscape:cy="7.5803253"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,32 +56,22 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 55,16 H 65 M 60,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4977" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 24,16 H 34 M 29,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4981" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        d="M 39,16 H 49 M 44,11 V 21"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4983" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 11.413246,9.78023 c 0.784726,0 2.23775,1.576711 2.23775,2.428236 0,0.851523 -1.091559,1.184475 -1.091559,1.184475 l -2.237749,-2.428235 c 0,0 0.306833,-1.184476 1.091558,-1.184476 z M 9.762249,11.571765 12,14 6.405626,20.070587 4.1678762,17.642352 Z m -6.1538101,6.677647 2.237749,2.428235 -0.027314,0.02964 -3.9160622,1.821176 1.6783123,-4.249412 z"
-       id="path1658"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzcczccccccccccc" />
+       id="path1658" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/edit.svg b/rtdata/icons/rawtherapee/scalable/apps/edit.svg
index 71f3d0b06..c569c5ea0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/edit.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/edit.svg
@@ -2,57 +2,16 @@
 <!-- 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.91 r13725"
-   sodipodi:docname="edit.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="1017"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,40 +55,31 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 17.761905,2 C 18.897428,2 21,4.1025723 21,5.238095 c 0,1.1355228 -1.57952,1.57952 -1.57952,1.57952 L 16.182385,3.57952 c 0,0 0.443997,-1.57952 1.57952,-1.57952 z M 15.372861,4.3890438 18.610956,7.6271387 10.515719,15.722376 7.277624,12.484281 Z M 6.4681002,13.293805 9.7061953,16.5319 9.6666663,16.571429 4,19 6.4285712,13.333334 Z"
-       id="path1658"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzcczccccccccccc" />
+       id="path1658" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m -34.951172,1.048828 c -1.402705,0 -4,2.5972953 -4,4 0,1.4027047 1.951172,1.9511719 1.951172,1.9511719 l 4,-4 c 0,0 -0.548467,-1.9511719 -1.951172,-1.9511719 z M -32,3.9999999 l -4,4 L -26,18 -22,14 Z M -21,15 l -4,4 0.04883,0.04883 7,3 -3,-7 z"
-       id="path1658-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zzcczccccccccccc" />
+       id="path1658-3" />
     <path
-       style="fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M -34,6.9999999 -25,16 l -1,1 -9,-9.0000001 z"
-       id="path1682"
-       inkscape:connector-curvature="0" />
+       id="path1682" />
     <path
-       style="fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m -24,19 5,2 -4,-3 z"
-       id="path1686"
-       inkscape:connector-curvature="0" />
+       id="path1686" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path1690"
        cx="-35"
        cy="19"
        r="3" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.00157475;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M -36.898437,16.679688 A 3,3 0 0 0 -38,19 a 3,3 0 0 0 3,3 3,3 0 0 0 2.322266,-1.101562 A 3.5,3.5 0 0 1 -33.5,21 3.5,3.5 0 0 1 -37,17.5 a 3.5,3.5 0 0 1 0.101563,-0.820312 z"
        id="circle1692" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/equilizer-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/equilizer-narrow.svg
index 52dcaed4b..758d248d1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/equilizer-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/equilizer-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="equilizer-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,263 +55,210 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,1.9999922 v 1 H 4 v -1 z"
-       id="path6665"
-       inkscape:connector-curvature="0" />
+       id="path6665" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 0.9999999,3.9999922 V 4.9999921 H 4 V 3.9999922 Z"
-       id="path6663"
-       inkscape:connector-curvature="0" />
+       id="path6663" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,5.9999921 v 1 H 4 v -1 z"
-       id="path6661"
-       inkscape:connector-curvature="0" />
+       id="path6661" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,5.9999921 v 1 h 2.999999 v -1 z"
-       id="path6659"
-       inkscape:connector-curvature="0" />
+       id="path6659" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,7.999992 v 1 H 4 v -1 z"
-       id="path6657"
-       inkscape:connector-curvature="0" />
+       id="path6657" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,7.999992 v 1 h 3.9999995 v -1 z"
-       id="path6655"
-       inkscape:connector-curvature="0" />
+       id="path6655" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,7.999992 v 1 h 2.999999 v -1 z"
-       id="path6653"
-       inkscape:connector-curvature="0" />
+       id="path6653" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,9.999992 v 1 H 4 v -1 z"
-       id="path6651"
-       inkscape:connector-curvature="0" />
+       id="path6651" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,9.999992 v 1 h 3.9999995 v -1 z"
-       id="path6649"
-       inkscape:connector-curvature="0" />
+       id="path6649" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000002,10 v 1 H 19 v -1 z"
-       id="path6647"
-       inkscape:connector-curvature="0" />
+       id="path6647" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,9.999992 v 1 h 2.999999 v -1 z"
-       id="path6645"
-       inkscape:connector-curvature="0" />
+       id="path6645" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,11.999992 v 1 H 4 v -1 z"
-       id="path6643"
-       inkscape:connector-curvature="0" />
+       id="path6643" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,11.999992 v 1 h 3.9999995 v -1 z"
-       id="path6641"
-       inkscape:connector-curvature="0" />
+       id="path6641" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,12 v 1 h 4 v -1 z"
-       id="path6639"
-       inkscape:connector-curvature="0" />
+       id="path6639" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000002,12 v 1 H 19 v -1 z"
-       id="path6637"
-       inkscape:connector-curvature="0" />
+       id="path6637" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,11.999992 v 1 h 2.999999 v -1 z"
-       id="path6635"
-       inkscape:connector-curvature="0" />
+       id="path6635" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,13.999992 v 1 H 4 v -1 z"
-       id="path6633"
-       inkscape:connector-curvature="0" />
+       id="path6633" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,13.999992 v 1 h 3.9999995 v -1 z"
-       id="path6631"
-       inkscape:connector-curvature="0" />
+       id="path6631" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,14 v 1 h 4 v -1 z"
-       id="path6629"
-       inkscape:connector-curvature="0" />
+       id="path6629" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000002,14 v 1 H 19 v -1 z"
-       id="path6627"
-       inkscape:connector-curvature="0" />
+       id="path6627" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,13.999992 v 1 h 2.999999 v -1 z"
-       id="path6625"
-       inkscape:connector-curvature="0" />
+       id="path6625" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,15.999992 v 1 H 4 v -1 z"
-       id="path6623"
-       inkscape:connector-curvature="0" />
+       id="path6623" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,15.999992 v 1 h 3.9999995 v -1 z"
-       id="path6621"
-       inkscape:connector-curvature="0" />
+       id="path6621" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,16 v 1 h 4 v -1 z"
-       id="path6619"
-       inkscape:connector-curvature="0" />
+       id="path6619" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000002,16 v 1 H 19 v -1 z"
-       id="path6617"
-       inkscape:connector-curvature="0" />
+       id="path6617" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,15.999992 v 1 h 2.999999 v -1 z"
-       id="path6615"
-       inkscape:connector-curvature="0" />
+       id="path6615" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,17.999992 v 1 H 4 v -1 z"
-       id="path6613"
-       inkscape:connector-curvature="0" />
+       id="path6613" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,17.999992 v 1 h 3.9999995 v -1 z"
-       id="path6611"
-       inkscape:connector-curvature="0" />
+       id="path6611" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,18 v 1 h 4 v -1 z"
-       id="path6609"
-       inkscape:connector-curvature="0" />
+       id="path6609" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000002,18 v 1 H 19 v -1 z"
-       id="path6607"
-       inkscape:connector-curvature="0" />
+       id="path6607" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,17.999992 v 1 h 2.999999 v -1 z"
-       id="path6605"
-       inkscape:connector-curvature="0" />
+       id="path6605" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 0.9999999,19.999992 v 2 H 4 v -2 z"
-       id="path6603"
-       inkscape:connector-curvature="0" />
+       id="path6603" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000001,19.999992 v 2 h 3.9999995 v -2 z"
-       id="path6601"
-       inkscape:connector-curvature="0" />
+       id="path6601" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,20 v 2 h 4 v -2 z"
-       id="path6599"
-       inkscape:connector-curvature="0" />
+       id="path6599" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000002,20 v 2 H 19 v -2 z"
-       id="path6597"
-       inkscape:connector-curvature="0" />
+       id="path6597" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,19.999992 v 2 h 2.999999 v -2 z"
-       id="path6164"
-       inkscape:connector-curvature="0" />
+       id="path6164" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 0.99999996,2.5292899 V 3.5292773 H 3.9999999 V 2.5292899 Z"
-       id="path6767"
-       inkscape:connector-curvature="0" />
+       id="path6767" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 0.99999996,4.5293024 V 5.5292898 H 3.9999999 V 4.5293024 Z"
-       id="path6765"
-       inkscape:connector-curvature="0" />
+       id="path6765" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 0.99999996,6.5292772 V 7.5293024 H 3.9999999 V 6.5292772 Z"
-       id="path6763"
-       inkscape:connector-curvature="0" />
+       id="path6763" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,6.5292772 v 1.0000252 h 3 V 6.5292772 Z"
-       id="path6761"
-       inkscape:connector-curvature="0" />
+       id="path6761" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 5.0000005,8.5292898 V 9.5292772 H 9.0000001 V 8.5292898 Z"
-       id="path6759"
-       inkscape:connector-curvature="0" />
+       id="path6759" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,8.5292898 v 0.9999874 h 3 V 8.5292898 Z"
-       id="path6757"
-       inkscape:connector-curvature="0" />
+       id="path6757" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 5.0000005,10.529302 V 11.52929 H 9.0000001 V 10.529302 Z"
-       id="path6755"
-       inkscape:connector-curvature="0" />
+       id="path6755" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000003,10.52931 v 0.999988 h 3.999998 V 10.52931 Z"
-       id="path6753"
-       inkscape:connector-curvature="0" />
+       id="path6753" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 20,10.529302 v 0.999988 h 3 v -0.999988 z"
-       id="path6751"
-       inkscape:connector-curvature="0" />
+       id="path6751" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 5.0000005,12.529277 v 1.000025 h 3.9999996 v -1.000025 z"
-       id="path6749"
-       inkscape:connector-curvature="0" />
+       id="path6749" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,12.529285 v 1.000025 h 4 v -1.000025 z"
-       id="path6747"
-       inkscape:connector-curvature="0" />
+       id="path6747" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000003,12.529285 v 1.000025 h 3.999998 v -1.000025 z"
-       id="path6745"
-       inkscape:connector-curvature="0" />
+       id="path6745" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,14.529298 v 0.999987 h 4 v -0.999987 z"
-       id="path6743"
-       inkscape:connector-curvature="0" />
+       id="path6743" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 15.000003,14.529298 v 0.999987 h 3.999998 v -0.999987 z"
-       id="path6741"
-       inkscape:connector-curvature="0" />
+       id="path6741" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.09838247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 10.000001,16.52931 v 0.999988 h 4 V 16.52931 Z"
-       id="path6166"
-       inkscape:connector-curvature="0" />
+       id="path6166" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/equilizer-wide.svg b/rtdata/icons/rawtherapee/scalable/apps/equilizer-wide.svg
index 594cca2ab..8662e4bcb 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/equilizer-wide.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/equilizer-wide.svg
@@ -2,57 +2,16 @@
 <!-- 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="equilizer-wide.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="23.864854"
-     inkscape:cx="8.8011502"
-     inkscape:cy="10.791964"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,168 +55,134 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,2 V 2.9999888 H 7.0000003 V 2 Z"
-       id="path6216"
-       inkscape:connector-curvature="0" />
+       id="path6216" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,3.9999774 V 5.0000039 H 7.0000003 V 3.9999774 Z"
-       id="path6214"
-       inkscape:connector-curvature="0" />
+       id="path6214" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,5.9999926 V 6.9999812 H 7.0000003 V 5.9999926 Z"
-       id="path6212"
-       inkscape:connector-curvature="0" />
+       id="path6212" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,5.9999926 v 0.9999886 h 6 V 5.9999926 Z"
-       id="path6210"
-       inkscape:connector-curvature="0" />
+       id="path6210" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,8.0000077 V 8.9999965 H 7.0000003 V 8.0000077 Z"
-       id="path6208"
-       inkscape:connector-curvature="0" />
+       id="path6208" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,8.0000077 v 0.9999888 h 6 V 8.0000077 Z"
-       id="path6206"
-       inkscape:connector-curvature="0" />
+       id="path6206" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,9.9999847 V 11.000011 H 7.0000003 V 9.9999847 Z"
-       id="path6204"
-       inkscape:connector-curvature="0" />
+       id="path6204" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,9.9999847 v 1.0000263 h 6 V 9.9999847 Z"
-       id="path6202"
-       inkscape:connector-curvature="0" />
+       id="path6202" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1,12 v 0.99999 H 7.0000003 V 12 Z"
-       id="path6200"
-       inkscape:connector-curvature="0" />
+       id="path6200" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 8.9999998,12 v 0.99999 H 15 V 12 Z"
-       id="path6198"
-       inkscape:connector-curvature="0" />
+       id="path6198" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,12 v 0.99999 h 6 V 12 Z"
-       id="path6196"
-       inkscape:connector-curvature="0" />
+       id="path6196" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1,14.000016 v 0.999988 h 6.0000003 v -0.999988 z"
-       id="path6194"
-       inkscape:connector-curvature="0" />
+       id="path6194" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 8.9999998,14.000016 v 0.999988 H 15 v -0.999988 z"
-       id="path6192"
-       inkscape:connector-curvature="0" />
+       id="path6192" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,14.000016 v 0.999988 h 6 v -0.999988 z"
-       id="path6190"
-       inkscape:connector-curvature="0" />
+       id="path6190" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,15.999993 V 17.00002 H 7.0000003 V 15.999993 Z"
-       id="path6188"
-       inkscape:connector-curvature="0" />
+       id="path6188" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 8.9999998,15.999993 V 17.00002 H 15 v -1.000027 z"
-       id="path6186"
-       inkscape:connector-curvature="0" />
+       id="path6186" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,15.999993 v 1.000027 h 6 v -1.000027 z"
-       id="path6184"
-       inkscape:connector-curvature="0" />
+       id="path6184" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1,18.000008 v 0.999989 h 6.0000003 v -0.999989 z"
-       id="path6182"
-       inkscape:connector-curvature="0" />
+       id="path6182" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 8.9999998,18.000008 v 0.999989 H 15 v -0.999989 z"
-       id="path6180"
-       inkscape:connector-curvature="0" />
+       id="path6180" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,18.000008 v 0.999989 h 6 v -0.999989 z"
-       id="path6178"
-       inkscape:connector-curvature="0" />
+       id="path6178" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,20.000024 V 22 h 6.0000003 v -1.999976 z"
-       id="path6176"
-       inkscape:connector-curvature="0" />
+       id="path6176" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 8.9999998,20.000024 V 22 H 15 v -1.999976 z"
-       id="path6174"
-       inkscape:connector-curvature="0" />
+       id="path6174" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 17,20.000024 V 22 h 6 v -1.999976 z"
-       id="rect3950"
-       inkscape:connector-curvature="0" />
+       id="rect3950" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.99999475;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.99999475;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,2.5292857 V 3.5292745 H 7.0000003 V 2.5292857 Z"
-       id="path6234"
-       inkscape:connector-curvature="0" />
+       id="path6234" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.99999475;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.99999475;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,4.5293009 V 5.5292896 H 7.0000003 V 4.5293009 Z"
-       id="path6232"
-       inkscape:connector-curvature="0" />
+       id="path6232" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.99999475;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.99999475;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,6.5292784 V 7.5293048 H 7.0000003 V 6.5292784 Z"
-       id="path6230"
-       inkscape:connector-curvature="0" />
+       id="path6230" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,6.5292784 v 1.0000264 h 6 V 6.5292784 Z"
-       id="path6228"
-       inkscape:connector-curvature="0" />
+       id="path6228" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,8.5292934 v 0.9999887 h 6 V 8.5292934 Z"
-       id="path6226"
-       inkscape:connector-curvature="0" />
+       id="path6226" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 17,10.529309 v 0.999988 h 6 v -0.999988 z"
-       id="path6224"
-       inkscape:connector-curvature="0" />
+       id="path6224" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 8.9999998,12.529286 v 1.000026 H 15 v -1.000026 z"
-       id="path6222"
-       inkscape:connector-curvature="0" />
+       id="path6222" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 8.9999998,14.529301 V 15.52929 H 15 v -0.999989 z"
-       id="path6220"
-       inkscape:connector-curvature="0" />
+       id="path6220" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:3.9999938;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 8.9999998,16.529316 v 0.999989 H 15 v -0.999989 z"
-       id="path6162"
-       inkscape:connector-curvature="0" />
+       id="path6162" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/expander-closed-small.svg b/rtdata/icons/rawtherapee/scalable/apps/expander-closed-small.svg
index e9cea3b4d..f050fd36e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/expander-closed-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/expander-closed-small.svg
@@ -2,63 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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="16"
    height="16"
    viewBox="0 0 16 16"
    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="expander-closed.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <linearGradient
-       id="linearGradient2452"
-       osb:paint="solid">
+       id="linearGradient2452">
       <stop
          style="stop-color:#2a7fff;stop-opacity:1;"
          offset="0"
@@ -107,25 +64,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.75294118;fill-rule:nonzero;stroke:none;stroke-width:3.00702119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.00702119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path984"
-       sodipodi:sides="3"
-       sodipodi:cx="5.6052365"
-       sodipodi:cy="16.976503"
-       sodipodi:r1="7.2111025"
-       sodipodi:r2="3.6055512"
-       sodipodi:arg1="-2.0943951"
-       sodipodi:arg2="-1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 1.9996853,10.731505 12.816339,16.976503 1.9996853,23.221501 Z"
-       transform="matrix(0.65240305,0,0,0.6780646,3.6765428,4.488834)"
-       inkscape:transform-center-x="0.38765713" />
+       transform="matrix(0.65240305,0,0,0.6780646,3.6765428,4.488834)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/expander-open-small.svg b/rtdata/icons/rawtherapee/scalable/apps/expander-open-small.svg
index 8355bc2f3..957366a06 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/expander-open-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/expander-open-small.svg
@@ -2,68 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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="16"
    height="16"
    viewBox="0 0 16 16"
    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="expander-open.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox-edge-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <linearGradient
-       id="linearGradient2452"
-       osb:paint="solid">
+       id="linearGradient2452">
       <stop
          style="stop-color:#2a7fff;stop-opacity:1;"
          offset="0"
@@ -112,25 +64,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.75294118;fill-rule:nonzero;stroke:none;stroke-width:3.00691557;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.00691557;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path984"
-       sodipodi:sides="3"
-       sodipodi:cx="5.6052365"
-       sodipodi:cy="16.976503"
-       sodipodi:r1="7.2111025"
-       sodipodi:r2="3.6055512"
-       sodipodi:arg1="-2.0943951"
-       sodipodi:arg2="-1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 1.9996853,10.731505 12.816339,16.976503 1.9996853,23.221501 Z"
-       transform="matrix(0,0.65244888,-0.6780646,0,19.511166,12.676186)"
-       inkscape:transform-center-y="-0.38768447" />
+       transform="matrix(0,0.65244888,-0.6780646,0,19.511166,12.676186)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/exposure.svg b/rtdata/icons/rawtherapee/scalable/apps/exposure.svg
index c0edc9e9b..cbcf4df6f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/exposure.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/exposure.svg
@@ -2,57 +2,16 @@
 <!-- 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="exposure.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,24 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 1,1 V 23 C 1,23 4.5905943,22.918931 6.0976562,22.115234 7.6047181,21.311537 8.8477776,19.982478 9.6035156,18.447266 11.236232,15.076221 12.037823,11.389169 13.349609,7.8945312 14.120754,5.916563 14.982895,3.7984949 16.748047,2.5 18.54042,1.2389873 20.892632,1.1478541 23,1 Z m 5,2 h 2 v 3 h 3 V 8 H 8 v 3 H 6 V 8 H 3 V 6 h 3 z"
-       id="rect977"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccc" />
+       id="rect977" />
     <rect
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect980"
        width="22"
        height="22"
        x="1"
        y="1" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect970"
        width="8"
        height="2"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/filetype-hdr.svg b/rtdata/icons/rawtherapee/scalable/apps/filetype-hdr.svg
index bb5776d6f..5475fe302 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/filetype-hdr.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/filetype-hdr.svg
@@ -2,58 +2,16 @@
 <!-- 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="filetype-hdr.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,18 +55,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.5;fill:#000000;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"
+       style="opacity:0.5;fill:#000000;fill-opacity:1.0;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="rect10009"
        width="22"
        height="8"
        x="1"
        y="8" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect9999"
        width="23"
        height="9"
@@ -117,41 +73,38 @@
        ry="0" />
     <g
        aria-label="HDR"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.19099569px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.9"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.19099569px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.9"
        id="text895">
       <path
          d="M 2.2878589,9.0000003 H 4.1418834 V 11.099591 H 6.1678042 V 9.0000003 h 1.86221 V 15 h -1.86221 V 12.572988 H 4.1418834 V 15 H 2.2878589 Z"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999994px"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999994px"
          id="path822" />
       <path
          d="m 9.2946799,9.0000003 h 2.7544341 q 0.814461,0 1.313779,0.2210095 0.50341,0.2210096 0.830832,0.6343793 0.327421,0.4133699 0.474761,0.9618009 0.14734,0.548431 0.14734,1.162346 0,0.961801 -0.22101,1.493861 -0.216917,0.527967 -0.60573,0.888131 -0.388813,0.356071 -0.834925,0.474761 Q 12.544339,15 12.049114,15 H 9.2946799 Z M 11.148704,10.3588 v 3.278308 h 0.454298 q 0.581173,0 0.826739,-0.126876 0.245566,-0.130969 0.38472,-0.450205 0.139155,-0.323328 0.139155,-1.043656 0,-0.953615 -0.311051,-1.305593 Q 12.331515,10.3588 11.611187,10.3588 Z"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999994px"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999994px"
          id="path824" />
       <path
          d="M 15.810368,15 V 9.0000003 h 3.090041 q 0.859481,0 1.313779,0.1473397 0.454297,0.1473397 0.732605,0.5484311 0.278309,0.3969989 0.278309,0.9699859 0,0.499318 -0.212824,0.863575 -0.212824,0.360163 -0.585266,0.585266 -0.237381,0.143247 -0.650751,0.23738 0.331515,0.110505 0.482947,0.22101 0.102319,0.07367 0.294679,0.315143 0.196453,0.241473 0.261938,0.372442 L 21.712141,15 h -2.095498 l -0.99045,-1.833561 Q 18.437926,12.810368 18.290586,12.703956 18.09004,12.564802 17.836289,12.564802 H 17.672578 V 15 Z m 1.86221,-3.568895 h 0.781719 q 0.126876,0 0.491132,-0.08186 0.184175,-0.03683 0.298772,-0.188268 0.118691,-0.151432 0.118691,-0.347885 0,-0.290587 -0.184175,-0.446112 -0.184175,-0.155525 -0.691678,-0.155525 h -0.814461 z"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999994px"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999994px"
          id="path826" />
     </g>
     <g
        id="g30"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.19099569px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.19099569px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        aria-label="HDR"
        transform="translate(28)">
       <path
          id="path24"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999994px"
-         d="M 2.2878589,9.0000003 H 4.1418834 V 11.099591 H 6.1678042 V 9.0000003 h 1.86221 V 15 h -1.86221 V 12.572988 H 4.1418834 V 15 H 2.2878589 Z"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999994px"
+         d="M 2.2878589,9.0000003 H 4.1418834 V 11.099591 H 6.1678042 V 9.0000003 h 1.86221 V 15 h -1.86221 V 12.572988 H 4.1418834 V 15 H 2.2878589 Z" />
       <path
          id="path26"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999994px"
-         d="m 9.2946799,9.0000003 h 2.7544341 q 0.814461,0 1.313779,0.2210095 0.50341,0.2210096 0.830832,0.6343793 0.327421,0.4133699 0.474761,0.9618009 0.14734,0.548431 0.14734,1.162346 0,0.961801 -0.22101,1.493861 -0.216917,0.527967 -0.60573,0.888131 -0.388813,0.356071 -0.834925,0.474761 Q 12.544339,15 12.049114,15 H 9.2946799 Z M 11.148704,10.3588 v 3.278308 h 0.454298 q 0.581173,0 0.826739,-0.126876 0.245566,-0.130969 0.38472,-0.450205 0.139155,-0.323328 0.139155,-1.043656 0,-0.953615 -0.311051,-1.305593 Q 12.331515,10.3588 11.611187,10.3588 Z"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999994px"
+         d="m 9.2946799,9.0000003 h 2.7544341 q 0.814461,0 1.313779,0.2210095 0.50341,0.2210096 0.830832,0.6343793 0.327421,0.4133699 0.474761,0.9618009 0.14734,0.548431 0.14734,1.162346 0,0.961801 -0.22101,1.493861 -0.216917,0.527967 -0.60573,0.888131 -0.388813,0.356071 -0.834925,0.474761 Q 12.544339,15 12.049114,15 H 9.2946799 Z M 11.148704,10.3588 v 3.278308 h 0.454298 q 0.581173,0 0.826739,-0.126876 0.245566,-0.130969 0.38472,-0.450205 0.139155,-0.323328 0.139155,-1.043656 0,-0.953615 -0.311051,-1.305593 Q 12.331515,10.3588 11.611187,10.3588 Z" />
       <path
          id="path28"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999994px"
-         d="M 15.810368,15 V 9.0000003 h 3.090041 q 0.859481,0 1.313779,0.1473397 0.454297,0.1473397 0.732605,0.5484311 0.278309,0.3969989 0.278309,0.9699859 0,0.499318 -0.212824,0.863575 -0.212824,0.360163 -0.585266,0.585266 -0.237381,0.143247 -0.650751,0.23738 0.331515,0.110505 0.482947,0.22101 0.102319,0.07367 0.294679,0.315143 0.196453,0.241473 0.261938,0.372442 L 21.712141,15 h -2.095498 l -0.99045,-1.833561 Q 18.437926,12.810368 18.290586,12.703956 18.09004,12.564802 17.836289,12.564802 H 17.672578 V 15 Z m 1.86221,-3.568895 h 0.781719 q 0.126876,0 0.491132,-0.08186 0.184175,-0.03683 0.298772,-0.188268 0.118691,-0.151432 0.118691,-0.347885 0,-0.290587 -0.184175,-0.446112 -0.184175,-0.155525 -0.691678,-0.155525 h -0.814461 z"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.38199139px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999994px"
+         d="M 15.810368,15 V 9.0000003 h 3.090041 q 0.859481,0 1.313779,0.1473397 0.454297,0.1473397 0.732605,0.5484311 0.278309,0.3969989 0.278309,0.9699859 0,0.499318 -0.212824,0.863575 -0.212824,0.360163 -0.585266,0.585266 -0.237381,0.143247 -0.650751,0.23738 0.331515,0.110505 0.482947,0.22101 0.102319,0.07367 0.294679,0.315143 0.196453,0.241473 0.261938,0.372442 L 21.712141,15 h -2.095498 l -0.99045,-1.833561 Q 18.437926,12.810368 18.290586,12.703956 18.09004,12.564802 17.836289,12.564802 H 17.672578 V 15 Z m 1.86221,-3.568895 h 0.781719 q 0.126876,0 0.491132,-0.08186 0.184175,-0.03683 0.298772,-0.188268 0.118691,-0.151432 0.118691,-0.347885 0,-0.290587 -0.184175,-0.446112 -0.184175,-0.155525 -0.691678,-0.155525 h -0.814461 z" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/filetype-ps.svg b/rtdata/icons/rawtherapee/scalable/apps/filetype-ps.svg
index f10eabffd..56ecde611 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/filetype-ps.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/filetype-ps.svg
@@ -2,58 +2,16 @@
 <!-- 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="filetype-ps.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,18 +55,16 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.5;fill:#000000;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"
+       style="opacity:0.5;fill:#000000;fill-opacity:1.0;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="rect10009"
        width="22"
        height="8"
        x="1"
        y="8" />
     <rect
-       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect9999"
        width="23"
        height="9"
@@ -117,32 +73,30 @@
        ry="0" />
     <g
        aria-label="PS"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.05277014px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.9"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.05277014px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.9"
        id="text895">
       <path
          d="m 6.591689,9.098945 h 2.9802109 q 0.9736151,0 1.4564641,0.4630606 0.486808,0.4630604 0.486808,1.3179414 0,0.878628 -0.530343,1.373351 -0.526386,0.494723 -1.6108183,0.494723 H 8.3924805 v 2.153034 H 6.591689 Z m 1.8007915,2.473615 h 0.4393139 q 0.5184696,0 0.7282321,-0.178101 0.2097626,-0.182058 0.2097626,-0.46306 0,-0.273087 -0.1820581,-0.463061 -0.182058,-0.189974 -0.6846965,-0.189974 h -0.510554 z"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999982px"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999982px"
          id="path822" />
       <path
          d="m 12.144459,12.98153 1.705804,-0.10686 q 0.05541,0.415568 0.225594,0.633246 0.277045,0.352242 0.791557,0.352242 0.383905,0 0.58971,-0.1781 0.209762,-0.182058 0.209762,-0.419525 0,-0.225594 -0.197889,-0.403694 -0.197889,-0.1781 -0.918206,-0.336411 -1.179419,-0.265172 -1.682058,-0.704486 -0.506596,-0.439314 -0.506596,-1.120053 0,-0.447229 0.257256,-0.8430074 0.261214,-0.3997361 0.779683,-0.6253298 0.522428,-0.2295514 1.42876,-0.2295514 1.112137,0 1.693931,0.4155672 0.585752,0.4116095 0.69657,1.3139844 l -1.689973,0.09894 q -0.06728,-0.39182 -0.284961,-0.569921 -0.21372,-0.1781 -0.593667,-0.1781 -0.312665,0 -0.470976,0.134565 -0.158312,0.130607 -0.158312,0.32058 0,0.138523 0.130607,0.249341 0.126649,0.114775 0.601583,0.21372 1.175462,0.253298 1.682058,0.514512 0.510554,0.257256 0.740105,0.641161 0.23351,0.383905 0.23351,0.858839 0,0.558047 -0.308707,1.029023 -0.308707,0.470977 -0.862797,0.716359 Q 15.682717,15 14.839709,15 13.359498,15 12.789578,14.430079 12.219657,13.860158 12.144459,12.98153 Z"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999982px"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999982px"
          id="path824" />
     </g>
     <g
        id="g19"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.05277014px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.05277014px;line-height:125%;font-family:'Zero &amp; Zero Is';-inkscape-font-specification:'Zero &amp; Zero Is';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        aria-label="PS"
        transform="translate(20)">
       <path
          id="path15"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999982px"
-         d="m 6.591689,9.098945 h 2.9802109 q 0.9736151,0 1.4564641,0.4630606 0.486808,0.4630604 0.486808,1.3179414 0,0.878628 -0.530343,1.373351 -0.526386,0.494723 -1.6108183,0.494723 H 8.3924805 v 2.153034 H 6.591689 Z m 1.8007915,2.473615 h 0.4393139 q 0.5184696,0 0.7282321,-0.178101 0.2097626,-0.182058 0.2097626,-0.46306 0,-0.273087 -0.1820581,-0.463061 -0.182058,-0.189974 -0.6846965,-0.189974 h -0.510554 z"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999982px"
+         d="m 6.591689,9.098945 h 2.9802109 q 0.9736151,0 1.4564641,0.4630606 0.486808,0.4630604 0.486808,1.3179414 0,0.878628 -0.530343,1.373351 -0.526386,0.494723 -1.6108183,0.494723 H 8.3924805 v 2.153034 H 6.591689 Z m 1.8007915,2.473615 h 0.4393139 q 0.5184696,0 0.7282321,-0.178101 0.2097626,-0.182058 0.2097626,-0.46306 0,-0.273087 -0.1820581,-0.463061 -0.182058,-0.189974 -0.6846965,-0.189974 h -0.510554 z" />
       <path
          id="path17"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1;stroke-width:0.99999982px"
-         d="m 12.144459,12.98153 1.705804,-0.10686 q 0.05541,0.415568 0.225594,0.633246 0.277045,0.352242 0.791557,0.352242 0.383905,0 0.58971,-0.1781 0.209762,-0.182058 0.209762,-0.419525 0,-0.225594 -0.197889,-0.403694 -0.197889,-0.1781 -0.918206,-0.336411 -1.179419,-0.265172 -1.682058,-0.704486 -0.506596,-0.439314 -0.506596,-1.120053 0,-0.447229 0.257256,-0.8430074 0.261214,-0.3997361 0.779683,-0.6253298 0.522428,-0.2295514 1.42876,-0.2295514 1.112137,0 1.693931,0.4155672 0.585752,0.4116095 0.69657,1.3139844 l -1.689973,0.09894 q -0.06728,-0.39182 -0.284961,-0.569921 -0.21372,-0.1781 -0.593667,-0.1781 -0.312665,0 -0.470976,0.134565 -0.158312,0.130607 -0.158312,0.32058 0,0.138523 0.130607,0.249341 0.126649,0.114775 0.601583,0.21372 1.175462,0.253298 1.682058,0.514512 0.510554,0.257256 0.740105,0.641161 0.23351,0.383905 0.23351,0.858839 0,0.558047 -0.308707,1.029023 -0.308707,0.470977 -0.862797,0.716359 Q 15.682717,15 14.839709,15 13.359498,15 12.789578,14.430079 12.219657,13.860158 12.144459,12.98153 Z"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.10554028px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#ffffff;fill-opacity:1.0;stroke-width:0.99999982px"
+         d="m 12.144459,12.98153 1.705804,-0.10686 q 0.05541,0.415568 0.225594,0.633246 0.277045,0.352242 0.791557,0.352242 0.383905,0 0.58971,-0.1781 0.209762,-0.182058 0.209762,-0.419525 0,-0.225594 -0.197889,-0.403694 -0.197889,-0.1781 -0.918206,-0.336411 -1.179419,-0.265172 -1.682058,-0.704486 -0.506596,-0.439314 -0.506596,-1.120053 0,-0.447229 0.257256,-0.8430074 0.261214,-0.3997361 0.779683,-0.6253298 0.522428,-0.2295514 1.42876,-0.2295514 1.112137,0 1.693931,0.4155672 0.585752,0.4116095 0.69657,1.3139844 l -1.689973,0.09894 q -0.06728,-0.39182 -0.284961,-0.569921 -0.21372,-0.1781 -0.593667,-0.1781 -0.312665,0 -0.470976,0.134565 -0.158312,0.130607 -0.158312,0.32058 0,0.138523 0.130607,0.249341 0.126649,0.114775 0.601583,0.21372 1.175462,0.253298 1.682058,0.514512 0.510554,0.257256 0.740105,0.641161 0.23351,0.383905 0.23351,0.858839 0,0.558047 -0.308707,1.029023 -0.308707,0.470977 -0.862797,0.716359 Q 15.682717,15 14.839709,15 13.359498,15 12.789578,14.430079 12.219657,13.860158 12.144459,12.98153 Z" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/filter-clear.svg b/rtdata/icons/rawtherapee/scalable/apps/filter-clear.svg
index 27af953db..6ecaae628 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/filter-clear.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/filter-clear.svg
@@ -2,66 +2,16 @@
 <!-- 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="filter-clear.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="14.596738"
-     inkscape:cy="11.454861"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -72,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,17 +55,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
        id="path1994"
-       style="fill:none;fill-rule:evenodd;stroke:#c00000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 22,10 12,20 m 0,-10 10,10"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="fill:none;fill-rule:evenodd;stroke:#c00000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 22,10 12,20 m 0,-10 10,10" />
     <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: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:2.20000005;stroke-linecap:round;stroke-linejoin:round;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"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;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 9.2001368 1 6.6689302 1.2460971 4.7617188 1.6699219 C 3.808113 1.8818343 3.014222 2.1307561 2.3671875 2.4707031 C 2.0436702 2.6406766 1.7503654 2.8309539 1.4921875 3.1113281 C 1.2340096 3.3917023 1 3.8145056 1 4.3007812 C 1 4.787057 1.2642234 5.1828342 1.4921875 5.4882812 C 4.6412607 9.7076951 7.4906518 13.23657 10 17 L 10 17.050781 L 12.050781 15 L 8.5253906 11.474609 L 13.019531 6.9804688 A 8.5 2 0 0 1 11.958984 7 A 8.5 2 0 0 1 3.4589844 5 A 8.5 2 0 0 1 11.958984 3 A 8.5 2 0 0 1 20.458984 5 A 8.5 2 0 0 1 13.894531 6.9453125 L 17 10.050781 L 20.525391 6.5253906 L 21.210938 7.2109375 C 21.645711 6.638829 22.08505 6.0704012 22.507812 5.4882812 C 22.731779 5.1798914 23 4.7870571 23 4.3007812 C 23 3.8145056 22.76599 3.3917023 22.507812 3.1113281 C 22.249636 2.8309539 21.956332 2.6406766 21.632812 2.4707031 C 20.985778 2.1307561 20.191887 1.8818343 19.238281 1.6699219 C 17.33107 1.2460971 14.799863 1 12 1 z M 10 20 L 10 22 C 10.000055 22.552262 10.447738 22.999945 11 23 L 12 23 L 12.5 22.5 L 10 20 z "
        id="path1142" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/filter-original.svg b/rtdata/icons/rawtherapee/scalable/apps/filter-original.svg
index c14a57a99..6c5b68cb6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/filter-original.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/filter-original.svg
@@ -2,57 +2,16 @@
 <!-- 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="filter-original.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,23 +55,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.4;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-opacity:1;paint-order:normal"
+       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 18.0001,18.9999 h -11 L 7,5"
-       id="path1049"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path1049" />
     <path
-       style="opacity:0.2;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-opacity:1;paint-order:normal"
+       style="opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 15.0001,22.014242 h -11 L 4,8"
-       id="path1052"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path1052" />
     <rect
-       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-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect1037"
        width="11"
        height="14"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/filter-original2.svg b/rtdata/icons/rawtherapee/scalable/apps/filter-original2.svg
index ce761302a..cdac8f6cc 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/filter-original2.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/filter-original2.svg
@@ -2,59 +2,16 @@
 <!-- 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="filter-original2.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     showborder="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04394949"
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04394949"
        id="rect14301"
        width="15"
        height="3.0338154"
@@ -114,26 +69,24 @@
        height="3.0338154"
        width="15"
        id="rect14305"
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04394949" />
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04394949" />
     <rect
        y="1"
        x="8"
        height="3.0338154"
        width="15"
        id="rect14313"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04394949" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04394949" />
     <rect
        y="16"
        x="8"
        height="3"
        width="15"
        id="rect42711"
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04394949" />
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04394949" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.44948983;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.44948983;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 1,2 V 19 H 3 V 18 H 6 V 17 H 3 V 13 H 6 V 12 H 3 V 8 H 6 V 7 H 3 V 3 H 6 V 2 H 3 Z m 0,19 v 2 h 2 v -2 z"
-       id="rect1095"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccc" />
+       id="rect1095" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/filter.svg b/rtdata/icons/rawtherapee/scalable/apps/filter.svg
index 684ffc35e..c106ea0d2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/filter.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/filter.svg
@@ -2,67 +2,16 @@
 <!-- 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="filter.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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,18 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2.20000005;stroke-linecap:round;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;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 9.2001368 1 6.6689302 1.2460971 4.7617188 1.6699219 C 3.808113 1.8818343 3.014222 2.1307561 2.3671875 2.4707031 C 2.0436702 2.6406766 1.7503654 2.8309539 1.4921875 3.1113281 C 1.2340096 3.3917023 1 3.8145056 1 4.3007812 C 1 4.787057 1.2642234 5.1828342 1.4921875 5.4882812 C 4.6412607 9.7076951 7.4906518 13.23657 10 17 L 10 22 C 10.000055 22.552262 10.447738 22.999945 11 23 L 12 23 L 14 21 L 14 17 C 16.891005 12.546413 19.832156 9.1725074 22.507812 5.4882812 C 22.731779 5.1798914 23 4.7870571 23 4.3007812 C 23 3.8145056 22.76599 3.3917023 22.507812 3.1113281 C 22.249636 2.8309539 21.956332 2.6406766 21.632812 2.4707031 C 20.985778 2.1307561 20.191887 1.8818343 19.238281 1.6699219 C 17.33107 1.2460971 14.799863 1 12 1 z M 11.958984 3 A 8.5 2 0 0 1 20.458984 5 A 8.5 2 0 0 1 11.958984 7 A 8.5 2 0 0 1 3.4589844 5 A 8.5 2 0 0 1 11.958984 3 z "
        id="path1142" />
     <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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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.9375,22 12,21 V 16 L 9,8 C 9,8 7.0273009,8.016466 4,7 l 7,10 z"
-       id="path816"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path816" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/flip-horizontal.svg b/rtdata/icons/rawtherapee/scalable/apps/flip-horizontal.svg
index 67465657f..53011fcd1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/flip-horizontal.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/flip-horizontal.svg
@@ -2,63 +2,16 @@
 <!-- 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="flip-horizontal.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-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -102,46 +55,34 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0;opacity:0.7"
        d="M 12,1 V 4"
-       id="path828"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path828" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path830"
        d="M 12,6 V 9"
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7" />
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0;opacity:0.7" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0;opacity:0.7"
        d="m 12,11 v 3"
-       id="path832"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path832" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path834"
        d="m 12,20 v 3"
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7" />
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0;opacity:0.7" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 23.000001,10 19.000005,5 15,10 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 19 10 A 7 7 0 0 1 19 10 L 19 10 L 19 10 A 7 7 0 0 1 12 17 A 7 7 0 0 1 5 10 "
        id="path859" />
     <path
-       inkscape:connector-curvature="0"
        id="path854"
        d="M 9,10 5.000004,5 0.999999,10 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/flip-vertical.svg b/rtdata/icons/rawtherapee/scalable/apps/flip-vertical.svg
index 39771286a..a8bb5a435 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/flip-vertical.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/flip-vertical.svg
@@ -2,63 +2,16 @@
 <!-- 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="flip-vertical.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-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -102,47 +55,34 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="M 1,12 H 4"
-       id="path828"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path828" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path830"
        d="M 6,12 H 9"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 11,12 h 3"
-       id="path832"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path832" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path834"
        d="m 20,12 h 3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 10,0.999999 5,4.999995 10,9 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 10,5 v 0 0 a 7,7 0 0 1 7,7 7,7 0 0 1 -7,7"
        id="path859" />
     <path
-       inkscape:connector-curvature="0"
        id="path854"
        d="m 10,15 -5,3.999996 5,4.000005 z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/focusscreen-off.svg b/rtdata/icons/rawtherapee/scalable/apps/focusscreen-off.svg
index 0197b8b5d..88694a939 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/focusscreen-off.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/focusscreen-off.svg
@@ -2,57 +2,16 @@
 <!-- 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="focusscreen-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="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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,24 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <circle
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.3;fill:#252525;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path3951"
        cx="12"
        cy="12"
        r="11" />
     <path
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 16.123093,7.8929154 7.8934905,16.122501 a 5.8228174,5.822817 0 0 0 4.1065215,1.7003 5.8228174,5.822817 0 0 0 5.822804,-5.822787 5.8228174,5.822817 0 0 0 -1.699723,-4.1070986 z"
-       id="path8457"
-       inkscape:connector-curvature="0" />
+       id="path8457" />
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 16.106532,7.8775289 A 5.8228174,5.822817 0 0 0 12.000012,6.1771848 5.8228174,5.822817 0 0 0 6.1772069,12.000014 5.8228174,5.822817 0 0 0 7.8769783,16.107072 Z"
-       id="path8455"
-       inkscape:connector-curvature="0" />
+       id="path8455" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/focusscreen-on.svg b/rtdata/icons/rawtherapee/scalable/apps/focusscreen-on.svg
index b6a6149f7..6d585c82d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/focusscreen-on.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/focusscreen-on.svg
@@ -2,57 +2,16 @@
 <!-- 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="focusscreen-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="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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,9 +55,7 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g1309"
        transform="matrix(0.02454353,0,0,0.02396844,11.697627,11.696399)"
@@ -109,17 +66,15 @@
          cy="12.66669"
          cx="12.319875"
          id="path3951"
-         style="opacity:0.3;fill:#1ce434;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.3;fill:#1ce434;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path8457"
          d="M 180.31081,-158.68724 -154.99558,184.66372 A 237.24452,242.93686 0 0 0 12.320305,255.60291 237.24452,242.93686 0 0 0 249.56435,12.66729 237.24452,242.93686 0 0 0 180.31081,-158.68724 Z"
-         style="opacity:0.8;fill:#1ce434;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.8;fill:#1ce434;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path8455"
          d="M 179.63618,-159.32913 A 237.24452,242.93686 0 0 0 12.320305,-230.27014 237.24452,242.93686 0 0 0 -224.92374,12.66729 a 237.24452,242.93686 0 0 0 69.25536,171.35272 z"
-         style="opacity:0.5;fill:#1ce434;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.5;fill:#1ce434;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home-small.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home-small.svg
index e2988a681..ab30d780c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home-small.svg
@@ -2,61 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="folder-closed-home-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="5.1581509"
-     inkscape:cy="8"
-     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-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -101,31 +56,23 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g1498"
        transform="matrix(0.73681726,0,0,0.66666667,-10.051828,-1.3333333)"
        style="stroke-width:1.42680871">
       <path
-         sodipodi:nodetypes="ssccccccsscccssccc"
-         inkscape:connector-curvature="0"
          id="path1047"
          d="m 16.78125,17 c -0.390243,0 -0.842624,0.02871 -1.263672,0.388672 C 15.09653,17.748633 14.99039,18.30494 15,18.699219 V 22.5 c 0.0011,-0.551499 0.4485,-0.999946 1,-1 h 17 c 0.553025,5.4e-5 1.001,0.446976 1,1 V 20 C 34.0027,19.617925 33.90824,19.257931 33.486328,18.892578 33.064411,18.527225 32.609647,18.5 32.21875,18.5 H 22.591797 L 22.144531,17.6875 C 22.085157,17.579593 22.006361,17.483581 21.912109,17.404297 21.704189,17.229231 21.394112,17 20.878906,17 Z M 34,34 c -5.67e-4,0.275749 -0.112048,0.525975 -0.292969,0.707031 C 33.887992,34.526071 33.999973,34.276131 34,34 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:2.85361719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.85361719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="rect1030"
          d="m 15.999998,21.5 c -0.5515,4.8e-5 -0.998867,0.403651 -1,0.9 v 11.7 c 5.6e-5,0.497036 0.447738,0.899951 1,0.9 h 17 c 0.5515,-4.8e-5 0.998867,-0.403651 1,-0.9 V 22.4 c 0.001,-0.497722 -0.446975,-0.899951 -1,-0.9 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.7;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:2.7568562;stroke-linecap:round;stroke-linejoin:round;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" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.7568562;stroke-linecap:round;stroke-linejoin:round;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" />
     </g>
     <path
-       inkscape:connector-curvature="0"
        id="path892-4"
-       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.52244794pt"
-       d="M 4,21 H 6.9090909 V 17.363636 H 9.0909091 V 21 H 12 v -3.636364 h 1.454545 L 8,14 2.5454545,17.363636 H 4 C 3.99789,18.81946 3.927319,19.546354 4,21 Z"
-       sodipodi:nodetypes="cccccccccccc" />
+       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:4.52244794pt"
+       d="M 4,21 H 6.9090909 V 17.363636 H 9.0909091 V 21 H 12 v -3.636364 h 1.454545 L 8,14 2.5454545,17.363636 H 4 C 3.99789,18.81946 3.927319,19.546354 4,21 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home.svg
index d4bf64e15..3fb5168b3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-home.svg
@@ -2,58 +2,16 @@
 <!-- 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="folder-closed-home.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-to-guides="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <linearGradient
@@ -109,44 +67,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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: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:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 3.78125,3 C 3.3910069,3 2.938626,3.028711 2.5175781,3.3886719 2.0965302,3.7486328 1.9903901,4.3049403 2,4.6992188 V 8 C 2.0011322,7.448501 2.4484999,7.000054 3,7 h 17 c 0.553025,5.43e-5 1.001,0.4469755 1,1 V 6 C 21.002654,5.6179254 20.908245,5.2579307 20.486328,4.8925781 20.064411,4.5272255 19.609647,4.5 19.21875,4.5 H 9.5917969 L 9.1445312,3.6875 C 9.0851567,3.5795928 9.0063608,3.4835811 8.9121094,3.4042969 8.7041886,3.2292307 8.3941119,3 7.8789062,3 Z M 21,20 c -5.67e-4,0.275749 -0.112048,0.525975 -0.292969,0.707031 C 20.887992,20.526071 20.999973,20.276131 21,20 Z"
-       id="path1047"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssccccccsscccssccc" />
+       id="path1047" />
     <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:0.7;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:1.93218362;stroke-linecap:round;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.93218362;stroke-linecap:round;stroke-linejoin:round;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 3,7 C 2.4484999,7.0000504 2.0011322,7.4186009 2,7.9333333 V 20.066667 C 2.0000552,20.582111 2.4477381,20.999949 3,21 h 17 c 0.5515,-5e-5 0.998867,-0.418601 1,-0.933333 V 7.9333333 C 21.001,7.4171771 20.553025,7.0000507 20,7 Z"
-       id="rect1030"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect1030" />
     <path
-       inkscape:connector-curvature="0"
        id="path892-4"
-       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.52244794pt"
-       d="m 6,19 h 4 v -5 h 3 v 5 h 4 v -5 h 2 L 11.5,8 4,14 h 2 c -0.0029,2.001757 -0.099937,3.001237 0,5 z"
-       sodipodi:nodetypes="cccccccccccc" />
+       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:4.52244794pt"
+       d="m 6,19 h 4 v -5 h 3 v 5 h 4 v -5 h 2 L 11.5,8 4,14 h 2 c -0.0029,2.001757 -0.099937,3.001237 0,5 z" />
     <path
        d="m -20,6.174499 c 0.0035,-0.5038176 -0.192068,-0.6745038 -0.780475,-0.6745038 h -10.219474 l -0.73154,-1.3313425 c -0.103908,-0.087489 -0.243318,-0.1686528 -0.390241,-0.1686528 h -4.097503 c -0.580419,0 -0.792676,0.1741842 -0.780481,0.6745242 L -37,20 h 17 c 0,-3.755335 0,-9.217001 0,-13.825501 z"
        id="path824"
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path826"
        d="m -37,7 h 16.978245 l -0.01968,12.977327 h -16.978246 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cccccccccccc"
        d="m -34,19 h 4 v -5 h 3 v 5 h 4 v -5 h 2 l -7.5,-6 -7.5,6 h 2 c -0.0029,2.001757 -0.09994,3.001237 0,5 z"
-       style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.52244794pt"
-       id="path828"
-       inkscape:connector-curvature="0" />
+       style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:4.52244794pt"
+       id="path828" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent-small.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent-small.svg
index e412e386c..b78ce69f0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent-small.svg
@@ -2,61 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="folder-closed-recent-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="5.1581509"
-     inkscape:cy="8"
-     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-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -101,29 +56,22 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g1498"
        transform="matrix(0.73681726,0,0,0.66666667,-10.051828,-1.3333333)"
        style="stroke-width:1.42680871">
       <path
-         sodipodi:nodetypes="ssccccccsscccssccc"
-         inkscape:connector-curvature="0"
          id="path1047"
          d="m 16.78125,17 c -0.390243,0 -0.842624,0.02871 -1.263672,0.388672 C 15.09653,17.748633 14.99039,18.30494 15,18.699219 V 22.5 c 0.0011,-0.551499 0.4485,-0.999946 1,-1 h 17 c 0.553025,5.4e-5 1.001,0.446976 1,1 V 20 C 34.0027,19.617925 33.90824,19.257931 33.486328,18.892578 33.064411,18.527225 32.609647,18.5 32.21875,18.5 H 22.591797 L 22.144531,17.6875 C 22.085157,17.579593 22.006361,17.483581 21.912109,17.404297 21.704189,17.229231 21.394112,17 20.878906,17 Z M 34,34 c -5.67e-4,0.275749 -0.112048,0.525975 -0.292969,0.707031 C 33.887992,34.526071 33.999973,34.276131 34,34 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:2.85361719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.85361719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="rect1030"
          d="m 15.999998,21.5 c -0.5515,4.8e-5 -0.998867,0.403651 -1,0.9 v 11.7 c 5.6e-5,0.497036 0.447738,0.899951 1,0.9 h 17 c 0.5515,-4.8e-5 0.998867,-0.403651 1,-0.9 V 22.4 c 0.001,-0.497722 -0.446975,-0.899951 -1,-0.9 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.7;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:2.7568562;stroke-linecap:round;stroke-linejoin:round;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" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.7568562;stroke-linecap:round;stroke-linejoin:round;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" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;enable-background:new"
+       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:1;enable-background:new"
        d="m 8,13.666283 c -2.2021704,0 -3.9888842,1.77973 -3.9999996,3.979287 H 2.9165703 L 4.6248566,20.353855 6.3538541,17.64557 H 5.3331408 C 5.3444938,16.182572 6.5343396,15 8,15 c 1.4727059,0 2.666284,1.193577 2.666284,2.666283 0,1.472705 -1.1935781,2.666859 -2.666284,2.666859 -0.4866006,0 -0.9410111,-0.147472 -1.3337163,-0.375144 L 6.0000001,21.124281 C 6.5883385,21.464627 7.2714406,21.666283 8,21.666283 c 2.209065,0 3.999425,-1.790947 3.999425,-4 0,-2.209063 -1.79036,-4 -3.999425,-4 z m -0.4792868,2 v 2 0.666859 h 2.1662831 v -0.666859 h -1.499424 v -2 z"
        id="path1068" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent.svg
index 84da8e236..8fab002eb 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-recent.svg
@@ -2,58 +2,16 @@
 <!-- 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="folder-closed-recent.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-to-guides="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <linearGradient
@@ -109,42 +67,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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: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:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 3.78125,3 C 3.3910069,3 2.938626,3.028711 2.5175781,3.3886719 2.0965302,3.7486328 1.9903901,4.3049403 2,4.6992188 V 8 C 2.0011322,7.448501 2.4484999,7.000054 3,7 h 17 c 0.553025,5.43e-5 1.001,0.4469755 1,1 V 7 C 21.002654,6.6179254 20.908245,5.2579307 20.486328,4.8925781 20.064411,4.5272255 19.609647,4.5 19.21875,4.5 H 9.5917969 L 9.1445312,3.6875 C 9.0851567,3.5795928 9.0063608,3.4835811 8.9121094,3.4042969 8.7041886,3.2292307 8.3941119,3 7.8789062,3 Z M 21,20 c -5.67e-4,0.275749 -0.112048,0.525975 -0.292969,0.707031 C 20.887992,20.526071 20.999973,20.276131 21,20 Z"
-       id="path1047"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssccccccsscccssccc" />
+       id="path1047" />
     <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:0.7;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:1.93218362;stroke-linecap:round;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.93218362;stroke-linecap:round;stroke-linejoin:round;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 3,7 C 2.4484999,7.0000504 2.0011322,7.4186009 2,7.9333333 V 20.066667 C 2.0000552,20.582111 2.4477381,20.999949 3,21 h 17 c 0.5515,-5e-5 0.998867,-0.418601 1,-0.933333 V 7.9333333 C 21.001,7.4171771 20.553025,7.0000507 20,7 Z"
-       id="rect1030"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect1030" />
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;enable-background:new"
+       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:1;enable-background:new"
        d="M 12.380769,7 C 8.8022421,7 5.8988322,9.8920611 5.8807697,13.466341 H 4.1201958 l 2.7759652,4.400963 2.8096209,-4.400963 h -1.658659 c 0.018448,-2.377372 1.951948,-4.2990511 4.3336461,-4.2990511 2.393147,0 4.332711,1.9395631 4.332711,4.3327101 0,2.393146 -1.939564,4.333645 -4.332711,4.333645 -0.790726,0 -1.529143,-0.239642 -2.167289,-0.609609 l -1.0827108,1.89521 C 10.086819,19.672309 11.19686,20 12.380769,20 c 3.58973,0 6.499065,-2.910289 6.499065,-6.5 0,-3.5897281 -2.909335,-6.5 -6.499065,-6.5 z m -0.778841,3.25 v 3.25 1.083645 h 3.52021 V 13.5 h -2.436564 v -3.25 z"
        id="path1068" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path822"
        d="m -37,7 h 16.978245 l -0.01968,12.977327 h -16.978246 z"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        d="m -20,6.174499 c 0.0035,-0.5038176 -0.192068,-0.6745038 -0.780475,-0.6745038 h -10.219474 l -0.73154,-1.3313425 c -0.103908,-0.087489 -0.243318,-0.1686528 -0.390241,-0.1686528 h -4.097503 c -0.580419,0 -0.792676,0.1741842 -0.780481,0.6745242 L -37,20 h 17 z"
        id="path824"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
-       sodipodi:nodetypes="cccccccccc"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path826"
        d="m -27.619231,7 c -3.578527,0 -6.481937,2.8920611 -6.499999,6.466341 h -1.760574 l 2.775965,4.400963 2.809621,-4.400963 h -1.658659 c 0.01845,-2.377372 1.951948,-4.2990511 4.333646,-4.2990511 2.393147,0 4.332711,1.9395631 4.332711,4.3327101 0,2.393146 -1.939564,4.333645 -4.332711,4.333645 -0.790726,0 -1.529143,-0.239642 -2.167289,-0.609609 l -1.082711,1.89521 c 0.95605,0.553063 2.066091,0.880754 3.25,0.880754 3.58973,0 6.499065,-2.910289 6.499065,-6.5 0,-3.5897281 -2.909335,-6.5 -6.499065,-6.5 z m -0.778841,3.25 v 3.25 1.083645 h 3.52021 V 13.5 h -2.436564 v -3.25 z"
-       style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;enable-background:new"
-       inkscape:connector-curvature="0" />
+       style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:1;enable-background:new" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-small.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-small.svg
index f86f2157f..b35e607ca 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-closed-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-closed-small.svg
@@ -2,61 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="folder-closed-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -67,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,25 +56,19 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g1498"
        transform="matrix(0.73681726,0,0,0.66666667,-10.051828,-1.3333333)"
        style="stroke-width:1.42680871">
       <path
-         sodipodi:nodetypes="ssccccccsscccssccc"
-         inkscape:connector-curvature="0"
          id="path1047"
          d="m 16.78125,17 c -0.390243,0 -0.842624,0.02871 -1.263672,0.388672 C 15.09653,17.748633 14.99039,18.30494 15,18.699219 V 22.5 c 0.0011,-0.551499 0.4485,-0.999946 1,-1 h 17 c 0.553025,5.4e-5 1.001,0.446976 1,1 V 20 C 34.0027,19.617925 33.90824,19.257931 33.486328,18.892578 33.064411,18.527225 32.609647,18.5 32.21875,18.5 H 22.591797 L 22.144531,17.6875 C 22.085157,17.579593 22.006361,17.483581 21.912109,17.404297 21.704189,17.229231 21.394112,17 20.878906,17 Z M 34,34 c -5.67e-4,0.275749 -0.112048,0.525975 -0.292969,0.707031 C 33.887992,34.526071 33.999973,34.276131 34,34 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:2.85361719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.85361719;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="rect1030"
          d="m 15.999998,21.5 c -0.5515,4.8e-5 -0.998867,0.403651 -1,0.9 v 11.7 c 5.6e-5,0.497036 0.447738,0.899951 1,0.9 h 17 c 0.5515,-4.8e-5 0.998867,-0.403651 1,-0.9 V 22.4 c 0.001,-0.497722 -0.446975,-0.899951 -1,-0.9 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.7;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:2.7568562;stroke-linecap:round;stroke-linejoin:round;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" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.7568562;stroke-linecap:round;stroke-linejoin:round;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" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-closed.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-closed.svg
index 74166166c..14aec7062 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-closed.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-closed.svg
@@ -2,57 +2,16 @@
 <!-- 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="folder-closed.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,25 +55,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g819"
        transform="matrix(1.1578838,0,0,1,-1.3156212,0)"
        style="stroke-width:0.92932481">
       <path
-         sodipodi:nodetypes="ssccccccsscccssccc"
-         inkscape:connector-curvature="0"
          id="path1047"
          d="M 3.78125,3 C 3.3910069,3 2.938626,3.028711 2.5175781,3.3886719 2.0965302,3.7486328 1.9903901,4.3049403 2,4.6992188 V 8 C 2.0011322,7.448501 2.4484999,7.000054 3,7 h 17 c 0.553025,5.43e-5 1.001,0.4469755 1,1 V 6 C 21.002654,5.6179254 20.908245,5.2579307 20.486328,4.8925781 20.064411,4.5272255 19.609647,4.5 19.21875,4.5 H 9.5917969 L 9.1445312,3.6875 C 9.0851567,3.5795928 9.0063608,3.4835811 8.9121094,3.4042969 8.7041886,3.2292307 8.3941119,3 7.8789062,3 Z M 21,20 c -5.67e-4,0.275749 -0.112048,0.525975 -0.292969,0.707031 C 20.887992,20.526071 20.999973,20.276131 21,20 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:1.85864949;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.85864949;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="ccccccccc"
-         inkscape:connector-curvature="0"
          id="rect1030"
          d="m 2.9999983,7 c -0.5515001,5.04e-5 -0.9988678,0.4186009 -1,0.9333333 V 20.066667 c 5.52e-5,0.515444 0.4477381,0.933282 1,0.933333 H 19.999998 c 0.5515,-5e-5 0.998867,-0.418601 1,-0.933333 V 7.9333333 c 10e-4,-0.5161562 -0.446975,-0.9332826 -1,-0.9333333 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.7;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:1.79562616;stroke-linecap:round;stroke-linejoin:round;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" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.79562616;stroke-linecap:round;stroke-linejoin:round;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" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent-small.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent-small.svg
index dc2f2ec3f..b6f98a566 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent-small.svg
@@ -2,65 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="folder-open-recent-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="false"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -105,24 +56,17 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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: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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 2.1551869,10.865535 c -0.2539142,0 -0.5335239,0.01436 -0.8068937,0.246737 C 1.0749235,11.344653 0.9937669,11.730768 1.0003669,12 v 8.665796 c -7.71e-5,0.184354 0.071801,0.360556 0.1986388,0.486945 0.2358369,0.262362 0.5316763,0.528235 0.779403,0.755433 -0.075232,-0.06989 -0.2764296,-0.251173 -0.2327534,-0.542255 L 3.9562064,14.03469 c 0.06099,-0.227618 0.4081229,-0.49629 0.6794519,-0.499607 h 8.3533687 v -0.552054 l -0.0013,0.0052 c 0.0019,-0.260482 -0.07134,-0.638679 -0.34543,-0.874673 -0.274086,-0.235986 -0.55488,-0.241279 -0.809361,-0.249341 H 6.0156908 L 5.7084792,11.308094 C 5.6688895,11.236347 5.617007,11.173038 5.5554899,11.12141 5.4193132,11.007402 5.2186877,10.865535 4.9015856,10.865535 Z"
-       id="path1026"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccccccccccscccss" />
+       id="path1026" />
     <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:0.9;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:1.85215795;stroke-linecap:round;stroke-linejoin:round;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"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.85215795;stroke-linecap:round;stroke-linejoin:round;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 4.6379836,13.535083 C 4.3315612,13.534549 4.0441308,13.745178 3.9562064,14.03469 l -2.192402,7.253784 c -0.1118229,0.371072 0.1455507,0.71133 0.5382026,0.711527 h 10.725267 c 0.306025,-4.1e-5 0.592752,-0.210536 0.680543,-0.499609 l 2.193636,-7.253782 c 0.111966,-0.371546 -0.146196,-0.712067 -0.539437,-0.711527 z"
-       id="rect1030-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect1030-7" />
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;enable-background:new"
+       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:1;enable-background:new"
        d="m 10.3309,14 c -2.2021699,0 -4.5173112,1.693125 -5.1815065,3.785648 h -1.08343 L 4.9701212,20.362143 7.503247,17.785648 H 6.482534 c 0.445735,-1.391806 1.9867065,-2.516831 3.4523666,-2.516831 1.4727054,0 2.3118934,1.135494 1.8746264,2.536536 -0.437267,1.401041 -1.9854061,2.537085 -3.4581124,2.537085 -0.486601,0 -0.8972246,-0.140296 -1.2223305,-0.356888 L 6.116514,21.09508 c 0.4872854,0.323783 1.110513,0.515627 1.839072,0.515627 2.209065,0 4.531183,-1.703797 5.187082,-3.805354 C 13.79857,15.703787 12.539965,14 10.3309,14 Z m -1.0731153,1.902677 -0.5938286,1.902676 -0.198,0.634409 h 2.1662829 l 0.198,-0.634409 H 9.3308151 l 0.5938286,-1.902676 z"
        id="path1068" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent.svg
index c0baf0ccf..6c787a733 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-open-recent.svg
@@ -2,61 +2,16 @@
 <!-- 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="folder-open-recent.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.029197"
-     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="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -100,53 +55,37 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path818"
        d="m 58.897478,6.1910093 c 0.0037,-0.5023898 -0.203811,-0.6725922 -0.828193,-0.6725922 h -9.78321 L 47.509809,4.1908478 C 47.399548,4.1036067 47.251614,4.022673 47.095708,4.022673 h -4.348025 c -0.615906,0 -0.841141,0.1736905 -0.8282,0.6726125 l 1.9e-5,14.2848655 1.060817,0.997176 L 58.897519,20 Z" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path820"
        d="M 45.1026,8.0113383 H 62.080845 L 59.958564,19.977327 H 42.980319 Z"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path822"
        d="m 55,7.9999999 c -3.578527,0 -7.371802,2.6695951 -8.489642,5.9689301 h -1.760574 l 1.421822,4.062427 4.163764,-4.062427 h -1.658659 c 0.749949,-2.194497 3.274733,-3.968355 5.656431,-3.968355 2.393147,0 3.735922,1.790366 2.999569,3.999425 -0.736353,2.209058 -3.272993,4.000288 -5.66614,4.000288 -0.790726,0 -1.455407,-0.221208 -1.979717,-0.562716 l -1.665853,1.749424 C 48.806878,19.697516 49.816091,20 51,20 54.58973,20 58.394539,17.313579 59.499065,14 60.603597,10.686405 58.58973,7.9999999 55,7.9999999 Z M 53.221159,11 l -1,3 -0.333429,1.000288 h 3.52021 L 55.741369,14 h -2.436564 l 1,-3 z"
-       style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;enable-background:new"
-       inkscape:connector-curvature="0" />
+       style="display:inline;opacity:0.7;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:1;enable-background:new" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1049"
        d="m -28,6.0000007 h 16 l -2,11.9999983 h -16 z"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;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: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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 2.7480469,3.0234375 c -0.4019557,0 -0.8445887,0.021476 -1.2773438,0.3691406 -0.432755,0.3476647 -0.56122861,0.9253282 -0.55078122,1.328125 V 18.980469 c -1.2225e-4,0.27581 0.11366392,0.539426 0.31445312,0.728515 0.3592033,0.399022 0.725239,0.72763 1.1072755,1.069587 C 2.18484,20.637959 1.9222112,20.388715 1.9960938,19.969861 L 4.1171875,9.8242187 C 4.202512,9.3466019 4.618338,8.9991196 5.1035156,9 H 19.898438 V 6.1914062 l -0.002,0.00781 C 19.899411,5.809511 19.783498,5.2436933 19.349609,4.890625 18.915721,4.5375567 18.471415,4.5175781 18.068359,4.5175781 H 8.859375 L 8.3730469,3.6855469 C 8.3103752,3.5782068 8.2282432,3.48349 8.1308594,3.40625 7.9152862,3.2356833 7.5976883,3.0234375 7.0957031,3.0234375 Z"
-       id="path1026"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccccccccccscccss" />
+       id="path1026" />
     <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#cccccc;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path1047"
        d="m -15.999949,4.174499 c 0.0035,-0.5038176 -0.192068,-0.6745038 -0.780475,-0.6745038 h -9.219525 l -0.73154,-1.3313425 c -0.103908,-0.087489 -0.243318,-0.1686528 -0.390241,-0.1686528 h -4.097503 c -0.580419,0 -0.792676,0.1741842 -0.780481,0.6745242 l 1.8e-5,14.3254659 h 15.999786 z" />
     <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:0.9;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:1.85215795;stroke-linecap:round;stroke-linejoin:round;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"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.85215795;stroke-linecap:round;stroke-linejoin:round;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 5.1035156,9.0000014 C 4.618338,8.9992463 4.202512,9.2972549 4.1171875,9.7068697 L 1.9960938,19.969861 c -0.1079822,0.525011 0.3627547,1.006424 0.984375,1.006701 H 19.958984 c 0.484441,-5.8e-5 0.899179,-0.297876 0.984375,-0.706868 L 23.066406,10.006703 C 23.174527,9.4810223 22.702491,8.9992366 22.080078,9.0000014 Z"
-       id="rect1030"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect1030" />
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.92607898;enable-background:new"
+       style="display:inline;opacity:0.5;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:0.92607898;enable-background:new"
        d="m 15,9.8475733 c -3.578527,0 -7.371802,2.2895037 -8.4896424,5.1190877 H 4.7497836 L 6.1716063,18.450689 10.33537,14.966661 H 8.6767106 c 0.749949,-1.88205 3.2747334,-3.40335 5.6564314,-3.40335 2.393147,0 3.735922,1.535458 2.999569,3.429996 -0.736353,1.894537 -3.272993,3.430736 -5.66614,3.430736 -0.790726,0 -1.455407,-0.189713 -1.9797173,-0.482598 L 8.0210013,19.44179 C 8.806878,19.879624 9.816091,20.139041 11,20.139041 c 3.58973,0 7.394539,-2.303935 8.499065,-5.145734 C 20.603597,12.151494 18.58973,9.8475733 15,9.8475733 Z m -1.778841,2.5728667 -1,2.572867 -0.333429,0.857869 h 3.52021 l 0.333429,-0.857869 h -2.436564 l 1,-2.572867 z"
        id="path1068" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-open-small.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-open-small.svg
index f25394737..cd46e4db6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-open-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-open-small.svg
@@ -2,65 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="folder-open-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8.0194647"
-     inkscape:cy="8"
-     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="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="false"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -105,20 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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: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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 2.1551869,10.865535 c -0.2539142,0 -0.5335239,0.01436 -0.8068937,0.246737 C 1.0749235,11.344653 0.9937669,11.730768 1.0003669,12 v 8.665796 c -7.71e-5,0.184354 0.071801,0.360556 0.1986388,0.486945 0.2358369,0.262362 0.5316763,0.528235 0.779403,0.755433 -0.075232,-0.06989 -0.2764296,-0.251173 -0.2327534,-0.542255 L 3.9562064,14.03469 c 0.06099,-0.227618 0.4081229,-0.49629 0.6794519,-0.499607 h 8.3533687 v -0.552054 l -0.0013,0.0052 c 0.0019,-0.260482 -0.07134,-0.638679 -0.34543,-0.874673 -0.274086,-0.235986 -0.55488,-0.241279 -0.809361,-0.249341 H 6.0156908 L 5.7084792,11.308094 C 5.6688895,11.236347 5.617007,11.173038 5.5554899,11.12141 5.4193132,11.007402 5.2186877,10.865535 4.9015856,10.865535 Z"
-       id="path1026"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccccccccccscccss" />
+       id="path1026" />
     <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:0.9;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:1.85215795;stroke-linecap:round;stroke-linejoin:round;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"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.85215795;stroke-linecap:round;stroke-linejoin:round;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 4.6379836,13.535083 C 4.3315612,13.534549 4.0441308,13.745178 3.9562064,14.03469 l -2.192402,7.253784 c -0.1118229,0.371072 0.1455507,0.71133 0.5382026,0.711527 h 10.725267 c 0.306025,-4.1e-5 0.592752,-0.210536 0.680543,-0.499609 l 2.193636,-7.253782 c 0.111966,-0.371546 -0.146196,-0.712067 -0.539437,-0.711527 z"
-       id="rect1030-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect1030-7" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/folder-open.svg b/rtdata/icons/rawtherapee/scalable/apps/folder-open.svg
index 324a4bb9e..21545f938 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/folder-open.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/folder-open.svg
@@ -2,61 +2,16 @@
 <!-- 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="folder-open.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="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -100,20 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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: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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 2.7480469,3.0234375 c -0.4019557,0 -0.8445887,0.021476 -1.2773438,0.3691406 -0.432755,0.3476647 -0.56122861,0.9253282 -0.55078122,1.328125 V 18.980469 c -1.2225e-4,0.27581 0.11366392,0.539426 0.31445312,0.728515 0.373339,0.392518 0.7016007,0.719842 1.093762,1.059752 C 2.2090424,20.664169 1.9269525,20.405348 1.9960938,19.969861 L 4.1171875,9.8242187 C 4.202512,9.3466019 4.618338,8.9991196 5.1035156,9 H 19.898438 V 6.1914062 l -0.002,0.00781 C 19.899411,5.809511 19.783498,5.2436933 19.349609,4.890625 18.915721,4.5375567 18.471415,4.5175781 18.068359,4.5175781 H 8.859375 L 8.3730469,3.6855469 C 8.3103752,3.5782068 8.2282432,3.48349 8.1308594,3.40625 7.9152862,3.2356833 7.5976883,3.0234375 7.0957031,3.0234375 Z"
-       id="path1026"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscccccccccccscccss" />
+       id="path1026" />
     <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:0.9;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:1.85215795;stroke-linecap:round;stroke-linejoin:round;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"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.85215795;stroke-linecap:round;stroke-linejoin:round;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 5.1035156,9.0000014 C 4.618338,8.9992464 4.202512,9.2972549 4.1171875,9.7068697 L 1.9960938,19.969861 c -0.1079822,0.52501 0.3627547,1.006424 0.984375,1.006701 H 19.958984 c 0.484441,-5.7e-5 0.899179,-0.297876 0.984375,-0.706868 L 23.066406,10.006703 C 23.174527,9.4810223 22.702491,8.9992366 22.080078,9.0000014 Z"
-       id="rect1030"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       id="rect1030" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/fullscreen-enter.svg b/rtdata/icons/rawtherapee/scalable/apps/fullscreen-enter.svg
index 33e8bf568..7f0d34909 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/fullscreen-enter.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/fullscreen-enter.svg
@@ -2,60 +2,16 @@
 <!-- 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="fullscreen-enter.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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -99,31 +55,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 15.508539,5.678052 12.000003,1 8.4914612,5.678052 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
        id="path3605"
        d="M 8.4914611,18.321948 11.999997,23 15.508539,18.321948 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 18.321948,15.508539 23,12.000003 18.321948,8.491461 Z"
-       id="path3607"
-       inkscape:connector-curvature="0" />
+       id="path3607" />
     <path
-       inkscape:connector-curvature="0"
        id="path3609"
        d="M 5.678052,8.491461 1,11.999997 5.678052,15.508539 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <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:0.7;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:2;stroke-linecap:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;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 8.1523438 7 C 7.5310292 7 7 7.5310292 7 8.1523438 L 7 15.847656 C 7 16.468973 7.5310276 17 8.1523438 17 L 15.847656 17 C 16.468974 17 17 16.468974 17 15.847656 L 17 8.1523438 C 17 7.5310276 16.468973 7 15.847656 7 L 8.1523438 7 z M 12.5 8 A 0.5 0.5 0 0 1 13 8.5 A 0.5 0.5 0 0 1 12.5 9 A 0.5 0.5 0 0 1 12 8.5 A 0.5 0.5 0 0 1 12.5 8 z M 14 8 A 0.5 0.5 0 0 1 14.5 8.5 A 0.5 0.5 0 0 1 14 9 A 0.5 0.5 0 0 1 13.5 8.5 A 0.5 0.5 0 0 1 14 8 z M 15.5 8 A 0.5 0.5 0 0 1 16 8.5 A 0.5 0.5 0 0 1 15.5 9 A 0.5 0.5 0 0 1 15 8.5 A 0.5 0.5 0 0 1 15.5 8 z M 9 10 L 15 10 L 15 15 L 9 15 L 9 10 z "
        id="rect3613" />
     <rect
@@ -134,6 +84,6 @@
        height="8"
        width="8"
        id="rect3655"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/fullscreen-leave.svg b/rtdata/icons/rawtherapee/scalable/apps/fullscreen-leave.svg
index 3eee818a9..e5f4fef5d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/fullscreen-leave.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/fullscreen-leave.svg
@@ -2,60 +2,16 @@
 <!-- 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="fullscreen-leave.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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -99,31 +55,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 8.4914612,1 11.999997,5.678052 15.508539,1 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
        id="path3605"
        d="M 15.508539,23 12.000003,18.321948 8.4914611,23 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 23,8.491461 18.321948,11.999997 23,15.508539 Z"
-       id="path3607"
-       inkscape:connector-curvature="0" />
+       id="path3607" />
     <path
-       inkscape:connector-curvature="0"
        id="path3609"
        d="M 1,15.508539 5.678052,12.000003 1,8.491461 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <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:0.7;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:2;stroke-linecap:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;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 8.1523438 7 C 7.5310292 7 7 7.5310292 7 8.1523438 L 7 15.847656 C 7 16.468973 7.5310276 17 8.1523438 17 L 15.847656 17 C 16.468974 17 17 16.468974 17 15.847656 L 17 8.1523438 C 17 7.5310276 16.468973 7 15.847656 7 L 8.1523438 7 z M 12.5 8 A 0.5 0.5 0 0 1 13 8.5 A 0.5 0.5 0 0 1 12.5 9 A 0.5 0.5 0 0 1 12 8.5 A 0.5 0.5 0 0 1 12.5 8 z M 14 8 A 0.5 0.5 0 0 1 14.5 8.5 A 0.5 0.5 0 0 1 14 9 A 0.5 0.5 0 0 1 13.5 8.5 A 0.5 0.5 0 0 1 14 8 z M 15.5 8 A 0.5 0.5 0 0 1 16 8.5 A 0.5 0.5 0 0 1 15.5 9 A 0.5 0.5 0 0 1 15 8.5 A 0.5 0.5 0 0 1 15.5 8 z M 9 10 L 15 10 L 15 15 L 9 15 L 9 10 z "
        id="rect3613" />
     <rect
@@ -134,6 +84,6 @@
        height="8"
        width="8"
        id="rect3655"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gamut-hist.svg b/rtdata/icons/rawtherapee/scalable/apps/gamut-hist.svg
index 289dbf396..ae9fbbc6c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gamut-hist.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gamut-hist.svg
@@ -2,57 +2,16 @@
 <!-- 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="gamut-hist.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="12.70936"
-     inkscape:cy="11.73399"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,19 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02779599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.02779599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 8.67822,1 6.0435,18.6 20.80011,12.973588 Z m 3.32277,5.088435 6.94375,5.478121 -10.35617,5.536751 z"
-       id="path17368"
-       inkscape:connector-curvature="0" />
+       id="path17368" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1,1 V 23 H 23 V 21 H 3 V 1 Z"
-       id="rect18347"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect18347" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gamut-plus.svg b/rtdata/icons/rawtherapee/scalable/apps/gamut-plus.svg
index c27796b70..cf3a74db3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gamut-plus.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gamut-plus.svg
@@ -2,57 +2,16 @@
 <!-- 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="gamut-plus.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,16 +55,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02779599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.02779599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 4.2934,1 1,23 19.445762,15.966985 Z M 8.4468625,7.3605437 17.12655,14.208195 4.1813375,21.129134 Z"
-       id="path17368"
-       inkscape:connector-curvature="0" />
+       id="path17368" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2.37170815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2.37170815;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 17 1 L 17 4 L 14 4 L 14 7 L 17 7 L 17 10 L 20 10 L 20 7 L 23 7 L 23 4 L 20 4 L 20 1 L 17 1 z "
        id="rect832" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gamut-softproof.svg b/rtdata/icons/rawtherapee/scalable/apps/gamut-softproof.svg
index ca37ca2a0..5898265a3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gamut-softproof.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gamut-softproof.svg
@@ -2,57 +2,16 @@
 <!-- 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="gamut-softproof.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,15 +55,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       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.7;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:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 3.5,1 1,5 h 2 c -0.00144,5.361979 9.376e-4,10.638021 0,16 h 16 v 2 L 23,20.5 19,18 v 2 H 4 V 5 h 2 z"
-       id="path4674"
-       sodipodi:nodetypes="ccccccccccccc" />
+       id="path4674" />
     <g
        id="g1387"
        transform="matrix(1.0000384,0,0,1.0000384,0.95455129,-1.0828185)"
@@ -112,13 +67,11 @@
       <path
          id="path4370"
          d="M 8.659396,2.0953019 C 8.489915,2.0726249 8.342294,2.0801839 8.222029,2.1217589 7.259905,2.4588927 6.565496,4.873293 7.313812,10.491938 c 0.748316,5.618721 2.458957,8.140686 3.046921,8.590148 l 0.63617,-0.292536 C 10.517638,18.093513 9.779703,16.267812 9.322771,12.836946 8.778614,8.751239 9.282321,6.993154 9.981961,6.747938 10.68159,6.502647 12.648308,7.90489 13.947562,9.194124 l 5.677401,5.638034 2.373083,-1.088882 -8.324623,-8.258002 C 12.110046,3.9339664 9.845775,2.2627727 8.659396,2.0954153 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02833264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.02833264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path8955"
          d="m 10.300057,6.730855 c -0.123227,-0.0189 -0.230623,-0.01134 -0.318092,0.0189 -0.699642,0.245291 -1.20335,2.003263 -0.659191,6.089007 0.456928,3.430866 1.194865,5.256529 1.674129,5.952567 l 8.62806,-3.959244 -5.6774,-5.638072 C 12.810715,8.065975 11.162749,6.851953 10.300048,6.730252 Z"
-         style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02833264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.02833264px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gamut-warning.svg b/rtdata/icons/rawtherapee/scalable/apps/gamut-warning.svg
index 9924857c3..a4d3bac09 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gamut-warning.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gamut-warning.svg
@@ -2,58 +2,16 @@
 <!-- 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="gamut-warning.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.916667"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,27 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0483054px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.0483054px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 4.2089844 1.0078125 C 3.767679 0.97424093 3.3189036 1.037588 2.8691406 1.234375 C 1.4391609 2.1584732 1.1147229 4.031753 1.0039062 5.6113281 C 0.93787895 11.42066 1.5537794 17.256802 2.9277344 22.90625 C 2.9363344 22.93695 2.9464581 22.96922 2.9550781 23 L 3.9375 23 C 2.9877271 18.690012 2.5553538 14.262765 2.6054688 9.8535156 C 2.6970151 8.5486023 2.9651537 7.0016947 4.1464844 6.2382812 C 5.6327149 5.5880048 7.0999019 6.7202361 8.2480469 7.5546875 C 9.0027908 8.247407 9.7525627 8.9793864 10.498047 9.7265625 C 10.381733 9.2101094 10.24903 8.5877342 10.148438 8.1757812 A 1.7223988 1.7223988 0 0 1 10.148438 8.1699219 C 9.9561858 7.3705634 9.7793004 6.5899652 9.6171875 5.8300781 A 1.7223988 1.7223988 0 0 1 9.6152344 5.8261719 C 9.4668145 5.1211763 9.3827157 4.5644814 9.359375 4.0234375 C 8.8550749 3.6203203 8.3505668 3.2174596 7.8339844 2.828125 C 6.7916281 2.0705587 5.5329023 1.1085274 4.2089844 1.0078125 z M 17.136719 11.011719 C 17.112058 11.128262 17.095519 11.190115 17.070312 11.310547 A 1.7223988 1.7223988 0 0 0 17.070312 11.3125 C 16.81075 12.543019 16.531322 14.092716 16.236328 15.951172 A 1.7223988 1.7223988 0 0 1 16.224609 16.009766 C 16.485002 16.318485 16.748989 16.625354 17.005859 16.935547 C 17.055739 16.976701 17.113663 17.007345 17.160156 17.052734 C 17.469723 17.348586 17.717926 17.702191 17.933594 18.076172 C 19.275364 19.73097 20.568296 21.388549 21.779297 23 L 23 23 L 23 16.8125 C 21.048946 14.875256 19.105453 12.929301 17.136719 11.011719 z "
        id="path17362-9" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30.52574539px;line-height:1.25;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.95392954;opacity:0.7;"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30.5257px;line-height:1.25;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.95393"
        x="8.215003"
        y="22.567751"
        id="text8360"><tspan
-         sodipodi:role="line"
          id="tspan8358"
          x="8.215003"
          y="22.567751"
-         style="stroke-width:0.95392954;fill:#2a7fff;fill-opacity:1;">!</tspan></text>
+         style="fill:#cccccc;fill-opacity:1;stroke-width:0.95393">!</tspan></text>
     <g
        aria-label="!"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30.52574539px;line-height:1.25;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.95392954"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:30.52574539px;line-height:1.25;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.95392954"
        id="text8364" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gamut_srgb_prophoto_xy.svg b/rtdata/icons/rawtherapee/scalable/apps/gamut_srgb_prophoto_xy.svg
index 951b6611d..9297e0b0d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gamut_srgb_prophoto_xy.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gamut_srgb_prophoto_xy.svg
@@ -2,57 +2,16 @@
 <!-- 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="gamut_srgb_prophoto_xy.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="11.97037"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,28 +55,23 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        transform="matrix(1.1034771,0,0,1.1034771,1287.5938,-472.77494)"
        id="g18188"
        style="stroke-width:0.90622628">
       <path
-         inkscape:connector-curvature="0"
          id="path17362"
          d="m -1147.2495,442.9438 c -4.487,2.05699 -8.9739,4.11398 -13.4609,6.17097 -1.6645,-1.234 -2.2083,-3.36289 -2.7405,-5.2582 -0.8927,-3.67059 -1.2927,-7.46303 -1.2498,-11.2375 0.072,-1.02629 0.2819,-2.2431 1.211,-2.84351 1.1689,-0.51143 2.3235,0.379 3.2265,1.03528 4.7512,3.58083 8.6565,8.1118 13.0137,12.13296 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.03138535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.03138535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path17368"
          d="m -1163.9993,449.28431 2.9837,-19.93699 13.7322,13.56257 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.03138535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.03138535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path17370"
          d="m -1161.1173,447.58899 3.8654,-12.47758 7.8663,6.20488 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.03138535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.03138535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gears-pause.svg b/rtdata/icons/rawtherapee/scalable/apps/gears-pause.svg
index b472a82f4..abcec7081 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gears-pause.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gears-pause.svg
@@ -2,58 +2,16 @@
 <!-- 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"
-   sodipodi:docname="gears-pause.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="SVGRoot"
-     inkscape:document-units="px"
-     inkscape:cy="12"
-     inkscape:cx="7.684729"
-     inkscape:zoom="33.833333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,40 +55,33 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1" />
+     id="layer1" />
   <path
-     style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;stroke-opacity:1;marker:none;enable-background:accumulate"
+     style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;stroke-opacity:1;marker:none;enable-background:accumulate"
      d="m 15.28125,11.585938 c -0.420283,-0.01807 -0.866528,0.03754 -1.191406,0.332031 -0.385806,0.307933 -0.53553,0.810442 -0.503906,1.287832 0,2.080488 0,4.160977 0,6.241465 0.102577,-0.200596 0.249455,-0.165071 0.41004,-0.07464 0.286967,0.110888 0.566209,0.244667 0.858801,0.338927 0.297845,0.06799 0.579913,-0.152087 0.653585,-0.43399 0.254396,-0.626535 0.515819,-1.250402 0.765807,-1.87861 0.100794,-0.31208 -0.134502,-0.625447 -0.434143,-0.702147 -0.29303,-0.11964 -0.58606,-0.239279 -0.87909,-0.358919 0.06998,-0.542695 0.06728,-1.094713 -0.0078,-1.636719 0.362301,-0.158342 0.735372,-0.294767 1.090148,-0.468437 0.259217,-0.1578 0.300501,-0.509422 0.154521,-0.75754 -0.260561,-0.615386 -0.511288,-1.236089 -0.777991,-1.848153 -0.03962,-0.03299 -0.100658,-0.0019 -0.138553,-0.0411 z"
-     id="path6600"
-     inkscape:connector-curvature="0" />
+     id="path6600" />
   <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: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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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"
+     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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 z"
-     id="rect1457"
-     inkscape:connector-curvature="0" />
+     id="rect1457" />
   <g
      id="g1559"
      transform="matrix(-0.27213072,0.64421424,-0.64421424,-0.27213072,30.113695,5.2275323)">
     <path
-       style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668474;marker:none;enable-background:accumulate"
+       style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668474;marker:none;enable-background:accumulate"
        d="m 14.704732,11.373437 c 0.07167,0.195021 0.336706,0.291106 0.271194,0.534143 0.04144,0.342146 0.203187,0.647028 0.330373,0.961711 0.20134,0.476633 0.402681,0.953266 0.604022,1.4299 0.22476,-0.07542 0.393884,-0.3028 0.37278,-0.543708 -0.01237,-0.149771 -0.09355,-0.280657 -0.144724,-0.419185 -0.241778,-0.576014 -0.479625,-1.153789 -0.723876,-1.728697 -0.115196,-0.238528 -0.421387,-0.34832 -0.665408,-0.252068 -0.01503,0.0054 -0.02966,0.01169 -0.04436,0.0179 z"
-       id="path6613"
-       inkscape:connector-curvature="0" />
+       id="path6613" />
     <path
-       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668474;marker:none;enable-background:accumulate"
+       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668474;marker:none;enable-background:accumulate"
        d="m 2.2517199,19.444346 c 0.2138899,0.504102 0.776267,0.277663 1.1375066,0.09815 0.3133005,-0.126136 0.6565969,-0.395396 0.8210932,0.07944 0.1742304,0.430756 1.0867407,0.618735 0.7879892,1.114282 -0.1245398,0.420076 -0.5404481,0.898419 -0.18025,1.309703 0.5802626,0.339708 1.2445523,0.531962 1.8598007,0.810158 0.37805,0.255143 0.9383763,0.134578 1.0319647,-0.359196 0.1135535,-0.276709 0.2271069,-0.553417 0.3406603,-0.830125 0.531212,0.169696 1.2839294,-0.124098 1.6843299,0.10531 0.2136982,0.392838 0.258249,0.924157 0.6582345,1.174861 0.435838,0.119948 0.822564,-0.22054 1.227672,-0.342138 0.428825,-0.202536 0.902397,-0.328121 1.296966,-0.589966 0.354859,-0.422253 -0.08034,-0.903287 -0.207519,-1.329961 -0.283599,-0.47971 0.627997,-0.665914 0.787119,-1.09033 0.169873,-0.480548 0.524173,-0.207142 0.847552,-0.07989 0.356619,0.185604 0.914909,0.367898 1.11689,-0.126584 0.271869,-0.681739 0.571686,-1.35367 0.825721,-2.041667 0.08753,-0.576671 -0.570729,-0.678627 -0.963311,-0.861016 -0.598965,-0.05229 -0.234195,-0.670639 -0.314581,-1.073813 -0.07488,-0.447584 -0.119465,-0.837061 0.410528,-0.906807 0.202479,-0.117059 0.650709,-0.133943 0.391558,-0.439189 -0.275606,-0.720092 -0.662618,-1.404538 -0.835671,-2.157901 0.01399,-0.57059 -0.458776,-0.557988 -0.817075,-0.305401 -0.446681,0.367976 -0.662187,-0.124012 -0.966177,-0.432543 -0.310228,-0.30569 -0.812248,-0.518715 -0.44517,-0.971535 0.14751,-0.3845759 0.488775,-0.9049718 0.03418,-1.221718 C 12.077079,8.6673031 11.361826,8.3741655 10.643424,8.0983151 10.031975,8.0243102 9.9547395,8.7290868 9.7492142,9.1401919 9.648876,9.7151203 8.9036165,9.2154372 8.5037964,9.384647 8.0365182,9.5815811 7.8827482,9.2795985 7.7690266,8.8886574 7.6276057,8.5400187 7.4754431,8.0132376 6.9874355,8.1124094 6.2679243,8.3931872 5.5517917,8.6920501 4.8464439,9.006723 4.3814779,9.3505194 4.780443,9.8839403 4.9244755,10.287755 5.3094713,10.747779 4.6316871,10.928792 4.3943549,11.265798 4.1257188,11.632111 3.8820337,11.949778 3.454756,11.62138 3.0833084,11.472816 2.5751019,11.163712 2.2735907,11.60496 c -0.3093723,0.705105 -0.6048933,1.420104 -0.8799478,2.139257 -0.087563,0.575372 0.5708737,0.676157 0.9618087,0.859705 0.5986151,0.05361 0.2374061,0.670081 0.3176465,1.074593 0.076166,0.447455 0.1203641,0.836586 -0.4094419,0.906409 -0.3646902,0.161194 -0.9515626,0.290353 -0.8568574,0.815719 0.2612116,0.688354 0.5664655,1.361534 0.8449211,2.043703 z m 2.658738,-2.253972 c -0.8292148,-1.86105 -0.075687,-4.242354 1.688149,-5.27273 1.7426556,-1.12949 4.2637461,-0.709782 5.5404811,0.927253 1.301444,1.537411 1.285172,3.997821 -0.0741,5.494823 -1.317926,1.565826 -3.8023878,1.945331 -5.5120328,0.806785 C 5.822001,18.682839 5.2437599,17.988454 4.9104579,17.190374 Z"
-       id="path1555"
-       inkscape:connector-curvature="0" />
+       id="path1555" />
     <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: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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 z"
-       id="path1557"
-       inkscape:connector-curvature="0" />
+       id="path1557" />
   </g>
   <rect
-     style="opacity:1;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     style="opacity:1;fill:#c00000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="rect862"
      width="3.0000002"
      height="9"
@@ -138,7 +89,7 @@
      y="13"
      ry="0" />
   <rect
-     style="opacity:1;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     style="opacity:1;fill:#c00000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="rect864"
      width="2.9999993"
      height="9"
@@ -146,8 +97,7 @@
      y="13"
      ry="0" />
   <path
-     style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;stroke-opacity:1;marker:none;enable-background:accumulate"
+     style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;stroke-opacity:1;marker:none;enable-background:accumulate"
      d="M 10.537109,8.0898438 C 9.9753867,8.1439145 9.9456577,8.7887784 9.7291027,9.1895835 9.58057,9.7066283 8.8088724,9.1993255 8.4020042,9.3907985 7.9553737,9.6060466 7.8950538,9.1817921 7.7616158,8.8697111 7.6251257,8.5239219 7.465902,8.0156446 6.9875764,8.1113119 6.2674191,8.3916605 5.5513088,8.69218 4.8455417,9.0071572 4.3865631,9.3428313 4.7696391,9.8690101 4.9143026,10.265537 5.2816385,10.70069 4.7394715,10.893352 4.4656824,11.193696 4.1607681,11.489814 3.9558566,12.006815 3.5088202,11.644677 3.1190514,11.498393 2.5956693,11.147173 2.272384,11.604646 c -0.3088639,0.704903 -0.6030918,1.42006 -0.877522,2.13907 -0.089678,0.565901 0.5521904,0.673807 0.9390079,0.851489 0.5702305,0.04731 0.309196,0.577396 0.3373357,0.981008 -5.32e-5,0.423352 0.2141441,0.926137 -0.3542464,0.985842 -0.3754259,0.175374 -1.0007906,0.28699 -0.9092286,0.837579 0.2816142,0.719617 0.5810178,1.43589 0.8962192,2.141448 0.3354208,0.457122 0.8606675,0.07322 1.2571105,-0.06919 0.4359441,-0.365893 0.6291132,0.174341 0.9295277,0.449137 0.2961205,0.30491 0.8130957,0.509843 0.4509641,0.956871 -0.1457711,0.389693 -0.497827,0.912371 -0.041909,1.236434 0.7054704,0.308962 1.4213172,0.60308 2.1409546,0.87744 0.565976,0.08794 0.6735334,-0.553802 0.8508806,-0.941124 0.04612,-0.570634 0.5786537,-0.305156 0.9806229,-0.335165 0.4235286,3.38e-4 0.9270939,-0.214578 0.9868285,0.354246 0.1753765,0.375422 0.2869945,1.00081 0.8375755,0.909252 0.719599,-0.281709 1.435973,-0.580953 2.141463,-0.896329 0.457311,-0.33647 0.07358,-0.861908 -0.07063,-1.258381 -0.327625,-0.39128 0.07168,-0.58787 0.352045,-0.853286 0.289759,-0.265975 0.561145,-0.555344 0.466555,-0.972146 0.0026,-2.032791 -0.0052,-4.065786 0.0039,-6.09845 0.03296,-0.848501 0.887173,-1.426338 1.691402,-1.314456 -0.282558,-0.425943 -0.735958,-0.144649 -1.085254,0.001 -0.380204,0.279324 -0.636179,0.121087 -0.861145,-0.27038 -0.210572,-0.372294 -0.99493,-0.54685 -0.625293,-1.027102 C 12.834838,9.8918224 13.21772,9.4310129 12.863726,9.0437572 12.315695,8.7180656 11.684546,8.5383027 11.101634,8.2739765 10.91534,8.2087779 10.739417,8.0930662 10.537109,8.0898438 Z M 8.7949219,11.279297 c 1.9860901,-0.06165 3.8525681,1.456407 4.2207931,3.404575 0.447798,1.934895 -0.681761,4.06536 -2.527718,4.791999 C 8.6743925,20.280629 6.3645616,19.59022 5.2984859,17.914607 4.1590069,16.273459 4.3947605,13.85072 5.8662718,12.485631 6.6422055,11.730555 7.712034,11.288874 8.7949219,11.279297 Z"
-     id="rect3267"
-     inkscape:connector-curvature="0" />
+     id="rect3267" />
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gears-play.svg b/rtdata/icons/rawtherapee/scalable/apps/gears-play.svg
index 83c23557d..ebd5472cf 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gears-play.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gears-play.svg
@@ -2,65 +2,16 @@
 <!-- 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"
-   sodipodi:docname="gears-play.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="false"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="SVGRoot"
-     inkscape:document-units="px"
-     inkscape:cy="12"
-     inkscape:cx="7.684729"
-     inkscape:zoom="33.833333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base"
-     inkscape:snap-global="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -104,57 +55,47 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1" />
+     id="layer1" />
   <path
-     style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;stroke-opacity:1;marker:none;enable-background:accumulate"
+     style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;stroke-opacity:1;marker:none;enable-background:accumulate"
      d="m 12.625,10.681641 c -0.07552,0.504242 -0.02384,1.019183 -0.03906,1.528384 0,0.470356 0,0.940713 0,1.411069 0.575941,1.104505 0.695655,2.482652 0.160702,3.625143 -0.206378,0.153123 -0.157721,0.392256 -0.160702,0.611674 0,1.447103 0,2.894205 0,4.341308 0.293122,-0.07338 0.548003,-0.348715 0.466661,-0.667296 -0.131057,-0.372643 -0.301769,-0.731389 -0.449083,-1.098329 0.433394,-0.3331 0.823733,-0.722716 1.154296,-1.158203 0.385011,0.14318 0.754552,0.338144 1.150827,0.443848 0.320358,0.04333 0.551252,-0.227852 0.627585,-0.509745 0.246956,-0.622206 0.521178,-1.235251 0.750553,-1.863368 0.07308,-0.337789 -0.214932,-0.598727 -0.514845,-0.677119 -0.270331,-0.110372 -0.540663,-0.220744 -0.810994,-0.331116 0.06998,-0.542695 0.06728,-1.094713 -0.0078,-1.636719 0.375666,-0.170912 0.775654,-0.296366 1.133617,-0.500498 0.258445,-0.191252 0.225763,-0.54326 0.08265,-0.79333 -0.266209,-0.618075 -0.507201,-1.248654 -0.78984,-1.858585 -0.186128,-0.289696 -0.570977,-0.259085 -0.835571,-0.107008 -0.271172,0.113166 -0.542345,0.226333 -0.813517,0.339499 C 13.412674,11.367916 13.035868,11.001783 12.625,10.681641 Z"
-     id="path6684"
-     inkscape:connector-curvature="0" />
+     id="path6684" />
   <path
-     style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;marker:none;enable-background:accumulate;stroke-opacity:1"
+     style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;marker:none;enable-background:accumulate;stroke-opacity:1"
      d="M 10.537109 8.0898438 C 10.325888 8.0939435 10.12538 8.2248507 10.039062 8.4355469 L 9.6328125 9.4238281 C 9.0850261 9.3530839 8.532702 9.3593515 7.9980469 9.4335938 L 7.5820312 8.4414062 C 7.5233856 8.301387 7.4249475 8.2002225 7.296875 8.1464844 C 7.1688024 8.092654 7.0204761 8.0849622 6.8828125 8.1425781 L 4.9414062 8.9550781 C 4.6660746 9.0703706 4.5447605 9.3840079 4.6621094 9.6640625 L 5.078125 10.65625 C 4.6501102 10.985138 4.2577251 11.374483 3.9238281 11.814453 L 2.9355469 11.410156 C 2.6546216 11.295076 2.333856 11.424966 2.2207031 11.701172 L 1.4257812 13.638672 C 1.3126237 13.914874 1.449534 14.232568 1.7304688 14.347656 L 2.7207031 14.753906 C 2.6499441 15.301684 2.6562117 15.854024 2.7304688 16.388672 L 1.7382812 16.804688 C 1.4582328 16.921948 1.3242333 17.228621 1.4394531 17.503906 L 2.2519531 19.445312 C 2.3672305 19.72062 2.6789662 19.839919 2.9589844 19.722656 L 3.953125 19.308594 C 4.2820312 19.736595 4.6713858 20.128985 5.1113281 20.462891 L 4.7070312 21.451172 C 4.5919356 21.732099 4.7198592 22.052854 4.9960938 22.166016 L 6.9355469 22.960938 C 7.211772 23.074095 7.5294446 22.935228 7.6445312 22.654297 L 8.0488281 21.666016 C 8.5965858 21.736746 9.1508919 21.73047 9.6855469 21.65625 L 10.101562 22.648438 C 10.218827 22.928458 10.52548 23.062572 10.800781 22.947266 L 12.585938 22.199219 L 12.585938 19.701172 L 12.585938 17.470703 C 11.584027 19.403783 9.2754778 20.334281 7.2246094 19.494141 C 6.9689687 19.389417 6.7330791 19.257817 6.5097656 19.111328 C 6.434925 19.062265 6.3698363 19.004447 6.2988281 18.951172 C 6.1567517 18.844556 6.0186968 18.735306 5.8925781 18.613281 C 5.8217516 18.544776 5.7589541 18.471326 5.6933594 18.398438 C 5.5821062 18.274852 5.4765076 18.148541 5.3808594 18.013672 C 5.3225088 17.931426 5.2691327 17.847664 5.2167969 17.761719 C 5.1348973 17.627234 5.060808 17.490014 4.9941406 17.347656 C 4.9502331 17.253961 4.9081828 17.161041 4.8710938 17.064453 C 4.8126963 16.912414 4.7675034 16.7575 4.7265625 16.599609 C 4.7020085 16.505024 4.6743446 16.41263 4.65625 16.316406 C 4.6219392 16.133854 4.6059952 15.948364 4.5957031 15.761719 C 4.591787 15.690938 4.5804415 15.621916 4.5800781 15.550781 C 4.5787155 15.285857 4.5967694 15.019523 4.6464844 14.753906 C 4.6985157 14.475914 4.7794904 14.198999 4.890625 13.927734 C 5.557451 12.300096 7.1297769 11.298487 8.7949219 11.279297 C 9.3510449 11.272887 9.9169868 11.375625 10.458984 11.597656 C 11.432688 11.996537 12.137031 12.746755 12.585938 13.621094 L 12.585938 11 A 1.414355 1.414355 0 0 1 12.589844 10.90625 A 1.414355 1.414355 0 0 1 12.605469 10.765625 A 1.414355 1.414355 0 0 1 12.625 10.681641 C 12.604774 10.665887 12.59075 10.644418 12.570312 10.628906 L 12.976562 9.6386719 C 13.091648 9.3577807 12.961753 9.036978 12.685547 8.9238281 L 10.748047 8.1289062 C 10.67899 8.1006171 10.607516 8.0884756 10.537109 8.0898438 z "
      id="rect3267" />
   <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: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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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"
+     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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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.585938 13.621094 C 12.137031 12.746755 11.432688 11.996537 10.458984 11.597656 C 9.9169868 11.375625 9.3510449 11.272887 8.7949219 11.279297 C 7.1297769 11.298487 5.557451 12.300096 4.890625 13.927734 C 4.001548 16.097848 5.0555234 18.605569 7.2246094 19.494141 C 9.2754778 20.334281 11.584027 19.403783 12.585938 17.470703 L 12.585938 14.357422 L 12.585938 13.621094 z M 8.8183594 13.279297 C 9.1110604 13.275897 9.4086499 13.329387 9.7011719 13.449219 C 10.869801 13.927952 11.418258 15.235595 10.939453 16.404297 C 10.460711 17.572839 9.1512329 18.121383 7.9824219 17.642578 C 6.8134279 17.163697 6.2637395 15.853371 6.7421875 14.685547 C 7.1009995 13.809731 7.9370304 13.289451 8.8183594 13.279297 z "
      id="path6694" />
   <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:0.1;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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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"
+     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.1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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.585938 13.621094 L 12.585938 14.357422 L 12.585938 17.470703 C 12.643784 17.359094 12.742501 17.282479 12.791016 17.164062 C 13.28085 15.968439 13.13721 14.694812 12.585938 13.621094 z "
      id="path6673" />
   <g
      id="g1559"
      transform="matrix(-0.27213072,0.64421424,-0.64421424,-0.27213072,30.113695,5.2275323)">
     <path
-       style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668474;marker:none;enable-background:accumulate"
+       style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668474;marker:none;enable-background:accumulate"
        d="m 14.957336,15.753787 c -0.12328,0.622052 -0.246559,1.244106 -0.369838,1.866159 -0.140816,0.663856 0.09917,1.460412 0.625042,1.867965 0.08905,-0.03836 0.235484,-0.0057 0.261817,-0.130498 0.263816,-0.644042 0.52947,-1.287357 0.792135,-1.931854 0.105117,-0.280235 -0.07231,-0.612829 -0.354478,-0.700143 -0.316908,-0.129363 -0.633816,-0.258728 -0.950724,-0.388091 0.02522,-0.194101 -0.01028,-0.38899 -0.004,-0.583536 z"
-       id="path6691"
-       inkscape:connector-curvature="0" />
+       id="path6691" />
     <path
-       style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.08164823;marker:none;enable-background:accumulate"
+       style="display:block;overflow:visible;visibility:visible;opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.08164823;marker:none;enable-background:accumulate"
        d="m 17.992188,11.998047 -1.417969,-0.960938 -0.002,0.576172 c -6.61e-4,0.212302 0.160457,0.380156 0.36914,0.38086 z"
        id="path6689"
-       transform="matrix(-0.55642817,-1.3172307,1.3172307,-0.55642817,9.8702419,42.575431)"
-       inkscape:connector-curvature="0" />
+       transform="matrix(-0.55642817,-1.3172307,1.3172307,-0.55642817,9.8702419,42.575431)" />
     <path
-       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.08164823;marker:none;enable-background:accumulate"
+       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.08164823;marker:none;enable-background:accumulate"
        d="m 16.974609,1.3867188 c -0.208727,-6.565e-4 -0.370434,0.1685567 -0.371093,0.3808593 l -0.0039,0.7519531 c -0.365236,0.095414 -0.723772,0.2390897 -1.0586,0.4316407 L 15.013672,2.421875 C 14.864016,2.2712799 14.622682,2.2669031 14.474609,2.414065 l -1.041015,1.0332031 c -0.148068,0.1471544 -0.143802,0.3904253 0.0059,0.5410156 l 0.525391,0.5292969 c -0.194627,0.3336255 -0.339818,0.6920107 -0.4375,1.0566407 l -0.753906,-0.00195 c -0.212304,-6.602e-4 -0.382177,0.1604095 -0.382813,0.3691406 l -0.0039,1.4707032 c -6.54e-4,0.2087466 0.168509,0.3724329 0.380859,0.3730468 l 0.751953,0.00195 c 0.0954,0.3652323 0.241022,0.7237623 0.433594,1.0585937 l -0.53125,0.5273438 c -0.0944,0.093807 -0.02594,0.2173997 -0.0039,0.3378906 0.0084,-0.00399 0.01689,-0.0079 0.02539,-0.011719 0.51864,-0.2289377 0.985032,-0.1015404 1.34961,0.130863 l 1.101562,0.746094 c 0.224476,0.103549 0.445077,0.220348 0.679688,0.283203 v 0.177734 l 1.417969,0.960938 0.419921,0.002 c 0.208744,6.4e-4 0.372357,-0.168557 0.373047,-0.380859 l 0.002,-0.751953 c 0.365232,-0.09541 0.723765,-0.241041 1.058594,-0.433594 l 0.527344,0.53125 c 0.149636,0.150577 0.391005,0.153003 0.539062,0.0059 l 1.039063,-1.03125 c 0.03702,-0.036789 0.06571,-0.07927 0.08398,-0.125 0.05484,-0.1371873 0.02435,-0.3030721 -0.08789,-0.4160156 L 21.421875,8.8691406 C 21.616519,8.5355005 21.761707,8.177136 21.859375,7.8125 l 0.753906,0.00195 c 0.106162,3.233e-4 0.198107,-0.035633 0.267578,-0.1035156 0.06953,-0.067857 0.112936,-0.1612611 0.113282,-0.265625 L 23,5.9746094 C 23.000653,5.7658622 22.83149,5.6021761 22.619141,5.6015625 l -0.751953,-0.00195 C 21.771788,5.2343787 21.628118,4.8758493 21.435547,4.5410187 L 21.964844,4.013675 c 0.150584,-0.1496593 0.153003,-0.3910037 0.0059,-0.5390625 L 20.939453,2.4335938 C 20.792313,2.285533 20.550983,2.2878369 20.400391,2.4375 l -0.53125,0.5273438 C 19.53551,2.7701926 19.177135,2.6250005 18.8125,2.5273438 l 0.002,-0.7539063 C 18.815122,1.5611162 18.65401,1.3913123 18.445312,1.390625 Z m 0.728516,2.3261718 c 0.76543,0.00183 1.529385,0.2933447 2.107422,0.875 0.867084,0.8725091 1.083353,2.1583958 0.642578,3.2363282 -0.147215,0.3600039 -0.365722,0.6956333 -0.65625,0.984375 -1.162899,1.155739 -3.0651,1.1511156 -4.220703,-0.011719 -1.155695,-1.162931 -1.149134,-3.0650515 0.01367,-4.2207031 0.581353,-0.5777742 1.347851,-0.8651121 2.113281,-0.8632813 z"
        id="path1555"
-       inkscape:connector-curvature="0"
-       transform="matrix(-0.55642817,-1.3172307,1.3172307,-0.55642817,9.8702419,42.575431)"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+       transform="matrix(-0.55642817,-1.3172307,1.3172307,-0.55642817,9.8702419,42.575431)" />
     <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: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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 z"
-       id="path1557"
-       inkscape:connector-curvature="0" />
+       id="path1557" />
   </g>
   <path
-     sodipodi:nodetypes="cccccc"
-     inkscape:connector-curvature="0"
      id="Symbol-4-6-8"
      d="M 14,14.357876 V 11 L 22.925089,17.051146 14,23 v -3.298368 z"
-     style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+     style="display:inline;opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:0.04999533" />
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gears-small.svg b/rtdata/icons/rawtherapee/scalable/apps/gears-small.svg
index 60cfdc609..89032cd2b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gears-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gears-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="gears-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="35.885669"
-     inkscape:cx="9.4850333"
-     inkscape:cy="6.2380028"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g1410"
@@ -109,30 +66,26 @@
          transform="translate(4.0000001,6.9999999)"
          style="stroke-width:1.5438416">
         <path
-           style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.38783646;marker:none;enable-background:accumulate"
+           style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.38783646;marker:none;enable-background:accumulate"
            d="m 10.537109,8.0898438 c -0.211221,0.0041 -0.41173,0.1350069 -0.498047,0.3457031 L 9.6328125,9.4238281 C 9.0850261,9.3530839 8.532702,9.3593515 7.9980469,9.4335938 L 7.5820312,8.4414062 C 7.5233856,8.3013867 7.4249475,8.2002225 7.296875,8.1464844 7.1688024,8.092654 7.0204761,8.0849622 6.8828125,8.1425781 l -1.9414063,0.8125 C 4.6660746,9.0703706 4.5447605,9.3840079 4.6621094,9.6640625 L 5.078125,10.65625 C 4.6501102,10.985138 4.2577251,11.374483 3.9238281,11.814453 L 2.9355469,11.410156 c -0.2809253,-0.11508 -0.6016909,0.01481 -0.7148438,0.291016 l -0.7949219,1.9375 c -0.1131575,0.276202 0.023753,0.593896 0.3046876,0.708984 l 0.9902343,0.40625 c -0.070759,0.547778 -0.064487,1.100118 0.00977,1.634766 l -0.9921876,0.416016 c -0.2800485,0.11726 -0.4140479,0.423933 -0.2988281,0.699218 l 0.8125,1.941406 c 0.1152774,0.275308 0.4270131,0.394607 0.7070313,0.277344 L 3.953125,19.308594 c 0.3289062,0.428001 0.7182608,0.820391 1.1582031,1.154297 l -0.4042969,0.988281 c -0.1150956,0.280927 0.012828,0.601682 0.2890626,0.714844 l 1.9394531,0.794922 c 0.2762251,0.113158 0.5938977,-0.02571 0.7089843,-0.306641 l 0.4042969,-0.988281 c 0.5477577,0.07073 1.1020638,0.06442 1.6367188,-0.0098 l 0.4160151,0.992188 c 0.117262,0.28002 0.423918,0.414134 0.699219,0.298828 l 1.941407,-0.8125 c 0.275331,-0.115292 0.394692,-0.428929 0.277343,-0.708985 L 12.603516,20.43356 c 0.428013,-0.328887 0.820398,-0.718232 1.154296,-1.158203 l 0.990235,0.404297 c 0.280927,0.115096 0.601691,-0.01482 0.714844,-0.291016 l 0.792968,-1.9375 c 0.113157,-0.276206 -0.02378,-0.593909 -0.304687,-0.708984 l -0.990234,-0.404297 c 0.07076,-0.547774 0.06641,-1.102067 -0.0078,-1.636719 l 0.992187,-0.416016 c 0.280018,-0.117261 0.414019,-0.423943 0.298829,-0.699218 l -0.8125,-1.941407 c -0.115308,-0.275319 -0.42895,-0.394565 -0.708985,-0.277343 l -0.992187,0.414062 C 13.401576,11.353212 13.01027,10.962778 12.570325,10.628872 l 0.40625,-0.9902341 C 13.091658,9.3577467 12.961753,9.036978 12.685547,8.9238281 l -1.9375,-0.7949219 C 10.67899,8.100617 10.607516,8.0884757 10.537109,8.0898438 Z M 8.7949219,11.279297 c 0.556123,-0.0064 1.1220645,0.09633 1.6640621,0.318359 2.169445,0.888721 3.220743,3.397176 2.332032,5.566406 -0.888787,2.169405 -3.3971286,3.218726 -5.5664066,2.330079 C 5.0555234,18.605569 4.001548,16.097848 4.890625,13.927734 5.557451,12.300096 7.1297769,11.298487 8.7949219,11.279297 Z"
-           id="rect3267"
-           inkscape:connector-curvature="0" />
+           id="rect3267" />
         <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: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.08768296;stroke-linecap:round;stroke-linejoin:bevel;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"
+           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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.08768296;stroke-linecap:round;stroke-linejoin:bevel;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 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 z"
-           id="rect1457"
-           inkscape:connector-curvature="0" />
+           id="rect1457" />
       </g>
       <g
          transform="matrix(-0.27213072,0.64421424,-0.64421424,-0.27213072,34.113695,12.227533)"
          id="g1559"
          style="stroke-width:1.5438416">
         <path
-           inkscape:connector-curvature="0"
            id="path1555"
            d="m 10.537109,8.0898438 c -0.211221,0.0041 -0.41173,0.1350069 -0.498047,0.3457031 L 9.6328125,9.4238281 C 9.0850261,9.3530839 8.532702,9.3593515 7.9980469,9.4335938 L 7.5820312,8.4414062 C 7.5233856,8.3013867 7.4249475,8.2002225 7.296875,8.1464844 7.1688024,8.092654 7.0204761,8.0849622 6.8828125,8.1425781 l -1.9414063,0.8125 C 4.6660746,9.0703706 4.5447605,9.3840079 4.6621094,9.6640625 L 5.078125,10.65625 C 4.6501102,10.985138 4.2577251,11.374483 3.9238281,11.814453 L 2.9355469,11.410156 c -0.2809253,-0.11508 -0.6016909,0.01481 -0.7148438,0.291016 l -0.7949219,1.9375 c -0.1131575,0.276202 0.023753,0.593896 0.3046876,0.708984 l 0.9902343,0.40625 c -0.070759,0.547778 -0.064487,1.100118 0.00977,1.634766 l -0.9921876,0.416016 c -0.2800485,0.11726 -0.4140479,0.423933 -0.2988281,0.699218 l 0.8125,1.941406 c 0.1152774,0.275308 0.4270131,0.394607 0.7070313,0.277344 L 3.953125,19.308594 c 0.3289062,0.428001 0.7182608,0.820391 1.1582031,1.154297 l -0.4042969,0.988281 c -0.1150956,0.280927 0.012828,0.601682 0.2890626,0.714844 l 1.9394531,0.794922 c 0.2762251,0.113158 0.5938977,-0.02571 0.7089843,-0.306641 l 0.4042969,-0.988281 c 0.5477577,0.07073 1.1020638,0.06442 1.6367188,-0.0098 l 0.4160151,0.992188 c 0.117262,0.28002 0.423918,0.414134 0.699219,0.298828 l 1.941407,-0.8125 c 0.275331,-0.115292 0.394692,-0.428929 0.277343,-0.708985 L 12.603516,20.43356 c 0.428013,-0.328887 0.820398,-0.718232 1.154296,-1.158203 l 0.990235,0.404297 c 0.280927,0.115096 0.601691,-0.01482 0.714844,-0.291016 l 0.792968,-1.9375 c 0.113157,-0.276206 -0.02378,-0.593909 -0.304687,-0.708984 l -0.990234,-0.404297 c 0.07076,-0.547774 0.06641,-1.102067 -0.0078,-1.636719 l 0.992187,-0.416016 c 0.280018,-0.117261 0.414019,-0.423943 0.298829,-0.699218 l -0.8125,-1.941407 c -0.115308,-0.275319 -0.42895,-0.394565 -0.708985,-0.277343 l -0.992187,0.414062 C 13.401576,11.353212 13.01027,10.962778 12.570325,10.628872 l 0.40625,-0.9902341 C 13.091658,9.3577467 12.961753,9.036978 12.685547,8.9238281 l -1.9375,-0.7949219 C 10.67899,8.100617 10.607516,8.0884757 10.537109,8.0898438 Z M 8.7949219,11.279297 c 0.556123,-0.0064 1.1220645,0.09633 1.6640621,0.318359 2.169445,0.888721 3.220743,3.397176 2.332032,5.566406 -0.888787,2.169405 -3.3971286,3.218726 -5.5664066,2.330079 C 5.0555234,18.605569 4.001548,16.097848 4.890625,13.927734 5.557451,12.300096 7.1297769,11.298487 8.7949219,11.279297 Z"
-           style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.38783646;marker:none;enable-background:accumulate" />
+           style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.38783646;marker:none;enable-background:accumulate" />
         <path
-           inkscape:connector-curvature="0"
            id="path1557"
            d="m 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 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.08768296;stroke-linecap:round;stroke-linejoin:bevel;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" />
+           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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.08768296;stroke-linecap:round;stroke-linejoin:bevel;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" />
       </g>
     </g>
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/gears.svg b/rtdata/icons/rawtherapee/scalable/apps/gears.svg
index 3a7785a6f..18f4008b7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/gears.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/gears.svg
@@ -2,58 +2,16 @@
 <!-- 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"
-   sodipodi:docname="gears.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="SVGRoot"
-     inkscape:document-units="px"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="33.833333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,33 +55,28 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1" />
+     id="layer1" />
   <g
      id="g1553">
     <path
        id="rect3267"
        d="M 10.537109 8.0898438 C 10.325888 8.0939474 10.125379 8.2248507 10.039062 8.4355469 L 9.6328125 9.4238281 C 9.0850261 9.3530839 8.532702 9.3593515 7.9980469 9.4335938 L 7.5820312 8.4414062 C 7.5233856 8.3013867 7.4249475 8.2002225 7.296875 8.1464844 C 7.1688024 8.092654 7.0204761 8.0849622 6.8828125 8.1425781 L 4.9414062 8.9550781 C 4.6660746 9.0703706 4.5447605 9.3840079 4.6621094 9.6640625 L 5.078125 10.65625 C 4.6501102 10.985138 4.2577251 11.374483 3.9238281 11.814453 L 2.9355469 11.410156 C 2.6546216 11.295076 2.333856 11.424971 2.2207031 11.701172 L 1.4257812 13.638672 C 1.3126237 13.914874 1.4495347 14.232568 1.7304688 14.347656 L 2.7207031 14.753906 C 2.6499441 15.301684 2.6562157 15.854024 2.7304688 16.388672 L 1.7382812 16.804688 C 1.4582327 16.921948 1.3242333 17.228621 1.4394531 17.503906 L 2.2519531 19.445312 C 2.3672305 19.72062 2.6789662 19.839919 2.9589844 19.722656 L 3.953125 19.308594 C 4.2820312 19.736595 4.6713858 20.128985 5.1113281 20.462891 L 4.7070312 21.451172 C 4.5919356 21.732099 4.7198597 22.052854 4.9960938 22.166016 L 6.9355469 22.960938 C 7.211772 23.074096 7.5294446 22.935229 7.6445312 22.654297 L 8.0488281 21.666016 C 8.5965858 21.736746 9.1508919 21.73044 9.6855469 21.65625 L 10.101562 22.648438 C 10.218824 22.928458 10.52548 23.062572 10.800781 22.947266 L 12.742188 22.134766 C 13.017519 22.019474 13.13688 21.705837 13.019531 21.425781 L 12.603516 20.433594 C 13.031529 20.104707 13.423914 19.715362 13.757812 19.275391 L 14.748047 19.679688 C 15.028974 19.794784 15.349738 19.664866 15.462891 19.388672 L 16.255859 17.451172 C 16.369016 17.174966 16.232082 16.857263 15.951172 16.742188 L 14.960938 16.337891 C 15.031696 15.790117 15.027345 15.235824 14.953125 14.701172 L 15.945312 14.285156 C 16.22533 14.167895 16.359331 13.861213 16.244141 13.585938 L 15.431641 11.644531 C 15.316333 11.369212 15.002691 11.249966 14.722656 11.367188 L 13.730469 11.78125 C 13.401563 11.353246 13.010257 10.962812 12.570312 10.628906 L 12.976562 9.6386719 C 13.091658 9.3577467 12.961753 9.036978 12.685547 8.9238281 L 10.748047 8.1289062 C 10.67899 8.100617 10.607516 8.0884757 10.537109 8.0898438 z M 8.7949219 11.279297 C 9.3510449 11.272887 9.9169864 11.375625 10.458984 11.597656 C 12.628429 12.486377 13.679727 14.994832 12.791016 17.164062 C 11.902229 19.333467 9.3938874 20.382788 7.2246094 19.494141 C 5.0555234 18.605569 4.001548 16.097848 4.890625 13.927734 C 5.557451 12.300096 7.1297769 11.298487 8.7949219 11.279297 z "
-       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;marker:none;enable-background:accumulate" />
+       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;marker:none;enable-background:accumulate" />
     <path
-       inkscape:connector-curvature="0"
        id="rect1457"
        d="m 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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" />
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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" />
   </g>
   <g
      id="g1559"
      transform="matrix(-0.27213072,0.64421424,-0.64421424,-0.27213072,30.113695,5.2275323)">
     <path
-       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;marker:none;enable-background:accumulate"
+       style="display:block;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.54668486;marker:none;enable-background:accumulate"
        d="m 10.537109,8.0898438 c -0.211221,0.0041 -0.41173,0.1350069 -0.498047,0.3457031 L 9.6328125,9.4238281 C 9.0850261,9.3530839 8.532702,9.3593515 7.9980469,9.4335938 L 7.5820312,8.4414062 C 7.5233856,8.3013867 7.4249475,8.2002225 7.296875,8.1464844 7.1688024,8.092654 7.0204761,8.0849622 6.8828125,8.1425781 l -1.9414063,0.8125 C 4.6660746,9.0703706 4.5447605,9.3840079 4.6621094,9.6640625 L 5.078125,10.65625 C 4.6501102,10.985138 4.2577251,11.374483 3.9238281,11.814453 L 2.9355469,11.410156 c -0.2809253,-0.11508 -0.6016909,0.01481 -0.7148438,0.291016 l -0.7949219,1.9375 c -0.1131575,0.276202 0.023753,0.593896 0.3046876,0.708984 l 0.9902343,0.40625 c -0.070759,0.547778 -0.064487,1.100118 0.00977,1.634766 l -0.9921876,0.416016 c -0.2800485,0.11726 -0.4140479,0.423933 -0.2988281,0.699218 l 0.8125,1.941406 c 0.1152774,0.275308 0.4270131,0.394607 0.7070313,0.277344 L 3.953125,19.308594 c 0.3289062,0.428001 0.7182608,0.820391 1.1582031,1.154297 l -0.4042969,0.988281 c -0.1150956,0.280927 0.012828,0.601682 0.2890626,0.714844 l 1.9394531,0.794922 c 0.2762251,0.113158 0.5938977,-0.02571 0.7089843,-0.306641 l 0.4042969,-0.988281 c 0.5477577,0.07073 1.1020638,0.06442 1.6367188,-0.0098 l 0.4160151,0.992188 c 0.117262,0.28002 0.423918,0.414134 0.699219,0.298828 l 1.941407,-0.8125 c 0.275331,-0.115292 0.394692,-0.428929 0.277343,-0.708985 L 12.603516,20.43356 c 0.428013,-0.328887 0.820398,-0.718232 1.154296,-1.158203 l 0.990235,0.404297 c 0.280927,0.115096 0.601691,-0.01482 0.714844,-0.291016 l 0.792968,-1.9375 c 0.113157,-0.276206 -0.02378,-0.593909 -0.304687,-0.708984 l -0.990234,-0.404297 c 0.07076,-0.547774 0.06641,-1.102067 -0.0078,-1.636719 l 0.992187,-0.416016 c 0.280018,-0.117261 0.414019,-0.423943 0.298829,-0.699218 l -0.8125,-1.941407 c -0.115308,-0.275319 -0.42895,-0.394565 -0.708985,-0.277343 l -0.992187,0.414062 C 13.401576,11.353212 13.01027,10.962778 12.570325,10.628872 l 0.40625,-0.9902341 C 13.091658,9.3577467 12.961753,9.036978 12.685547,8.9238281 l -1.9375,-0.7949219 C 10.67899,8.100617 10.607516,8.0884757 10.537109,8.0898438 Z M 8.7949219,11.279297 c 0.556123,-0.0064 1.1220645,0.09633 1.6640621,0.318359 2.169445,0.888721 3.220743,3.397176 2.332032,5.566406 -0.888787,2.169405 -3.3971286,3.218726 -5.5664066,2.330079 C 5.0555234,18.605569 4.001548,16.097848 4.890625,13.927734 5.557451,12.300096 7.1297769,11.298487 8.7949219,11.279297 Z"
-       id="path1555"
-       inkscape:connector-curvature="0" />
+       id="path1555" />
     <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: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:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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"
+       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:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:bevel;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 8.794922,11.279297 c -1.665145,0.01919 -3.237471,1.020799 -3.904297,2.648437 -0.889077,2.170114 0.164898,4.677835 2.333984,5.566407 2.169278,0.888647 4.67762,-0.160675 5.566407,-2.330079 0.888711,-2.169231 -0.162587,-4.677685 -2.332032,-5.566406 C 9.916986,11.375625 9.351045,11.272887 8.794922,11.279297 Z m 0.02344,2 c 0.292701,-0.0034 0.590291,0.05009 0.882813,0.169922 1.168629,0.478733 1.717086,1.786376 1.238281,2.955078 -0.478742,1.168542 -1.78822,1.717086 -2.957031,1.238281 -1.168994,-0.478881 -1.718682,-1.789207 -1.240234,-2.957031 0.358812,-0.875816 1.194842,-1.396096 2.076171,-1.40625 z"
-       id="path1557"
-       inkscape:connector-curvature="0" />
+       id="path1557" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/goto-end-small.svg b/rtdata/icons/rawtherapee/scalable/apps/goto-end-small.svg
index 26d805c5d..d1d961a17 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/goto-end-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/goto-end-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="goto-end-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,28 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.4226495;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.4226495;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path857"
-       sodipodi:sides="3"
-       sodipodi:cx="-11.154701"
-       sodipodi:cy="-15.928202"
-       sodipodi:r1="5.690598"
-       sodipodi:r2="2.845299"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M -5.4641032,-15.928202 -9.7320519,-13.4641 -14,-10.999999 l 0,-4.928203 0,-4.928202 4.2679484,2.464101 z"
-       inkscape:transform-center-x="-1.5000002"
        transform="matrix(1.0543707,0,0,-1.0145688,17.76119,-0.16025702)" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.69030845;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.69030845;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect859"
        width="2"
        height="10"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/goto-start-small.svg b/rtdata/icons/rawtherapee/scalable/apps/goto-start-small.svg
index 35b4e9f8c..73ea31011 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/goto-start-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/goto-start-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="goto-start-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,28 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.4226495;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.4226495;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path857"
-       sodipodi:sides="3"
-       sodipodi:cx="-11.154701"
-       sodipodi:cy="-15.928202"
-       sodipodi:r1="5.690598"
-       sodipodi:r2="2.845299"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M -5.464103,-15.928202 -9.7320516,-13.4641 -14,-10.999999 l 0,-4.928203 0,-4.928202 4.2679486,2.464101 z"
-       inkscape:transform-center-x="1.5000003"
        transform="matrix(-1.0543707,0,0,-1.0145688,-0.76119027,-0.16025667)" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.69030845;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.69030845;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect859"
        width="2"
        height="10"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/hand-closed-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/hand-closed-hicontrast.svg
index 0d6b00f95..0f180564f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/hand-closed-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/hand-closed-hicontrast.svg
@@ -2,63 +2,16 @@
 <!-- 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="hand-closed.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="false"
-     inkscape:bbox-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -102,42 +55,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        d="m -21.536476,1.0000009 c -0.948269,0 -1.711674,0.8514544 -1.711674,1.9090908 0.01811,4.6864694 -0.02651,9.3831233 -0.256039,9.7173823 -0.229526,0.334261 -0.233012,-3.6963562 -0.233012,-7.7173825 0,-1.0576364 -0.763408,-1.9090908 -1.711676,-1.9090908 -0.948268,0 -1.711675,0.8514544 -1.711675,1.9090908 -0.03174,1.2281341 -0.01132,11.7217645 -0.01132,11.7217645 -0.439107,-0.840301 -0.784718,-1.854028 -1.095713,-2.903012 -0.310995,-1.048985 -0.357586,-2.521874 -0.658227,-3.503208 -0.306583,-1.0008337 -1.07076,-1.4553855 -1.9681,-1.1134432 -0.89734,0.3419431 -1.228292,1.3692982 -1.066613,2.4240062 l 0.585636,3.68557 1.020347,3.373111 C -30.053221,19.66255 -29.295309,23 -27.933607,23 h 13.232052 C -12.479914,22.131719 -12.009936,18.517544 -12,16.90909 V 8.9090913 c 0,-1.0576365 -0.763406,-1.9090909 -1.711674,-1.9090909 -0.948269,0 -1.711676,0.8514544 -1.711676,1.9090909 0.0066,2.6725927 -0.0095,5.3480947 -0.248805,4.6824467 -0.239272,-0.665649 -0.240245,-4.6755439 -0.240245,-8.6824465 0,-1.0576364 -0.763407,-1.9090908 -1.711674,-1.9090908 -0.948269,0 -1.711676,0.8514544 -1.711676,1.9090908 0.01256,4.0128995 -0.01836,8.0322495 -0.252704,7.6998675 -0.234347,-0.332384 -0.236347,-5.019198 -0.236347,-9.6998673 0,-1.0576364 -0.763407,-1.9090908 -1.711675,-1.9090908 z"
-       id="rect2901"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="scccsccscscccsccsscccscccs" />
+       id="rect2901" />
     <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:0.7;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.00010002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;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.0;fill-rule:nonzero;stroke:none;stroke-width:1.00010002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.628906,-24.480469 c -0.680589,-0.05363 -1.235328,0.384577 -1.466797,0.892578 -0.234228,0.514061 -0.258015,1.098822 -0.07617,1.617188 l -0.02148,-0.08008 c 0.134701,0.77165 0.352976,1.499415 0.50976,2.201172 -0.452067,-0.809728 -0.973566,-1.57668 -1.566407,-2.277344 -0.38699,-0.576226 -1.06916,-0.787901 -1.669921,-0.683594 -0.584955,0.101563 -1.138832,0.559117 -1.269532,1.242188 -0.183894,0.546893 -0.117125,1.090886 0.0625,1.537109 0.177989,0.442155 0.436859,0.813453 0.658203,1.138672 0.65398,1.318974 1.473712,2.484022 1.701172,3.757812 0.06754,0.378495 0.0018,0.849969 -0.177734,1.244141 -0.162494,0.356731 -0.423559,0.602008 -0.703125,0.748049 C 7.319226,-13.156364 7.066506,-13.265126 6.84375,-13.533203 6.596093,-13.831247 6.413567,-14.268502 6.353516,-14.634766 6.295331,-15.191671 6.067331,-15.79517 5.638672,-16.25 c -0.218784,-0.232142 -0.509025,-0.428802 -0.867188,-0.480469 -0.358162,-0.05167 -0.748435,0.06813 -1.078125,0.324219 h -0.002 v 0.002 c -0.659619,0.518354 -0.930321,1.288752 -0.939453,2.023438 -0.009,0.723544 0.213387,1.431639 0.537109,2.021484 0.427607,1.018883 1.019899,1.996569 1.902344,2.753906 L 5.167969,-9.625 c 1.26268,1.225532 2.184735,2.901177 2.078125,4.617188 v 0.01562 0.01563 c 0,0.794629 0.565532,1.392396 1.205078,1.785156 0.636492,0.390885 1.394295,0.618141 2.089844,0.638672 1.583921,0.125137 3.209634,0.02066 4.761718,-0.382813 l 0.01172,-0.0039 0.01367,-0.0039 c 0.435984,-0.138315 0.891906,-0.369194 1.261719,-0.726563 0.369812,-0.357369 0.652922,-0.879195 0.613281,-1.482422 v 0.07422 c 0.19266,-2.348546 0.778157,-4.65564 1.578125,-6.892578 l 0.0039,-0.0098 0.0039,-0.01172 c 0.647951,-2.114783 1.349272,-4.260875 1.69336,-6.511718 v -0.0019 c 0.123379,-0.824398 -0.377829,-1.531195 -1.017565,-1.851544 -0.319868,-0.160174 -0.702992,-0.232661 -1.080078,-0.115234 -0.361023,0.112424 -0.660569,0.426062 -0.839844,0.828125 -0.02505,0.03943 -0.01466,0.07365 -0.03516,0.113281 -0.07006,-0.522454 -0.0905,-0.994473 -0.310547,-1.539063 -0.09458,-0.546432 -0.326478,-1.093004 -0.72461,-1.517578 -0.407236,-0.434283 -1.018901,-0.733766 -1.708984,-0.654296 l -0.0098,0.002 -0.01172,0.002 c -0.401204,0.06321 -0.748194,0.291687 -0.929688,0.591796 -0.06753,0.111662 -0.04862,0.228199 -0.08203,0.34375 -0.160268,-0.426091 -0.215787,-0.869121 -0.486328,-1.271484 l -0.03125,-0.04687 -0.04102,-0.03711 c -0.337322,-0.318813 -0.812337,-0.806376 -1.544883,-0.82226 z m -0.02734,0.492188 c 0.515691,0.0025 0.880163,0.364184 1.228516,0.693359 1.055466,1.569741 0.994821,3.54262 1.572266,5.283203 0.238005,-0.06341 -0.11357,-1.607676 -0.16211,-2.222656 -0.01599,-0.795909 -0.571382,-2.328051 0.582032,-2.509766 1.05084,-0.121014 1.748564,0.857015 1.898437,1.789063 0.442874,1.034157 0.370792,2.178193 0.650391,3.25 0.388388,-0.09749 0.279818,-1.265089 0.599609,-1.714844 0.527032,-1.296298 2.187352,-0.294847 2.017578,0.839844 -0.335878,2.197137 -1.028082,4.321065 -1.677734,6.441406 -0.810532,2.266479 -1.410182,4.615155 -1.607422,7.019531 0.05751,0.875155 -0.779107,1.461842 -1.527344,1.699219 -1.495741,0.388826 -3.072241,0.494208 -4.611328,0.371094 C 9.384003,-3.080288 7.746098,-3.889983 7.746098,-4.976562 7.864795,-6.887125 6.853688,-8.685681 5.515629,-9.984375 4.703216,-10.681609 4.142373,-11.593285 3.734379,-12.572266 3.149165,-13.621033 2.945396,-15.182971 4,-16.011719 c 0.997505,-0.774809 1.779533,0.569694 1.861328,1.458985 0.148792,0.907513 0.826027,2.011116 1.863281,1.951172 0.928912,-0.379788 1.43465,-1.630135 1.257813,-2.621094 -0.254314,-1.424177 -1.121729,-2.631384 -1.751953,-3.90625 -0.457264,-0.673788 -1.007676,-1.456736 -0.69336,-2.314453 0.149192,-1.000132 1.529413,-1.196613 2.058594,-0.402344 1.100918,1.291917 1.994057,2.799863 2.515625,4.419922 0.47778,-1.581579 -0.284312,-3.16208 -0.554687,-4.710938 -0.26492,-0.755192 0.07664,-1.944501 1.044921,-1.851562 z"
-       id="path840"
-       inkscape:connector-curvature="0" />
+       id="path840" />
     <path
-       sodipodi:nodetypes="cccccccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
        id="path849"
        d="m 11.602196,26.011121 c -0.968279,-0.09294 -1.309807,1.097311 -1.044887,1.852503 0.270375,1.548858 1.032003,3.129502 0.554223,4.711081 C 10.589964,30.954646 9.696549,29.446787 8.5956314,28.15487 8.0664503,27.360601 6.6853476,27.556354 6.5361563,28.556485 c -0.314316,0.857718 0.2376356,1.64067 0.6948996,2.314457 0.6302245,1.274867 1.4962662,2.482414 1.7505805,3.906591 0.1768374,0.990959 -0.3289732,2.241539 -1.2578849,2.621327 -1.0372547,0.05994 -1.7140144,-1.044398 -1.8628061,-1.951911 -0.081795,-0.889291 -0.86326,-2.233825 -1.8607647,-1.459016 -1.0546044,0.828747 -0.8509919,2.390946 -0.2657818,3.439713 0.4079941,0.978981 0.969746,1.890696 1.7821593,2.58793 1.3380594,1.298694 2.3477705,3.097517 2.2290734,5.00808 0,1.086579 1.638441,1.89624 2.8188954,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 0.649652,-2.120341 1.340729,-4.243896 1.676607,-6.441033 0.169774,-1.134691 -1.489651,-2.135902 -2.016683,-0.839604 -0.319791,0.449755 -0.21195,1.616727 -0.600338,1.714219 -0.279599,-1.071807 -0.20687,-2.216252 -0.649744,-3.25041 -0.149873,-0.932048 -0.84734,-1.91055 -1.89818,-1.789536 -1.153414,0.181715 -0.597997,1.714518 -0.582003,2.510427 0.04854,0.61498 0.399825,2.15953 0.16182,2.222943 -0.577445,-1.740583 -0.516942,-3.713714 -1.572408,-5.283454 -0.348353,-0.329176 -0.712446,-0.691324 -1.228136,-0.693801 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        d="m 11.602196,-23.988879 c -0.968279,-0.09294 -1.309807,1.097311 -1.044887,1.852503 0.270375,1.548858 1.032003,3.129502 0.554223,4.711081 -0.521568,-1.620059 -1.414983,-3.127918 -2.5159006,-4.419835 -0.5291811,-0.794269 -1.9102838,-0.598516 -2.0594751,0.401615 -0.314316,0.857718 0.2376356,1.64067 0.6948996,2.314457 0.6302245,1.274867 1.4962662,2.482414 1.7505805,3.906591 0.1768374,0.990959 -0.3289732,2.241539 -1.2578849,2.621327 -1.0372547,0.05994 -1.7140144,-1.044398 -1.8628061,-1.951911 -0.081795,-0.889291 -0.86326,-2.233825 -1.8607647,-1.459016 -1.0546044,0.828747 -0.8509919,2.390946 -0.2657818,3.439713 0.4079941,0.978981 0.969746,1.890696 1.7821593,2.58793 1.3380594,1.298694 2.3477705,3.097517 2.2290734,5.00808 0,1.086579 1.638441,1.89624 2.8188954,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 0.649652,-2.120341 1.340729,-4.243896 1.676607,-6.441033 0.169774,-1.134691 -1.489651,-2.135902 -2.016683,-0.839604 -0.319791,0.449755 -0.21195,1.616727 -0.600338,1.714219 -0.279599,-1.071807 -0.20687,-2.216252 -0.649744,-3.25041 -0.149873,-0.932048 -0.84734,-1.91055 -1.89818,-1.789536 -1.153414,0.181715 -0.597997,1.714518 -0.582003,2.510427 0.04854,0.61498 0.399825,2.15953 0.16182,2.222943 -0.577445,-1.740583 -0.516942,-3.713714 -1.572408,-5.283454 -0.348353,-0.329176 -0.712446,-0.691324 -1.228136,-0.693801 z"
-       id="path852"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+       id="path852" />
     <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:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00010002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.00010002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11.601562,-23.988281 c -0.968278,-0.09294 -1.309841,1.09637 -1.044921,1.851562 0.270375,1.548858 1.032467,3.129359 0.554687,4.710938 -0.521568,-1.620059 -1.414707,-3.128005 -2.515625,-4.419922 -0.529181,-0.794269 -1.909402,-0.597787 -2.058594,0.402344 -0.314316,0.857718 0.236096,1.640666 0.69336,2.314453 0.630224,1.274867 1.497639,2.482073 1.751953,3.90625 0.176838,0.990959 -0.328901,2.241306 -1.257813,2.621094 -1.037254,0.05994 -1.714489,-1.043659 -1.863281,-1.951172 C 5.779538,-15.442025 4.997504,-16.786528 4,-16.011719 c -1.054605,0.828747 -0.850835,2.390686 -0.265625,3.439453 0.407994,0.978981 0.968837,1.890657 1.78125,2.587891 1.33806,1.298694 2.349166,3.09725 2.230469,5.007813 0,1.086579 1.637905,1.896279 2.818359,1.927734 1.539087,0.123114 3.115587,0.01773 4.611328,-0.371094 0.748237,-0.237377 1.584855,-0.824064 1.527344,-1.699219 0.19724,-2.404376 0.79689,-4.753052 1.607422,-7.019531 0.649652,-2.120341 1.341856,-4.244269 1.677734,-6.441406 0.169774,-1.134691 -1.490546,-2.136142 -2.017578,-0.839844 -0.319791,0.449755 -0.211221,1.617352 -0.599609,1.714844 -0.279599,-1.071807 -0.207517,-2.215842 -0.650391,-3.25 -0.149873,-0.932048 -0.847597,-1.910077 -1.898437,-1.789063 -1.153414,0.181715 -0.598026,1.713857 -0.582032,2.509766 0.04854,0.61498 0.400115,2.159243 0.16211,2.222656 -0.577445,-1.740583 -0.5168,-3.713463 -1.572266,-5.283203 -0.348353,-0.329176 -0.712825,-0.690882 -1.228516,-0.693359 z m -0.04687,0.498047 0.02148,0.002 h 0.02344 c 0.266338,0.0013 0.512596,0.220305 0.835938,0.523437 0.911727,1.396982 0.882427,3.273337 1.492187,5.111328 l 0.148435,0.447269 0.455078,-0.123047 c 0.288525,-0.07687 0.385059,-0.318782 0.417969,-0.443359 0.03291,-0.124578 0.0353,-0.223175 0.03516,-0.328125 -2.93e-4,-0.209902 -0.02724,-0.439026 -0.06055,-0.683594 -0.06662,-0.489136 -0.164185,-1.043165 -0.183594,-1.289063 v 0.0293 c -0.0102,-0.507755 -0.149171,-1.063997 -0.146484,-1.472656 0.0013,-0.204329 0.03985,-0.348839 0.07813,-0.412109 0.03633,-0.06008 0.065,-0.09055 0.216797,-0.117188 0.355996,-0.03829 0.615867,0.08824 0.855469,0.34375 0.241675,0.257727 0.422435,0.652332 0.482421,1.025391 l 0.0098,0.0625 0.02539,0.05664 c 0.382519,0.893222 0.318109,2.00326 0.625,3.179687 l 0.125,0.478516 0.480469,-0.121094 c 0.330877,-0.08306 0.484119,-0.356947 0.558593,-0.552734 0.07447,-0.195787 0.106671,-0.385054 0.138672,-0.572266 0.064,-0.374422 0.163301,-0.746422 0.189453,-0.783203 l 0.0332,-0.04883 0.02148,-0.05273 c 0.08882,-0.218457 0.171069,-0.263138 0.248047,-0.287109 0.07698,-0.02397 0.196292,-0.01719 0.335937,0.05273 0.279291,0.139856 0.522983,0.500292 0.476563,0.810547 -0.327668,2.14343 -1.008802,4.243242 -1.660157,6.369141 -0.817333,2.289621 -1.427699,4.672266 -1.628906,7.125 l -0.002,0.03711 0.002,0.03711 c 0.01787,0.27193 -0.08926,0.481468 -0.310547,0.695313 -0.218395,0.211047 -0.548661,0.388427 -0.857422,0.488281 -1.430398,0.370039 -2.948879,0.474234 -4.433593,0.355469 l -0.01172,-0.002 h -0.01367 C 10.095913,-3.561642 9.449398,-3.75139 8.974609,-4.042969 8.499821,-4.334548 8.246094,-4.684614 8.246094,-4.976562 l -0.00195,0.03125 C 8.374922,-7.050428 7.278673,-8.971894 5.865234,-10.34375 l -0.011718,-0.0098 -0.011719,-0.0098 c -0.735378,-0.630984 -1.25878,-1.471979 -1.646485,-2.402275 l -0.00977,-0.02539 -0.013672,-0.02539 c -0.25314,-0.453678 -0.426328,-1.036944 -0.419917,-1.552736 0.0064,-0.515792 0.161652,-0.939603 0.556641,-1.25 0.166559,-0.128502 0.249369,-0.131327 0.320312,-0.121093 0.07147,0.01031 0.169755,0.05748 0.28125,0.175781 0.22299,0.236604 0.423426,0.73374 0.453125,1.056641 l 0.00195,0.01758 0.00195,0.01758 c 0.08874,0.54125 0.319796,1.112105 0.707031,1.578125 0.387234,0.46602 0.976274,0.833506 1.677734,0.792969 l 0.083985,-0.0059 0.076171,-0.03125 c 0.613005,-0.250551 1.04918,-0.762097 1.310554,-1.335901 0.261374,-0.573805 0.361248,-1.223474 0.251953,-1.835938 -0.28025,-1.56942 -1.189756,-2.816841 -1.794921,-4.041016 l -0.015626,-0.0293 -0.019531,-0.0293 c -0.230501,-0.339782 -0.459328,-0.67962 -0.585937,-0.994141 -0.12661,-0.314521 -0.160441,-0.573273 -0.052735,-0.867187 l 0.017579,-0.04687 0.00781,-0.05078 c 0.04208,-0.282072 0.220846,-0.41034 0.478516,-0.455078 0.257669,-0.04474 0.527139,0.04155 0.669922,0.25586 l 0.015624,0.02539 0.019532,0.02148 c 1.062957,1.24737 1.921664,2.702346 2.419922,4.25 l 0.492187,1.52539 0.462891,-1.535156 c 0.546993,-1.810695 -0.286133,-3.492486 -0.539063,-4.941406 l -0.0078,-0.04102 -0.01367,-0.03906 c -0.08308,-0.236827 -0.06941,-0.624466 0.04297,-0.871094 0.112374,-0.246628 0.205943,-0.342944 0.482422,-0.316406 z"
-       id="path844"
-       inkscape:connector-curvature="0" />
+       id="path844" />
     <path
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke"
        d="m 11.975568,1.5076372 c -0.968279,-0.09294 -1.309807,1.097311 -1.044887,1.852503 0.270375,1.548858 1.032003,3.129502 0.554223,4.711081 -0.521568,-1.620059 -1.414983,-3.127918 -2.5159012,-4.419835 -0.529181,-0.794269 -1.910283,-0.598516 -2.059475,0.401615 -0.314316,0.857718 0.237636,1.64067 0.6949,2.314457 0.630224,1.274867 1.496266,2.482414 1.75058,3.9065908 0.176838,0.990959 -0.328973,2.241539 -1.257885,2.621327 -1.037254,0.05994 -1.714014,-1.044398 -1.862806,-1.951911 -0.08179,-0.889291 -0.86326,-2.2338248 -1.860764,-1.4590158 -1.054605,0.8287468 -0.850992,2.3909458 -0.265782,3.4397128 0.407994,0.978981 0.969746,1.890696 1.782159,2.58793 1.33806,1.298694 2.347771,3.097517 2.229074,5.00808 0,1.086579 1.638441,1.89624 2.8188952,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 0.649652,-2.120341 1.340729,-4.2438958 1.676607,-6.4410328 0.169774,-1.134691 -1.489651,-2.135902 -2.016683,-0.839604 -0.319791,0.449755 -0.21195,1.616727 -0.600338,1.714219 -0.279599,-1.071807 -0.20687,-2.216252 -0.649744,-3.25041 -0.149873,-0.932048 -0.84734,-1.91055 -1.89818,-1.789536 -1.153414,0.181715 -0.597997,1.714518 -0.582003,2.510427 0.04854,0.61498 0.399825,2.15953 0.16182,2.222943 -0.577445,-1.740583 -0.516942,-3.713714 -1.572408,-5.283454 -0.348353,-0.329176 -0.712446,-0.691324 -1.228136,-0.693801 z"
-       id="path861"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+       id="path861" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/hand-open-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/hand-open-hicontrast.svg
index 310eda2d1..996213632 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/hand-open-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/hand-open-hicontrast.svg
@@ -2,58 +2,16 @@
 <!-- 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="hand-open-hicontrast.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,30 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        d="m 51.066359,2.3192467 c 0.02103,2.1794281 0.361946,4.3436016 0.343124,6.5243847 C 50.703789,6.7461227 49.69609,4.7620769 49.007444,2.6597168 48.699396,1.4049372 46.685585,1.3469162 46.712083,2.7917117 c 0.148468,1.5137205 0.594459,2.9945305 1.145375,4.4118738 0.579646,1.5250885 1.194783,3.1140255 1.074022,4.7764985 -0.211465,1.328048 -1.804794,1.751182 -2.69689,0.581002 -0.416475,-0.393564 -0.543928,-0.65319 -0.960441,-1.239744 -0.416513,-0.586553 -1.122086,-1.500035 -1.86898,-1.219348 -1.497669,0.876326 -0.294126,2.449671 0.319536,3.475862 0.529141,1.049899 1.265396,1.943333 2.096629,2.765328 1.139405,1.210646 2.007145,2.792292 1.92774,4.496496 0.04404,1.388514 1.558478,2.053001 2.76408,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.7140115 C 60.094797,8.0057799 60.448279,6.9330366 60.445238,5.8285168 60.177118,4.6460216 58.537149,4.6959279 58.236123,6.0272935 57.967363,6.9739347 57.870142,7.9685551 57.495572,8.884547 57.242047,6.9260482 57.684456,4.9341325 57.368125,2.97878 57.41337,1.4507624 55.214218,1.5288595 54.956983,2.8379753 54.705459,4.7639487 54.797305,6.7197263 54.556058,8.6480125 53.992175,6.3772042 54.267168,3.9545282 53.446484,1.7396332 52.871322,0.60333839 51.123424,1.0946692 51.066359,2.3192467 Z"
-       id="path2954"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+       id="path2954" />
     <path
-       sodipodi:nodetypes="cccccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
        id="path814"
        d="m 11.066359,2.319247 c 0.02103,2.179428 0.361946,4.343601 0.343124,6.524384 C 10.703789,6.746123 9.6960899,4.762077 9.0074444,2.659717 8.6993964,1.404937 6.6855849,1.346916 6.7120828,2.791712 6.860551,4.305432 7.3065418,5.786242 7.8574584,7.203585 8.4371042,8.728674 9.0522407,10.317611 8.9314796,11.980084 8.7200153,13.308132 7.126686,13.731266 6.2345901,12.561086 5.8181155,12.167522 5.6906617,11.907896 5.2741487,11.321342 4.8576356,10.734789 4.1520632,9.821307 3.4051693,10.101994 c -1.4976695,0.876326 -0.2941262,2.449671 0.3195361,3.475862 0.5291409,1.049899 1.265396,1.943333 2.0966285,2.765328 1.1394053,1.210646 2.0071456,2.792292 1.9277399,4.496496 0.044036,1.388514 1.5584783,2.053001 2.7640802,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.714012 C 20.094797,8.00578 20.448279,6.933037 20.445238,5.828517 20.177118,4.646022 18.537149,4.695928 18.236123,6.027293 17.967363,6.973935 17.870142,7.968555 17.495572,8.884547 17.242047,6.926048 17.684456,4.934132 17.368125,2.97878 17.413375,1.450762 15.214218,1.528859 14.956983,2.837975 14.705459,4.763949 14.797305,6.719726 14.556058,8.648012 13.992175,6.377204 14.267168,3.954528 13.446484,1.739633 12.871322,0.603338 11.123424,1.094669 11.066359,2.319247 Z"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+       style="opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:markers fill stroke" />
     <path
-       inkscape:connector-curvature="0"
        id="path820"
        d="m -12.0625,0.66015625 c -0.698739,0.18127568 -1.331656,0.79041755 -1.371094,1.63671875 v 0.013672 0.013672 c 0.01134,1.1756433 0.0924,2.2946186 0.181641,3.4375 -0.449578,-1.0772468 -0.910985,-2.1751358 -1.265625,-3.2578128 l 0.0098,0.037109 c -0.213752,-0.8706616 -1.017807,-1.3409622 -1.76563,-1.3281246 -0.373911,0.00642 -0.758073,0.1317809 -1.052734,0.4082032 -0.29466,0.2764222 -0.46969,0.7024553 -0.460937,1.1796874 v 0.019531 l 0.0019,0.019531 c 0.154749,1.5777324 0.615886,3.1000247 1.175784,4.5410162 0.576175,1.5159574 1.138616,3.0231956 1.039062,4.5292966 -0.07989,0.470271 -0.362916,0.730463 -0.705078,0.810547 -0.345672,0.08091 -0.750378,-0.01505 -1.091797,-0.462891 l -0.02539,-0.03125 -0.0293,-0.0293 c -0.373704,-0.353142 -0.467524,-0.561929 -0.896484,-1.166012 -0.214481,-0.302041 -0.50916,-0.706808 -0.898438,-1.029297 -0.389278,-0.3224884 -0.96551,-0.5886036 -1.554687,-0.3671874 l -0.03906,0.013672 -0.03711,0.021484 c -0.4559,0.2667591 -0.765427,0.6392684 -0.892579,1.0527344 -0.127152,0.413466 -0.07809,0.829655 0.03516,1.205078 0.222721,0.738347 0.690357,1.390996 0.982422,1.875 0.0011,0.0022 0.0028,0.0037 0.0039,0.0059 0.561462,1.111707 1.336036,2.046692 2.189453,2.890625 l -0.01367,-0.01367 c 1.077278,1.144595 1.86382,2.610155 1.792966,4.130817 l -0.002,0.01953 0.002,0.01953 c 0.02769,0.873239 0.542175,1.548231 1.171875,1.958984 0.6297,0.410754 1.379068,0.608904 2.060547,0.650391 h 0.002 c 1.579712,0.0891 3.21279,0.02295 4.785156,-0.38086 l 0.0078,-0.002 0.0078,-0.002 c 0.487232,-0.143058 0.961438,-0.403695 1.332032,-0.789062 0.370593,-0.385367 0.63356,-0.916516 0.623046,-1.523438 v 0.03906 c 0.236258,-3.942943 2.012498,-7.646163 3.044922,-11.6113285 v -0.00391 C -3.428351,8.1521527 -3.051332,7.0368022 -3.054666,5.8260682 V 5.7714844 L -3.066406,5.71875 C -3.249415,4.9116225 -3.982389,4.4412768 -4.679688,4.4863281 -5.275494,4.5248222 -5.800031,4.9741686 -6.078125,5.6210938 -6.045805,4.7352914 -5.996807,3.9097621 -6.136719,2.984375 -6.125163,2.4875655 -6.307139,2.0425781 -6.615234,1.7597656 -6.925794,1.4746908 -7.325968,1.3490659 -7.716797,1.34375 -8.498454,1.3331182 -9.352973,1.8249624 -9.533203,2.7421875 l -0.0039,0.015625 -0.002,0.015625 c -0.05278,0.4041277 -0.05266,0.7822623 -0.08203,1.1835937 -0.107375,-0.7981063 -0.169123,-1.5977948 -0.46289,-2.390625 l -0.0098,-0.027344 -0.01367,-0.025391 C -10.500285,0.73752895 -11.363761,0.47888057 -12.0625,0.66015625 Z m 0.25,0.96874995 c 0.327629,-0.084998 0.615816,-0.014161 0.798828,0.3300782 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C -8.70016,6.735827 -8.78812,4.7904773 -8.548828,2.9316406 -8.469639,2.5430223 -8.099804,2.3387264 -7.730469,2.34375 c 0.185458,0.00252 0.342359,0.063217 0.439453,0.1523438 0.09709,0.089127 0.167925,0.206397 0.160157,0.46875 l -0.002,0.046875 0.0078,0.046875 C -6.828955,4.8885487 -7.268573,6.874471 -7,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053066 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764884 0.395184,-0.6352244 0.660157,-0.6523438 0.251375,-0.016241 0.449106,0.1022573 0.542968,0.4316406 -0.01505,0.9710696 -0.318057,1.9705536 -0.605468,3.0136719 l -0.002,0.00391 v 0.00195 C -5.678376,12.774915 -7.506052,16.543442 -7.75787,20.746094 l -0.002,0.01953 v 0.01953 c 0.0055,0.318516 -0.117945,0.577694 -0.34375,0.8125 -0.223319,0.232223 -0.551559,0.418326 -0.882812,0.517578 -1.43352,0.367311 -2.960591,0.436603 -4.470703,0.351563 -0.524019,-0.03191 -1.134184,-0.203265 -1.574115,-0.490233 -0.439931,-0.286967 -0.704361,-0.637069 -0.720703,-1.152343 v 0.03906 c 0.08796,-1.887744 -0.86097,-3.586624 -2.0625,-4.863279 l -0.0059,-0.0059 -0.0059,-0.0059 c -0.807393,-0.79834 -1.505397,-1.649441 -2.001952,-2.634684 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322958,-0.54006 -0.748063,-1.170179 -0.902342,-1.681634 -0.07714,-0.255727 -0.08634,-0.461023 -0.03711,-0.621094 0.04425,-0.143897 0.168742,-0.284663 0.398438,-0.435547 0.148565,-0.04428 0.291098,-0.0095 0.531249,0.189453 0.254361,0.210719 0.520624,0.555332 0.722657,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379594,0.989291 2.101562,0.820312 0.726883,-0.170128 1.337555,-0.786297 1.472656,-1.634765 l 0.0019,-0.02149 0.002,-0.02148 c 0.131323,-1.8078 -0.526579,-3.4671485 -1.105463,-4.9902334 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116379 -1.107422,-4.2500062 -7.18e-4,-0.2313914 0.05782,-0.3441971 0.140625,-0.421875 0.0851,-0.079836 0.22003,-0.1338908 0.384765,-0.1367188 0.329471,-0.00566 0.684997,0.1822887 0.779297,0.5664063 l 0.0059,0.017578 0.0059,0.017578 c 0.704593,2.151049 1.712135,4.1379731 2.402343,6.1894533 l 0.974609,-0.15625 c 0.01924,-2.227041 -0.318816,-4.3853297 -0.341775,-6.5078124 0.01905,-0.3764263 0.286845,-0.6247291 0.619141,-0.7109376 z m 5.568359,4.2617188 c -0.0026,0.00904 -0.0033,0.01636 -0.0059,0.025391 -2.2e-4,9.659e-4 -0.0017,9.865e-4 -0.002,0.00195 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.7;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:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.7;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.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <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:0.7;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:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 52.455078,1.1015625 c -0.657515,-0.025842 -1.353006,0.4514359 -1.388672,1.2167969 0.02103,2.1794281 0.362572,4.3446075 0.34375,6.5253906 C 50.704462,6.7462413 49.696458,4.7625164 49.007812,2.6601562 48.699764,1.4053767 46.686393,1.3462201 46.712891,2.7910156 c 0.148468,1.5137205 0.593614,2.9947661 1.144531,4.4121094 0.579646,1.5250885 1.19498,3.114871 1.074219,4.777344 -0.211465,1.328048 -1.80517,1.750258 -2.697266,0.580078 -0.416475,-0.393564 -0.544424,-0.651727 -0.960938,-1.238281 -0.416513,-0.586553 -1.122246,-1.5013905 -1.86914,-1.220704 -1.49767,0.876327 -0.29335,2.450372 0.320312,3.476563 0.529141,1.049899 1.266424,1.94363 2.097657,2.765625 1.139405,1.210646 2.00714,2.79189 1.927734,4.496094 0.04404,1.388514 1.55807,2.053559 2.763672,2.126953 1.546216,0.08721 3.126794,0.01908 4.630859,-0.367188 0.822251,-0.241424 1.611734,-0.89878 1.595703,-1.824218 C 56.98435,16.701293 58.787358,12.966248 59.802734,9.0625 60.093836,8.0059864 60.448353,6.9326448 60.445312,5.828125 60.177193,4.6456298 58.537354,4.6959782 58.236328,6.0273438 57.967568,6.973985 57.870664,7.9687737 57.496094,8.8847656 57.242569,6.9262668 57.683518,4.9338681 57.367188,2.9785156 57.412433,1.450498 55.214266,1.5287748 54.957031,2.8378906 54.705507,4.763864 54.797888,6.7201513 54.556641,8.6484375 53.992758,6.3776292 54.26795,3.9551294 53.447266,1.7402344 53.23158,1.3141238 52.849587,1.1170679 52.455078,1.1015625 Z m -0.03125,0.4941406 c 0.22785,2.006e-4 0.425241,0.1051019 0.5625,0.3632813 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C 55.29984,6.7358274 55.21188,4.7904773 55.451172,2.9316406 55.530361,2.5430223 55.900196,2.3387264 56.269531,2.34375 c 0.185458,0.00252 0.342359,0.063217 0.439453,0.1523438 0.09709,0.089127 0.167925,0.206397 0.160157,0.46875 l -0.002,0.046875 0.0078,0.046875 C 57.171104,4.8885486 56.731427,6.8744709 57,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053067 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764885 0.395184,-0.6352244 0.660157,-0.6523438 0.251375,-0.016241 0.449106,0.1022573 0.542968,0.4316406 -0.01505,0.9710696 -0.318057,1.9705536 -0.605468,3.0136719 l -0.002,0.00391 v 0.00195 C 58.321624,12.774915 56.493948,16.543442 56.24213,20.746094 l -0.002,0.01953 v 0.01953 c 0.0055,0.318516 -0.117945,0.577694 -0.34375,0.8125 -0.223319,0.232223 -0.551559,0.418326 -0.882812,0.517578 -1.43352,0.367311 -2.960591,0.436603 -4.470703,0.351563 C 50.01895,22.434887 49.408681,22.263531 48.96875,21.976562 48.528819,21.689595 48.264389,21.339493 48.248047,20.824219 48.321056,18.952282 47.378689,17.267743 46.185547,16 l -0.0059,-0.0059 -0.0059,-0.0059 c -0.807393,-0.79834 -1.505398,-1.649522 -2.001953,-2.634765 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322958,-0.54006 -0.748065,-1.170185 -0.902344,-1.68164 -0.07714,-0.255727 -0.08634,-0.461023 -0.03711,-0.621094 0.04425,-0.143897 0.168741,-0.284663 0.398437,-0.435547 0.148565,-0.04428 0.291099,-0.0095 0.53125,0.189453 0.254361,0.210719 0.520623,0.555332 0.722656,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379595,0.989291 2.101563,0.820312 0.726883,-0.170128 1.337555,-0.786297 1.472656,-1.634765 l 0.002,-0.02149 0.002,-0.02148 c 0.131324,-1.8078 -0.526584,-3.4671495 -1.105468,-4.9902344 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116317 -1.107422,-4.25 -7.18e-4,-0.2313914 0.05782,-0.3441971 0.140625,-0.421875 0.0851,-0.079836 0.22003,-0.1338908 0.384765,-0.1367188 0.329471,-0.00566 0.684997,0.1822887 0.779297,0.5664063 l 0.0059,0.017578 0.0059,0.017578 c 0.704593,2.151049 1.712136,4.1379729 2.402344,6.1894531 l 0.974609,-0.15625 c 0.01924,-2.2270409 -0.318838,-4.3853298 -0.341797,-6.5078124 0.01905,-0.3764264 0.286845,-0.6247291 0.619141,-0.7109376 0.08191,-0.021249 0.160378,-0.03327 0.236328,-0.033203 z"
-       id="path825"
-       inkscape:connector-curvature="0" />
+       id="path825" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/hand-open.svg b/rtdata/icons/rawtherapee/scalable/apps/hand-open.svg
index a7597b482..d0dad0da7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/hand-open.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/hand-open.svg
@@ -2,58 +2,16 @@
 <!-- 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="hand-open.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     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="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>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,30 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        d="m 11.066359,2.3192467 c 0.02103,2.1794281 0.361946,4.3436016 0.343124,6.5243847 C 10.703789,6.7461227 9.6960899,4.7620769 9.0074444,2.6597168 8.6993964,1.4049372 6.6855849,1.3469162 6.7120828,2.7917117 6.860551,4.3054322 7.3065418,5.7862422 7.8574584,7.2035855 8.4371042,8.728674 9.0522407,10.317611 8.9314796,11.980084 8.7200153,13.308132 7.126686,13.731266 6.2345901,12.561086 5.8181155,12.167522 5.6906617,11.907896 5.2741487,11.321342 4.8576356,10.734789 4.1520632,9.821307 3.4051693,10.101994 c -1.4976695,0.876326 -0.2941262,2.449671 0.3195361,3.475862 0.5291409,1.049899 1.265396,1.943333 2.0966285,2.765328 1.1394053,1.210646 2.0071456,2.792292 1.9277399,4.496496 0.044036,1.388514 1.5584783,2.053001 2.7640802,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.7140115 C 20.094797,8.0057799 20.448279,6.9330366 20.445238,5.8285168 20.177118,4.6460216 18.537149,4.6959279 18.236123,6.0272935 17.967363,6.9739347 17.870142,7.9685551 17.495572,8.884547 17.242047,6.9260482 17.684456,4.9341325 17.368125,2.97878 17.41337,1.4507624 15.214218,1.5288595 14.956983,2.8379753 14.705459,4.7639487 14.797305,6.7197263 14.556058,8.6480125 13.992175,6.3772042 14.267168,3.9545282 13.446484,1.7396332 12.871322,0.60333839 11.123424,1.0946692 11.066359,2.3192467 Z"
-       id="path2954"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+       id="path2954" />
     <path
-       sodipodi:nodetypes="cccccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
        id="path814"
        d="m 11.066359,42.319247 c 0.02103,2.179428 0.361946,4.343601 0.343124,6.524384 -0.705694,-2.097508 -1.7133931,-4.081554 -2.4020386,-6.183914 -0.308048,-1.25478 -2.3218595,-1.312801 -2.2953616,0.131995 0.1484682,1.51372 0.594459,2.99453 1.1453756,4.411873 0.5796458,1.525089 1.1947823,3.114026 1.0740212,4.776499 C 8.7200153,53.308132 7.126686,53.731266 6.2345901,52.561086 5.8181155,52.167522 5.6906617,51.907896 5.2741487,51.321342 4.8576356,50.734789 4.1520632,49.821307 3.4051693,50.101994 c -1.4976695,0.876326 -0.2941262,2.449671 0.3195361,3.475862 0.5291409,1.049899 1.265396,1.943333 2.0966285,2.765328 1.1394053,1.210646 2.0071456,2.792292 1.9277399,4.496496 0.044036,1.388514 1.5584783,2.053001 2.7640802,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.714012 0.291102,-1.056513 0.644584,-2.129256 0.641543,-3.233776 -0.26812,-1.182495 -1.908089,-1.132589 -2.209115,0.198776 -0.26876,0.946642 -0.365981,1.941262 -0.740551,2.857254 -0.253525,-1.958499 0.188884,-3.950415 -0.127447,-5.905767 0.04525,-1.528018 -2.153907,-1.449921 -2.411142,-0.140805 -0.251524,1.925974 -0.159678,3.881751 -0.400925,5.810037 -0.563883,-2.270808 -0.28889,-4.693484 -1.109574,-6.908379 -0.575162,-1.136295 -2.32306,-0.644964 -2.380125,0.579614 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
     <path
-       inkscape:connector-curvature="0"
        id="path820"
        d="m -12.0625,0.66015625 c -0.698739,0.18127568 -1.331656,0.79041755 -1.371094,1.63671875 v 0.013672 0.013672 c 0.01134,1.1756433 0.0924,2.2946186 0.181641,3.4375 -0.449578,-1.0772468 -0.910985,-2.1751358 -1.265625,-3.2578128 l 0.0098,0.037109 c -0.213752,-0.8706616 -1.017807,-1.3409622 -1.76563,-1.3281246 -0.373911,0.00642 -0.758073,0.1317809 -1.052734,0.4082032 -0.29466,0.2764222 -0.46969,0.7024553 -0.460937,1.1796874 v 0.019531 l 0.0019,0.019531 c 0.154749,1.5777324 0.615886,3.1000247 1.175784,4.5410162 0.576175,1.5159574 1.138616,3.0231956 1.039062,4.5292966 -0.07989,0.470271 -0.362916,0.730463 -0.705078,0.810547 -0.345672,0.08091 -0.750378,-0.01505 -1.091797,-0.462891 l -0.02539,-0.03125 -0.0293,-0.0293 c -0.373704,-0.353142 -0.467524,-0.561929 -0.896484,-1.166012 -0.214481,-0.302041 -0.50916,-0.706808 -0.898438,-1.029297 -0.389278,-0.3224884 -0.96551,-0.5886036 -1.554687,-0.3671874 l -0.03906,0.013672 -0.03711,0.021484 c -0.4559,0.2667591 -0.765427,0.6392684 -0.892579,1.0527344 -0.127152,0.413466 -0.07809,0.829655 0.03516,1.205078 0.222721,0.738347 0.690357,1.390996 0.982422,1.875 0.0011,0.0022 0.0028,0.0037 0.0039,0.0059 0.561462,1.111707 1.336036,2.046692 2.189453,2.890625 l -0.01367,-0.01367 c 1.077278,1.144595 1.86382,2.610155 1.792966,4.130817 l -0.002,0.01953 0.002,0.01953 c 0.02769,0.873239 0.542175,1.548231 1.171875,1.958984 0.6297,0.410754 1.379068,0.608904 2.060547,0.650391 h 0.002 c 1.579712,0.0891 3.21279,0.02295 4.785156,-0.38086 l 0.0078,-0.002 0.0078,-0.002 c 0.487232,-0.143058 0.961438,-0.403695 1.332032,-0.789062 0.370593,-0.385367 0.63356,-0.916516 0.623046,-1.523438 v 0.03906 c 0.236258,-3.942943 2.012498,-7.646163 3.044922,-11.6113285 v -0.00391 C -3.428351,8.1521527 -3.051332,7.0368022 -3.054666,5.8260682 V 5.7714844 L -3.066406,5.71875 C -3.249415,4.9116225 -3.982389,4.4412768 -4.679688,4.4863281 -5.275494,4.5248222 -5.800031,4.9741686 -6.078125,5.6210938 -6.045805,4.7352914 -5.996807,3.9097621 -6.136719,2.984375 -6.125163,2.4875655 -6.307139,2.0425781 -6.615234,1.7597656 -6.925794,1.4746908 -7.325968,1.3490659 -7.716797,1.34375 -8.498454,1.3331182 -9.352973,1.8249624 -9.533203,2.7421875 l -0.0039,0.015625 -0.002,0.015625 c -0.05278,0.4041277 -0.05266,0.7822623 -0.08203,1.1835937 -0.107375,-0.7981063 -0.169123,-1.5977948 -0.46289,-2.390625 l -0.0098,-0.027344 -0.01367,-0.025391 C -10.500285,0.73752895 -11.363761,0.47888057 -12.0625,0.66015625 Z m 0.25,0.96874995 c 0.327629,-0.084998 0.615816,-0.014161 0.798828,0.3300782 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C -8.70016,6.735827 -8.78812,4.7904773 -8.548828,2.9316406 -8.469639,2.5430223 -8.099804,2.3387264 -7.730469,2.34375 c 0.185458,0.00252 0.342359,0.063217 0.439453,0.1523438 0.09709,0.089127 0.167925,0.206397 0.160157,0.46875 l -0.002,0.046875 0.0078,0.046875 C -6.828955,4.8885487 -7.268573,6.874471 -7,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053066 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764884 0.395184,-0.6352244 0.660157,-0.6523438 0.251375,-0.016241 0.449106,0.1022573 0.542968,0.4316406 -0.01505,0.9710696 -0.318057,1.9705536 -0.605468,3.0136719 l -0.002,0.00391 v 0.00195 C -5.678376,12.774915 -7.506052,16.543442 -7.75787,20.746094 l -0.002,0.01953 v 0.01953 c 0.0055,0.318516 -0.117945,0.577694 -0.34375,0.8125 -0.223319,0.232223 -0.551559,0.418326 -0.882812,0.517578 -1.43352,0.367311 -2.960591,0.436603 -4.470703,0.351563 -0.524019,-0.03191 -1.134184,-0.203265 -1.574115,-0.490233 -0.439931,-0.286967 -0.704361,-0.637069 -0.720703,-1.152343 v 0.03906 c 0.08796,-1.887744 -0.86097,-3.586624 -2.0625,-4.863279 l -0.0059,-0.0059 -0.0059,-0.0059 c -0.807393,-0.79834 -1.505397,-1.649441 -2.001952,-2.634684 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322958,-0.54006 -0.748063,-1.170179 -0.902342,-1.681634 -0.07714,-0.255727 -0.08634,-0.461023 -0.03711,-0.621094 0.04425,-0.143897 0.168742,-0.284663 0.398438,-0.435547 0.148565,-0.04428 0.291098,-0.0095 0.531249,0.189453 0.254361,0.210719 0.520624,0.555332 0.722657,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379594,0.989291 2.101562,0.820312 0.726883,-0.170128 1.337555,-0.786297 1.472656,-1.634765 l 0.0019,-0.02149 0.002,-0.02148 c 0.131323,-1.8078 -0.526579,-3.4671485 -1.105463,-4.9902334 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116379 -1.107422,-4.2500062 -7.18e-4,-0.2313914 0.05782,-0.3441971 0.140625,-0.421875 0.0851,-0.079836 0.22003,-0.1338908 0.384765,-0.1367188 0.329471,-0.00566 0.684997,0.1822887 0.779297,0.5664063 l 0.0059,0.017578 0.0059,0.017578 c 0.704593,2.151049 1.712135,4.1379731 2.402343,6.1894533 l 0.974609,-0.15625 c 0.01924,-2.227041 -0.318816,-4.3853297 -0.341775,-6.5078124 0.01905,-0.3764263 0.286845,-0.6247291 0.619141,-0.7109376 z m 5.568359,4.2617188 c -0.0026,0.00904 -0.0033,0.01636 -0.0059,0.025391 -2.2e-4,9.659e-4 -0.0017,9.865e-4 -0.002,0.00195 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.7;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:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.7;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.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <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:0.7;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:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 36.455078,1.1015625 c -0.657515,-0.025842 -1.353006,0.4514359 -1.388672,1.2167969 0.02103,2.1794281 0.362572,4.3446075 0.34375,6.5253906 C 34.704462,6.7462413 33.696458,4.7625164 33.007812,2.6601562 32.699764,1.4053767 30.686393,1.3462201 30.712891,2.7910156 c 0.148468,1.5137205 0.593614,2.9947661 1.144531,4.4121094 0.579646,1.5250885 1.19498,3.114871 1.074219,4.777344 -0.211465,1.328048 -1.80517,1.750258 -2.697266,0.580078 -0.416475,-0.393564 -0.544424,-0.651727 -0.960938,-1.238281 -0.416513,-0.586553 -1.122246,-1.5013905 -1.86914,-1.220704 -1.49767,0.876327 -0.29335,2.450372 0.320312,3.476563 0.529141,1.049899 1.266424,1.94363 2.097657,2.765625 1.139405,1.210646 2.00714,2.79189 1.927734,4.496094 0.04404,1.388514 1.55807,2.053559 2.763672,2.126953 1.546216,0.08721 3.126794,0.01908 4.630859,-0.367188 0.822251,-0.241424 1.611734,-0.89878 1.595703,-1.824218 C 40.98435,16.701293 42.787358,12.966248 43.802734,9.0625 44.093836,8.0059864 44.448353,6.9326448 44.445312,5.828125 44.177193,4.6456298 42.537354,4.6959782 42.236328,6.0273438 41.967568,6.973985 41.870664,7.9687737 41.496094,8.8847656 41.242569,6.9262668 41.683518,4.9338681 41.367188,2.9785156 41.412433,1.450498 39.214266,1.5287748 38.957031,2.8378906 38.705507,4.763864 38.797888,6.7201513 38.556641,8.6484375 37.992758,6.3776292 38.26795,3.9551294 37.447266,1.7402344 37.23158,1.3141238 36.849587,1.1170679 36.455078,1.1015625 Z m -0.03125,0.4941406 c 0.22785,2.006e-4 0.425241,0.1051019 0.5625,0.3632813 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C 39.29984,6.7358274 39.21188,4.7904773 39.451172,2.9316406 39.530361,2.5430223 39.900196,2.3387264 40.269531,2.34375 c 0.185458,0.00252 0.342359,0.063217 0.439453,0.1523438 0.09709,0.089127 0.167925,0.206397 0.160157,0.46875 l -0.002,0.046875 0.0078,0.046875 C 41.171104,4.8885486 40.731427,6.8744709 41,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053067 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764885 0.395184,-0.6352244 0.660157,-0.6523438 0.251375,-0.016241 0.449106,0.1022573 0.542968,0.4316406 -0.01505,0.9710696 -0.318057,1.9705536 -0.605468,3.0136719 l -0.002,0.00391 v 0.00195 C 42.321624,12.774915 40.493948,16.543442 40.24213,20.746094 l -0.002,0.01953 v 0.01953 c 0.0055,0.318516 -0.117945,0.577694 -0.34375,0.8125 -0.223319,0.232223 -0.551559,0.418326 -0.882812,0.517578 -1.43352,0.367311 -2.960591,0.436603 -4.470703,0.351563 C 34.01895,22.434887 33.408681,22.263531 32.96875,21.976562 32.528819,21.689595 32.264389,21.339493 32.248047,20.824219 32.321056,18.952282 31.378689,17.267743 30.185547,16 l -0.0059,-0.0059 -0.0059,-0.0059 C 29.366435,15.189941 28.66843,14.338759 28.171875,13.353516 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322956,-0.540054 -0.748063,-1.170179 -0.902342,-1.681634 -0.07714,-0.255727 -0.08634,-0.461023 -0.03711,-0.621094 0.04425,-0.143897 0.168741,-0.284663 0.398437,-0.435547 0.148566,-0.04428 0.2911,-0.0095 0.53125,0.189453 0.254362,0.210719 0.520624,0.555332 0.722657,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379594,0.989291 2.101562,0.820312 0.726883,-0.170128 1.337556,-0.786297 1.472656,-1.634765 l 0.002,-0.02149 0.0019,-0.02148 C 33.56099,10.207825 32.903082,8.5484755 32.324198,7.0253906 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116317 -1.107422,-4.25 -7.18e-4,-0.2313914 0.05782,-0.3441971 0.140625,-0.421875 0.0851,-0.079836 0.22003,-0.1338908 0.384765,-0.1367188 0.329471,-0.00566 0.684997,0.1822887 0.779297,0.5664063 l 0.0059,0.017578 0.0059,0.017578 c 0.704593,2.151049 1.712136,4.1379729 2.402344,6.1894531 l 0.974609,-0.15625 C 35.929397,6.6206215 35.591319,4.4623326 35.56836,2.33985 c 0.01905,-0.3764264 0.286845,-0.6247291 0.619141,-0.7109376 0.08191,-0.021249 0.160378,-0.03327 0.236328,-0.033203 z"
-       id="path825"
-       inkscape:connector-curvature="0" />
+       id="path825" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-off-small.svg
index 76016bf46..7361523db 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-off-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-bar-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,32 +56,30 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="9"
        height="9"
        x="3.5"
        y="11.5" />
     <rect
-       style="opacity:1;fill:#d03030;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"
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;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"
        id="rect2095"
        width="1"
        height="8"
        x="5"
        y="12" />
     <rect
-       style="opacity:1;fill:#3030d0;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"
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;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"
        id="rect2097"
        width="1"
        height="8"
        x="7"
        y="12" />
     <rect
-       style="opacity:1;fill:#30d043;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"
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;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"
        id="rect2099"
        width="1"
        height="8"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-on-small.svg
index 858569703..c8e8f10cf 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-bar-on-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-bar-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="4.4827586"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,32 +56,30 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
        x="1.5"
        y="9.5" />
     <rect
-       style="opacity:1;fill:#d03030;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"
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;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"
        id="rect2095"
        width="2"
        height="12"
        x="3"
        y="10" />
     <rect
-       style="opacity:1;fill:#3030d0;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"
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;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"
        id="rect2097"
        width="2"
        height="12"
        x="7"
        y="10" />
     <rect
-       style="opacity:1;fill:#30d043;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"
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;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"
        id="rect2099"
        width="2"
        height="12"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-off-small.svg
index e78f3c19c..25e32d489 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-off-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-blue-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#3030d0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="9"
        height="9"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-on-small.svg
index d0bbe35db..2bb147344 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-blue-on-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-blue-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#3030d0;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-ellipsis-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-ellipsis-small.svg
index 4fdb17907..ce5418ca3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-ellipsis-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-ellipsis-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   sodipodi:docname="histogram-ellipsis-small.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 16 16"
    height="16"
-   width="16">
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1041"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="6.2923433"
-     inkscape:cx="3.5003527"
-     inkscape:zoom="33.366433"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="7"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,8 +54,6 @@
   </metadata>
   <g
      transform="translate(0,-8)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <rect
        y="10"
@@ -105,28 +61,28 @@
        height="12"
        width="12"
        id="rect896"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
        y="9.5"
        x="1.5"
        height="13.000001"
        width="13"
        id="rect849"
-       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <circle
-       style="fill:#2a7fff;fill-opacity:1;stroke-linecap:square"
+       style="fill:#cccccc;fill-opacity:1.0;stroke-linecap:square"
        id="path852"
        cx="4.5"
        cy="16"
        r="1.5" />
     <circle
-       style="fill:#2a7fff;fill-opacity:1;stroke-linecap:square"
+       style="fill:#cccccc;fill-opacity:1.0;stroke-linecap:square"
        id="path852-5"
        cx="8"
        cy="16"
        r="1.5" />
     <circle
-       style="fill:#2a7fff;fill-opacity:1;stroke-linecap:square"
+       style="fill:#cccccc;fill-opacity:1.0;stroke-linecap:square"
        id="path852-6"
        cx="11.5"
        cy="16"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-off-small.svg
index ed7d82521..f5ce821fe 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-off-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-gold-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#ffcc00;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="9"
        height="9"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-on-small.svg
index 601a15165..75b974fc1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-gold-on-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-gold-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#ffcc00;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-green-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-green-off-small.svg
index 462b1b45f..f9bd73c74 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-green-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-green-off-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-green-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#30d043;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="9"
        height="9"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-green-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-green-on-small.svg
index 6c06531c6..b8b28dce0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-green-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-green-on-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-green-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#30d043;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-linear-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-linear-small.svg
index 52b914762..5517f2fff 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-linear-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-linear-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-mode-linear-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,23 +56,21 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
        x="1.5"
        y="9.5" />
     <path
-       style="opacity:0.3;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"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;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"
        d="M 14 2 L 2 2 L 2 14 L 14 2 z "
        id="path1514"
        transform="translate(0,8)" />
     <path
-       style="opacity:1;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"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;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"
        d="M 14 2 L 2 14 L 14 14 L 14 2 z "
        id="rect3013"
        transform="translate(0,8)" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logx-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logx-small.svg
index 0eb016d00..cc1574aed 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logx-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logx-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-mode-logx-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,23 +56,21 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
        x="1.5"
        y="9.5" />
     <path
-       style="opacity:1;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"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;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"
        d="M 14 2 C 12.5 2 11.1875 2.1875 10.039062 2.515625 C 8.890625 2.84375 7.90625 3.3125 7.0625 3.875 C 6.21875 4.4375 5.515625 5.09375 4.9296875 5.796875 C 4.34375 6.5 3.875 7.25 3.5 8 C 2.75 9.5 2.375 11 2.1875 12.125 C 2 13.25 2 14 2 14 L 14 14 L 14 2 z "
        id="path1519"
        transform="translate(0,8)" />
     <path
-       style="opacity:0.3;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"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;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"
        d="M 2 2 L 2 14 C 2 14 2 13.25 2.1875 12.125 C 2.375 11 2.75 9.5 3.5 8 C 3.875 7.25 4.34375 6.5 4.9296875 5.796875 C 5.515625 5.09375 6.21875 4.4375 7.0625 3.875 C 7.90625 3.3125 8.890625 2.84375 10.039062 2.515625 C 11.1875 2.1875 12.5 2 14 2 L 2 2 z "
        id="rect3013"
        transform="translate(0,8)" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logxy-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logxy-small.svg
index e0b69c4e5..7f72b1e55 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logxy-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-mode-logxy-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-mode-logxy-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,23 +56,21 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
        x="1.5"
        y="9.5" />
     <path
-       style="opacity:1;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"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;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"
        d="M 14 8 C 12.5 8 11 8.375 9.59375 8.9375 C 8.1875 9.5 6.875 10.25 5.75 11 C 3.5 12.5 2 14 2 14 L 14 14 L 14 8 z "
        id="path1543"
        transform="translate(0,8)" />
     <path
-       style="opacity:0.3;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"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;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"
        d="M 2 2 L 2 14 C 2 14 3.5 12.5 5.75 11 C 6.875 10.25 8.1875 9.5 9.59375 8.9375 C 11 8.375 12.5 8 14 8 L 14 2 L 2 2 z "
        id="rect3013"
        transform="translate(0,8)" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-red-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-red-off-small.svg
index ec4200483..60b67ddec 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-red-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-red-off-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-red-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#d03030;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="9"
        height="9"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-red-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-red-on-small.svg
index 082813853..b4332df2d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-red-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-red-on-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-red-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#d03030;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-off-small.svg
index 200bbd0b7..2ab5e6d4d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-off-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-silver-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#c0c0c0;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#c0c0c0;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="9"
        height="9"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-on-small.svg
index 414d5f4f0..bccfc0c4f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-silver-on-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-silver-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,11 +56,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:#c0c0c0;fill-opacity:0.94495416;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#c0c0c0;fill-opacity:0.94495416;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-raw-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-raw-small.svg
index d9ef178a5..ce288375e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-raw-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-raw-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="histogram-bayer-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,18 +56,16 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:none;fill-opacity:0.94495413;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect937"
        width="13"
        height="13"
        x="1.4999999"
        y="9.5" />
     <rect
-       style="opacity:1;fill:#30d043;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"
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;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="rect1869"
        width="6"
        height="6"
@@ -120,16 +77,16 @@
        height="6"
        width="6"
        id="rect1871"
-       style="opacity:1;fill:#d03030;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" />
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;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" />
     <rect
        y="16"
        x="8"
        height="6"
        width="6"
        id="rect2416"
-       style="opacity:1;fill:#30d043;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" />
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;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" />
     <rect
-       style="opacity:1;fill:#3030d0;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"
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;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="rect2418"
        width="6"
        height="6"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-small.svg
index 1d2f6547e..f8399c527 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-histogram-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="16"
    height="16"
    viewBox="0 0 16 16"
    version="1.1"
    id="SVGRoot"
-   inkscape:export-filename="/tmp/template.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="histogram-type-histogram-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="27.621949"
-     inkscape:cx="7.1257597"
-     inkscape:cy="9.4855375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1041"
-     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:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,23 +54,20 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 2,22 c 0,0 1.5857864,-4 3,-4 1.4142136,0 2,2 3,2 1,0 1,-10 2.5,-10 1.5,0 2.5,12 2.5,12 z"
-       id="path851"
-       sodipodi:nodetypes="cszzcc" />
+       id="path851" />
     <rect
        y="10"
        x="2"
        height="12"
        width="12"
        id="rect1467"
-       style="opacity:0.3;fill:#2a7fff;stroke-linecap:square;fill-opacity:1" />
+       style="opacity:0.3;fill:#cccccc;stroke-linecap:square;fill-opacity:1.0" />
     <rect
-       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="rect849"
        width="13"
        height="13.000001"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-parade-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-parade-small.svg
index f299f8ab2..210336c5f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-parade-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-parade-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="16"
    height="16"
    viewBox="0 0 16 16"
    version="1.1"
    id="SVGRoot"
-   inkscape:export-filename="/tmp/template.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="histogram-type-parade-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.672054"
-     inkscape:cx="6.4865394"
-     inkscape:cy="9.5260087"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1041"
-     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:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -62,7 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Lawrence Lee</dc:title>
@@ -96,11 +54,9 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect896"
        width="12"
        height="12"
@@ -109,10 +65,10 @@
     <path
        transform="translate(0,8)"
        d="M 11 4.0234375 C 10.691576 4.0252479 10.345351 4.1582074 10 4.3535156 L 10 11.367188 C 12.008913 10.233429 14 8.0234375 14 8.0234375 L 14 6 C 14 6 12.197351 4.0164165 11 4.0234375 z "
-       style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#0000ff;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="path894" />
     <rect
-       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="rect849"
        width="13"
        height="13.000001"
@@ -121,12 +77,12 @@
     <path
        transform="translate(0,8)"
        d="M 2 6 L 2 8.0234375 C 2 8.0234375 3.9910868 10.233429 6 11.367188 L 6 7.6972656 C 5.6537675 7.8922018 5.3071207 8.0252714 5 8.0234375 C 3.7936541 8.0162345 2 6 2 6 z "
-       style="fill:#fd0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#fd0000;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="path834" />
     <path
        transform="translate(0,8)"
        d="M 10 4.3535156 C 8.9719096 4.9349372 7.9511719 6.0839844 7.9511719 6.0839844 C 7.9511719 6.0839844 6.9807951 7.1450573 6 7.6972656 L 6 11.367188 C 6.6915471 11.757472 7.3844485 12.023438 8 12.023438 C 8.6155516 12.023438 9.3084528 11.757472 10 11.367188 L 10 4.3535156 z "
-       style="fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#00ff00;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="path844" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hc-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hc-small.svg
index ef2e8b51f..056197557 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hc-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hc-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   sodipodi:docname="histogram-type-vectorscope-hc-small.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 16 16"
    height="16"
-   width="16">
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1041"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="8.3797862"
-     inkscape:cx="7.2745301"
-     inkscape:zoom="42.234842"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="7"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -62,7 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Lawrence Lee</dc:title>
@@ -96,8 +54,6 @@
   </metadata>
   <g
      transform="translate(0,-8)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <rect
        y="10"
@@ -105,19 +61,19 @@
        height="12"
        width="12"
        id="rect896"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <circle
        r="5.5"
        cy="16"
        cx="8"
        id="path1487"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path1489"
        d="m 2.5,16 h 11"
-       style="fill:none;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0" />
     <path
-       style="fill:none;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 8.0000001,10.5 -2e-7,11"
        id="path1489-2" />
     <rect
@@ -126,6 +82,6 @@
        height="13.000001"
        width="13"
        id="rect849"
-       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hs-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hs-small.svg
index 62bbf9586..46901f74c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hs-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-vectorscope-hs-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   sodipodi:docname="histogram-type-vectorscope-hs-small.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 16 16"
    height="16"
-   width="16">
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1041"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="9.5260087"
-     inkscape:cx="6.4865394"
-     inkscape:zoom="26.672054"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="7"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -62,7 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Lawrence Lee</dc:title>
@@ -96,8 +54,6 @@
   </metadata>
   <g
      transform="translate(0,-8)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <rect
        y="10"
@@ -105,23 +61,23 @@
        height="12"
        width="12"
        id="rect896"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <circle
        r="5.5"
        cy="16"
        cx="8"
        id="path1487"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#2a7fff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path1489"
        d="m 2.5,16 h 11"
-       style="fill:none;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0" />
     <path
-       style="fill:none;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 5.25,11.23686 5.5,9.52628"
        id="path1489-2" />
     <path
-       style="fill:none;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0"
        d="m 5.25,20.76314 5.5,-9.52628"
        id="path1489-7" />
     <rect
@@ -130,6 +86,6 @@
        height="13.000001"
        width="13"
        id="rect849"
-       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-waveform-small.svg b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-waveform-small.svg
index 5147ab2fc..1ea706e50 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/histogram-type-waveform-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/histogram-type-waveform-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
-   sodipodi:docname="histogram-type-waveform-small.svg"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 16 16"
    height="16"
-   width="16">
-  <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1041"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="9.5260087"
-     inkscape:cx="6.4865394"
-     inkscape:zoom="26.672054"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="7"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -62,7 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Lawrence Lee</dc:title>
@@ -96,27 +54,24 @@
   </metadata>
   <g
      transform="translate(0,-8)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       sodipodi:nodetypes="caccacacc"
        id="path894"
        d="m 2,16.024327 c 0,0 3.5962991,4 6,4 2.403701,0 6,-4 6,-4 V 14 c 0,0 -1.802649,-1.982694 -3,-1.975673 -1.2265841,0.0072 -3.0492981,2.059811 -3.0492981,2.059811 0,0 -1.7735807,1.947218 -2.9507019,1.940189 C 3.7936541,16.017124 2,14 2,14 Z"
-       style="fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <rect
        y="10"
        x="2"
        height="12"
        width="12"
        id="rect896"
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
        y="9.5"
        x="1.5"
        height="13.000001"
        width="13"
        id="rect849"
-       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:none;fill-opacity:0.3;stroke:#000000;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/info.svg b/rtdata/icons/rawtherapee/scalable/apps/info.svg
index 8805fcad4..e18ec4f98 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/info.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/info.svg
@@ -2,57 +2,16 @@
 <!-- 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="info.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.7628231"
-     inkscape:cy="12.095607"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,23 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 12 1 A 11 11 0 0 0 1 12 A 11 11 0 0 0 12 23 A 11 11 0 0 0 23 12 A 11 11 0 0 0 12 1 z M 11.839844 5 C 12.328216 5 12.747958 5.1626998 13.097656 5.4882812 C 13.447355 5.8138627 13.621094 6.2058368 13.621094 6.6640625 C 13.621094 7.1222882 13.443618 7.5142623 13.087891 7.8398438 C 12.738192 8.1593959 12.322187 8.3183594 11.839844 8.3183594 C 11.351472 8.3183594 10.929947 8.1593959 10.574219 7.8398438 C 10.22452 7.5142623 10.048828 7.1222882 10.048828 6.6640625 C 10.048828 6.2058368 10.22452 5.8138627 10.574219 5.4882812 C 10.929947 5.1626998 11.351472 5 11.839844 5 z M 13.431641 9.9199219 L 13.566406 10.054688 L 13.566406 17.236328 C 13.566406 17.447353 13.612686 17.628565 13.703125 17.779297 C 13.793564 17.924 13.922977 18.033117 14.091797 18.105469 C 14.212383 18.159732 14.345532 18.207795 14.490234 18.25 C 14.634937 18.292205 14.784645 18.321756 14.941406 18.339844 L 14.941406 19 L 9.2265625 19 L 9.2265625 18.339844 C 9.3833239 18.327785 9.5367679 18.31301 9.6875 18.294922 C 9.8382321 18.276834 9.9676447 18.247283 10.076172 18.205078 C 10.269109 18.132727 10.404041 18.029129 10.482422 17.896484 C 10.560803 17.757811 10.601562 17.576599 10.601562 17.353516 L 10.601562 12.089844 C 10.601562 11.878819 10.5535 11.695824 10.457031 11.539062 C 10.360563 11.376272 10.238453 11.246859 10.09375 11.150391 C 9.9852229 11.078039 9.8207398 11.007728 9.5976562 10.941406 C 9.380602 10.875084 9.1808786 10.832541 9 10.814453 L 9 10.154297 L 13.431641 9.9199219 z "
        id="path944" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.52196503px;line-height:125%;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.522px;line-height:125%;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="-11.29845"
        y="19"
        id="text821"><tspan
-         sodipodi:role="line"
          id="tspan819"
          x="-11.29845"
          y="19"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.52196503px;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';fill:#ffffff;stroke-width:1px">i</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.522px;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';fill:#ffffff;fill-opacity:1;stroke-width:1px">i</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/intent-absolute.svg b/rtdata/icons/rawtherapee/scalable/apps/intent-absolute.svg
index 055759ad1..ba059358e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/intent-absolute.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/intent-absolute.svg
@@ -2,67 +2,16 @@
 <!-- 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="intent-absolute.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="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-page="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,192 +55,142 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path1107"
        d="m -59,12 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1109"
        d="m -59,15 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1111"
        d="m -59,2 c 11.363813,0 11.510234,7 22,7"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1113"
        d="m -59,5 c 11.363813,0 11.510234,4 22,4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1115"
        d="m -59,9 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1117"
        d="m -59,22 c 11.253256,0 11.129729,-4 22,-4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1119"
        d="m -59,18 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <g
        id="g1221"
        transform="translate(0,-62)">
       <path
-         inkscape:connector-curvature="0"
          id="path1125"
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23 M 1,22 c 11.253256,0 11.129729,-4 22,-4 M 1,9 H 23 M 1,5 C 12.363813,5 12.510234,9 23,9 M 1,2 C 12.363813,2 12.510234,9 23,9 M 1,15 H 23 M 1,12 h 22" />
       <path
-         inkscape:connector-curvature="0"
          id="path5189"
          d="M 1,1 V 3 C 5.0019761,3 7.3333707,3.952805 9.4355469,5.09375 7.2857511,4.497496 4.8056458,4 1,4 v 2 c 5.564575,0 8.2278861,0.944263 10.988281,1.941406 0.05775,0.02086 0.131579,0.03769 0.189453,0.05859 H 23 c -1.516305,0 -2.457648,-0.209633 -3.582031,-0.351563 C 16.68202,7.091891 14.873049,5.926015 12.861328,4.654293 10.082981,2.897947 6.8872366,1 1,1 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
          id="path1165"
          d="m 11.996094,19 c -0.05896,0.02154 -0.136546,0.03906 -0.195313,0.06055 C 9.069758,20.059251 6.5081438,21 1,21 v 2 C 6.7451122,23 9.7482335,21.940746 12.486328,20.939453 15.224423,19.93816 17.687523,19 23,19 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,14 H 83"
-       id="path1194"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1194" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,2 C 72.363813,2 72.510234,9 83,9"
-       id="path1196"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1196" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,6 C 72.363813,6 72.510234,9 83,9"
-       id="path1198"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1198" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,10 H 83"
-       id="path1200"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1200" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 61,22 c 11.253256,0 11.129729,-4 22,-4"
-       id="path1202"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1202" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,18 H 83"
-       id="path1204"
-       inkscape:connector-curvature="0" />
+       id="path1204" />
     <g
        id="g1232"
        transform="translate(-40,34)">
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,14 H 23"
-         id="path1206"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1206" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,2 C 12.363813,2 12.510234,9 23,9"
-         id="path1208"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1208" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,6 C 12.363813,6 12.510234,9 23,9"
-         id="path1210"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1210" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,10 H 23"
-         id="path1212"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1212" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 1,22 c 11.253256,0 11.129729,-4 22,-4"
-         id="path1214"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1214" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23"
-         id="path1216"
-         inkscape:connector-curvature="0" />
+         id="path1216" />
     </g>
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 1 3 L 1 5 C 6.0347647 5 8.8844267 5.6400689 11.414062 6.3144531 C 8.6840291 4.5766854 6.2566174 3 1 3 z M 1 7 L 1 21 C 6.4393939 21 9.070313 20.515625 11.820312 20.015625 C 14.570313 19.515625 17.439394 19 23 19 L 23 10 C 17.409091 10 14.486328 9.2148438 11.736328 8.4648438 C 8.9863283 7.7148436 6.4090909 7 1 7 z "
        id="path1273" />
     <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: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:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 1,11 v 2 h 22 v -2 z"
-       id="path1234"
-       inkscape:connector-curvature="0" />
+       id="path1234" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1255"
        d="m 1,41 c 11,0 11,8 22,8 V 60 C 12,60 12,63 1,63 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
        id="path1257"
        d="M 1,52 H 23"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1263"
        d="m 1,-25 c 21,0 1,8 22,8 V -6 C 2,-6 22,-3 1,-3 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1265"
        d="m 1,-14 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path1318"
        d="M 41,41 V 63 H 51.666016 L 53,61 H 63 V 48 H 53 l -2,-7 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1320"
        d="m 41,52 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1 1 L 1 3 C 6.2566174 3 8.684029 4.5766854 11.414062 6.3144531 C 8.8844262 5.6400689 6.0347647 5 1 5 L 1 7 C 6.4090909 7 8.9863282 7.7148437 11.736328 8.4648438 C 14.486328 9.2148438 17.409091 10 23 10 L 23 8 C 17.712121 8 15.287109 6.40625 12.537109 4.65625 C 9.7871098 2.90625 6.7121212 1 1 1 z "
        id="path1322" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 23,19 C 17.439394,19 14.570312,19.515625 11.820312,20.015625 9.0703125,20.515625 6.4393939,21 1,21 v 2 C 6.5606061,23 9.4296875,22.484375 12.179688,21.984375 14.929688,21.484375 17.560606,21 23,21 Z"
-       id="path1326"
-       inkscape:connector-curvature="0" />
+       id="path1326" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/intent-perceptual.svg b/rtdata/icons/rawtherapee/scalable/apps/intent-perceptual.svg
index 2e845cd39..4640e737f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/intent-perceptual.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/intent-perceptual.svg
@@ -2,67 +2,16 @@
 <!-- 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="intent-perceptual.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="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-page="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,198 +55,146 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path1107"
        d="m -59,12 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1109"
        d="m -59,15 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1111"
        d="m -59,2 c 11.363813,0 11.510234,7 22,7"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1113"
        d="m -59,5 c 11.363813,0 11.510234,4 22,4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1115"
        d="m -59,9 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1117"
        d="m -59,22 c 11.253256,0 11.129729,-4 22,-4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1119"
        d="m -59,18 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <g
        id="g1221"
        transform="translate(0,-62)">
       <path
-         inkscape:connector-curvature="0"
          id="path1125"
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23 M 1,22 c 11.253256,0 11.129729,-4 22,-4 M 1,9 H 23 M 1,5 C 12.363813,5 12.510234,9 23,9 M 1,2 C 12.363813,2 12.510234,9 23,9 M 1,15 H 23 M 1,12 h 22" />
       <path
-         inkscape:connector-curvature="0"
          id="path5189"
          d="M 1,1 V 3 C 5.0019761,3 7.3333707,3.952805 9.4355469,5.09375 7.2857511,4.497496 4.8056458,4 1,4 v 2 c 5.564575,0 8.2278861,0.944263 10.988281,1.941406 0.05775,0.02086 0.131579,0.03769 0.189453,0.05859 H 23 c -1.516305,0 -2.457648,-0.209633 -3.582031,-0.351563 C 16.68202,7.091891 14.873049,5.926015 12.861328,4.654293 10.082981,2.897947 6.8872366,1 1,1 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
          id="path1165"
          d="m 11.996094,19 c -0.05896,0.02154 -0.136546,0.03906 -0.195313,0.06055 C 9.069758,20.059251 6.5081438,21 1,21 v 2 C 6.7451122,23 9.7482335,21.940746 12.486328,20.939453 15.224423,19.93816 17.687523,19 23,19 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,14 H 83"
-       id="path1194"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1194" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,2 C 72.363813,2 72.510234,9 83,9"
-       id="path1196"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1196" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,6 C 72.363813,6 72.510234,9 83,9"
-       id="path1198"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1198" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,10 H 83"
-       id="path1200"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1200" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 61,22 c 11.253256,0 11.129729,-4 22,-4"
-       id="path1202"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1202" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,18 H 83"
-       id="path1204"
-       inkscape:connector-curvature="0" />
+       id="path1204" />
     <g
        id="g1232"
        transform="translate(-40,34)">
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,14 H 23"
-         id="path1206"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1206" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,2 C 12.363813,2 12.510234,9 23,9"
-         id="path1208"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1208" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,6 C 12.363813,6 12.510234,9 23,9"
-         id="path1210"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1210" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,10 H 23"
-         id="path1212"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1212" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 1,22 c 11.253256,0 11.129729,-4 22,-4"
-         id="path1214"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1214" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23"
-         id="path1216"
-         inkscape:connector-curvature="0" />
+         id="path1216" />
     </g>
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 3.8046875 1.109375 C 4.0992332 1.1311556 4.407502 1.147645 4.6855469 1.1757812 C 4.4087628 1.147262 4.0993556 1.1313909 3.8046875 1.109375 z M 1 3 L 1 5 C 6.6212121 5 9.5917967 6.0605469 12.341797 7.0605469 C 15.091797 8.0605469 17.621212 9 23 9 L 23 7 C 17.378788 7 14.408203 5.9394531 11.658203 4.9394531 C 8.9082034 3.9394531 6.3787879 3 1 3 z M 19.416016 4.8339844 C 19.696817 4.8624753 20.011603 4.8787947 20.3125 4.9003906 C 20.011497 4.879003 19.698476 4.8621148 19.416016 4.8339844 z M 1 7 L 1 21 C 6.4393939 21 9.070313 20.515625 11.820312 20.015625 C 14.570313 19.515625 17.439394 19 23 19 L 23 11 C 17.378788 11 14.408203 9.9394531 11.658203 8.9394531 C 8.9082033 7.9394531 6.3787879 7 1 7 z "
        id="path1273" />
     <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: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:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 1,11 v 2 c 5.4090909,0 7.9863281,0.714844 10.736328,1.464844 C 14.486328,15.214844 17.409091,16 23,16 V 14 C 17.590909,14 15.013672,13.285156 12.263672,12.535156 9.5136719,11.785156 6.5909091,11 1,11 Z"
-       id="path1234"
-       inkscape:connector-curvature="0" />
+       id="path1234" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1255"
        d="m 1,41 c 11,0 11,8 22,8 V 60 C 12,60 12,63 1,63 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
        id="path1257"
        d="M 1,52 H 23"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1263"
        d="m 1,-25 c 21,0 1,8 22,8 V -6 C 2,-6 22,-3 1,-3 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1265"
        d="m 1,-14 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path1318"
        d="M 41,41 V 63 H 51.666016 L 53,61 H 63 V 48 H 53 l -2,-7 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1320"
        d="m 41,52 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1,1 V 3 C 6.3787879,3 8.9082031,3.9394531 11.658203,4.9394531 14.408203,5.9394531 17.378788,7 23,7 V 5 C 17.621212,5 15.091797,4.0605469 12.341797,3.0605469 9.5917969,2.0605469 6.6212121,1 1,1 Z"
-       id="path1322"
-       inkscape:connector-curvature="0" />
+       id="path1322" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1,5 V 7 C 6.3787879,7 8.9082031,7.9394531 11.658203,8.9394531 14.408203,9.9394531 17.378788,11 23,11 V 9 C 17.621212,9 15.091797,8.0605469 12.341797,7.0605469 9.5917969,6.0605469 6.6212121,5 1,5 Z"
-       id="path1324"
-       inkscape:connector-curvature="0" />
+       id="path1324" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 23,19 C 17.439394,19 14.570312,19.515625 11.820312,20.015625 9.0703125,20.515625 6.4393939,21 1,21 v 2 C 6.5606061,23 9.4296875,22.484375 12.179688,21.984375 14.929688,21.484375 17.560606,21 23,21 Z"
-       id="path1326"
-       inkscape:connector-curvature="0" />
+       id="path1326" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/intent-relative.svg b/rtdata/icons/rawtherapee/scalable/apps/intent-relative.svg
index 04e553796..0ba10bbf8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/intent-relative.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/intent-relative.svg
@@ -2,67 +2,16 @@
 <!-- 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="intent-relative.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-page="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,192 +55,142 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path1107"
        d="m -59,12 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1109"
        d="m -59,15 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1111"
        d="m -59,2 c 11.363813,0 11.510234,7 22,7"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1113"
        d="m -59,5 c 11.363813,0 11.510234,4 22,4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1115"
        d="m -59,9 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1117"
        d="m -59,22 c 11.253256,0 11.129729,-4 22,-4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1119"
        d="m -59,18 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <g
        id="g1221"
        transform="translate(0,-62)">
       <path
-         inkscape:connector-curvature="0"
          id="path1125"
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23 M 1,22 c 11.253256,0 11.129729,-4 22,-4 M 1,9 H 23 M 1,5 C 12.363813,5 12.510234,9 23,9 M 1,2 C 12.363813,2 12.510234,9 23,9 M 1,15 H 23 M 1,12 h 22" />
       <path
-         inkscape:connector-curvature="0"
          id="path5189"
          d="M 1,1 V 3 C 5.0019761,3 7.3333707,3.952805 9.4355469,5.09375 7.2857511,4.497496 4.8056458,4 1,4 v 2 c 5.564575,0 8.2278861,0.944263 10.988281,1.941406 0.05775,0.02086 0.131579,0.03769 0.189453,0.05859 H 23 c -1.516305,0 -2.457648,-0.209633 -3.582031,-0.351563 C 16.68202,7.091891 14.873049,5.926015 12.861328,4.654293 10.082981,2.897947 6.8872366,1 1,1 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
          id="path1165"
          d="m 11.996094,19 c -0.05896,0.02154 -0.136546,0.03906 -0.195313,0.06055 C 9.069758,20.059251 6.5081438,21 1,21 v 2 C 6.7451122,23 9.7482335,21.940746 12.486328,20.939453 15.224423,19.93816 17.687523,19 23,19 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,14 H 83"
-       id="path1194"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1194" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,2 C 72.363813,2 72.510234,9 83,9"
-       id="path1196"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1196" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,6 C 72.363813,6 72.510234,9 83,9"
-       id="path1198"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1198" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,10 H 83"
-       id="path1200"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1200" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 61,22 c 11.253256,0 11.129729,-4 22,-4"
-       id="path1202"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1202" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,18 H 83"
-       id="path1204"
-       inkscape:connector-curvature="0" />
+       id="path1204" />
     <g
        id="g1232"
        transform="translate(-40,34)">
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,14 H 23"
-         id="path1206"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1206" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,2 C 12.363813,2 12.510234,9 23,9"
-         id="path1208"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1208" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,6 C 12.363813,6 12.510234,9 23,9"
-         id="path1210"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1210" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,10 H 23"
-         id="path1212"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1212" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 1,22 c 11.253256,0 11.129729,-4 22,-4"
-         id="path1214"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1214" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23"
-         id="path1216"
-         inkscape:connector-curvature="0" />
+         id="path1216" />
     </g>
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 1 3 L 1 5 C 6.0347647 5 8.8844267 5.6400689 11.414062 6.3144531 C 8.6840291 4.5766854 6.2566174 3 1 3 z M 1 7 L 1 21 C 6.4393939 21 9.070313 20.515625 11.820312 20.015625 C 14.570313 19.515625 17.439394 19 23 19 L 23 10 C 17.409091 10 14.486328 9.2148438 11.736328 8.4648438 C 8.9863283 7.7148436 6.4090909 7 1 7 z "
        id="path1273" />
     <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: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:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 1,11 v 2 c 5.4090909,0 7.9863281,0.714844 10.736328,1.464844 C 14.486328,15.214844 17.409091,16 23,16 V 14 C 17.590909,14 15.013672,13.285156 12.263672,12.535156 9.5136719,11.785156 6.5909091,11 1,11 Z"
-       id="path1234"
-       inkscape:connector-curvature="0" />
+       id="path1234" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1255"
        d="m 1,41 c 11,0 11,8 22,8 V 60 C 12,60 12,63 1,63 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
        id="path1257"
        d="M 1,52 H 23"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1263"
        d="m 1,-25 c 21,0 1,8 22,8 V -6 C 2,-6 22,-3 1,-3 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1265"
        d="m 1,-14 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path1318"
        d="M 41,41 V 63 H 51.666016 L 53,61 H 63 V 48 H 53 l -2,-7 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1320"
        d="m 41,52 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1 1 L 1 3 C 6.2566174 3 8.684029 4.5766854 11.414062 6.3144531 C 8.8844262 5.6400689 6.0347647 5 1 5 L 1 7 C 6.4090909 7 8.9863282 7.7148437 11.736328 8.4648438 C 14.486328 9.2148438 17.409091 10 23 10 L 23 8 C 17.712121 8 15.287109 6.40625 12.537109 4.65625 C 9.7871098 2.90625 6.7121212 1 1 1 z "
        id="path1322" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 23,19 C 17.439394,19 14.570312,19.515625 11.820312,20.015625 9.0703125,20.515625 6.4393939,21 1,21 v 2 C 6.5606061,23 9.4296875,22.484375 12.179688,21.984375 14.929688,21.484375 17.560606,21 23,21 Z"
-       id="path1326"
-       inkscape:connector-curvature="0" />
+       id="path1326" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/intent-saturation.svg b/rtdata/icons/rawtherapee/scalable/apps/intent-saturation.svg
index 569c54962..4ffd0c108 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/intent-saturation.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/intent-saturation.svg
@@ -2,67 +2,16 @@
 <!-- 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="intent-saturation.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-page="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -106,200 +55,146 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path1107"
        d="m -59,12 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1109"
        d="m -59,15 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1111"
        d="m -59,2 c 11.363813,0 11.510234,7 22,7"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1113"
        d="m -59,5 c 11.363813,0 11.510234,4 22,4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1115"
        d="m -59,9 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1117"
        d="m -59,22 c 11.253256,0 11.129729,-4 22,-4"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path1119"
        d="m -59,18 h 22"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <g
        id="g1221"
        transform="translate(0,-62)">
       <path
-         inkscape:connector-curvature="0"
          id="path1125"
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23 M 1,22 c 11.253256,0 11.129729,-4 22,-4 M 1,9 H 23 M 1,5 C 12.363813,5 12.510234,9 23,9 M 1,2 C 12.363813,2 12.510234,9 23,9 M 1,15 H 23 M 1,12 h 22" />
       <path
-         inkscape:connector-curvature="0"
          id="path5189"
          d="M 1,1 V 3 C 5.0019761,3 7.3333707,3.952805 9.4355469,5.09375 7.2857511,4.497496 4.8056458,4 1,4 v 2 c 5.564575,0 8.2278861,0.944263 10.988281,1.941406 0.05775,0.02086 0.131579,0.03769 0.189453,0.05859 H 23 c -1.516305,0 -2.457648,-0.209633 -3.582031,-0.351563 C 16.68202,7.091891 14.873049,5.926015 12.861328,4.654293 10.082981,2.897947 6.8872366,1 1,1 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
          id="path1165"
          d="m 11.996094,19 c -0.05896,0.02154 -0.136546,0.03906 -0.195313,0.06055 C 9.069758,20.059251 6.5081438,21 1,21 v 2 C 6.7451122,23 9.7482335,21.940746 12.486328,20.939453 15.224423,19.93816 17.687523,19 23,19 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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,14 H 83"
-       id="path1194"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1194" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,2 C 72.363813,2 72.510234,9 83,9"
-       id="path1196"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1196" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,6 C 72.363813,6 72.510234,9 83,9"
-       id="path1198"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1198" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,10 H 83"
-       id="path1200"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1200" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 61,22 c 11.253256,0 11.129729,-4 22,-4"
-       id="path1202"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path1202" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 61,18 H 83"
-       id="path1204"
-       inkscape:connector-curvature="0" />
+       id="path1204" />
     <g
        id="g1232"
        transform="translate(-40,34)">
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,14 H 23"
-         id="path1206"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1206" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,2 C 12.363813,2 12.510234,9 23,9"
-         id="path1208"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1208" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,6 C 12.363813,6 12.510234,9 23,9"
-         id="path1210"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1210" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,10 H 23"
-         id="path1212"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1212" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 1,22 c 11.253256,0 11.129729,-4 22,-4"
-         id="path1214"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path1214" />
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 1,18 H 23"
-         id="path1216"
-         inkscape:connector-curvature="0" />
+         id="path1216" />
     </g>
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 2.9882812 1.046875 C 3.5811625 1.0762572 4.1371152 1.1223535 4.6679688 1.1757812 C 4.1365877 1.1222493 3.5818169 1.0762897 2.9882812 1.046875 z M 5.1289062 1.2304688 C 5.4889909 1.2724819 5.8435264 1.3154816 6.1777344 1.3671875 C 5.8434796 1.3154241 5.4890447 1.2725302 5.1289062 1.2304688 z M 6.6738281 1.453125 C 6.9767471 1.5059399 7.2749026 1.5613943 7.5585938 1.6210938 C 7.2746677 1.5612877 6.9770136 1.5060328 6.6738281 1.453125 z M 8.0019531 1.71875 C 8.210813 1.7666382 8.4117039 1.816189 8.6113281 1.8671875 C 8.4118795 1.8162007 8.2106197 1.7666327 8.0019531 1.71875 z M 10.378906 2.3789062 C 11.061075 2.6008202 11.711963 2.8315165 12.341797 3.0605469 C 11.710843 2.831109 11.062452 2.601244 10.378906 2.3789062 z M 1 3 L 1 5 C 6.6212121 5 9.5917968 6.0605469 12.341797 7.0605469 C 15.091797 8.0605469 17.621212 9 23 9 L 23 8 C 17.378788 8 14.408203 5.9394531 11.658203 4.9394531 C 8.9082034 3.9394531 6.3787879 3 1 3 z M 1 7 L 1 21 C 6.4393939 21 9.0703135 20.515625 11.820312 20.015625 C 14.570314 19.515625 17.439394 18 23 18 L 23 11 C 17.378788 11 14.408203 9.9394531 11.658203 8.9394531 C 8.9082032 7.9394531 6.3787879 7 1 7 z "
        id="path1273" />
     <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: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:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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:#ffffff;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 1,11 v 2 c 5.4090909,0 7.9863281,0.714844 10.736328,1.464844 C 14.486328,15.214844 17.409091,16 23,16 V 14 C 17.590909,14 15.013672,13.285156 12.263672,12.535156 9.5136719,11.785156 6.5909091,11 1,11 Z"
-       id="path1234"
-       inkscape:connector-curvature="0" />
+       id="path1234" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1255"
        d="m 1,41 c 11,0 11,8 22,8 V 60 C 12,60 12,63 1,63 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
        id="path1257"
        d="M 1,52 H 23"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
        id="path1263"
        d="m 1,-25 c 21,0 1,8 22,8 V -6 C 2,-6 22,-3 1,-3 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1265"
        d="m 1,-14 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
        id="path1318"
        d="M 41,41 V 63 H 51.666016 L 53,61 H 63 V 48 H 53 l -2,-7 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path1320"
        d="m 41,52 c 11,0 11,3 22,3"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1,1 V 3 C 6.3787879,3 8.9082031,3.9394531 11.658203,4.9394531 14.408203,5.9394531 17.378788,8 23,8 V 3 C 17.621212,3 15.091797,4.0605469 12.341797,3.0605469 9.5917969,2.0605469 6.6212121,1 1,1 Z"
-       id="path1322"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsccsc" />
+       id="path1322" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 1,5 V 7 C 6.3787879,7 8.9082031,7.9394531 11.658203,8.9394531 14.408203,9.9394531 17.378788,11 23,11 V 9 C 17.621212,9 15.091797,8.0605469 12.341797,7.0605469 9.5917969,6.0605469 6.6212121,5 1,5 Z"
-       id="path1324"
-       inkscape:connector-curvature="0" />
+       id="path1324" />
     <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:0.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 23,18 C 17.439394,18 14.570312,19.515625 11.820312,20.015625 9.0703125,20.515625 6.4393939,21 1,21 v 2 C 6.5606061,23 9.4296875,22.484375 12.179688,21.984375 14.929688,21.484375 17.560606,23 23,23 Z"
-       id="path1326"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccscc" />
+       id="path1326" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1-small.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1-small.svg
index 68aa7d6c2..f75599891 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="magnifier-1to1-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,46 +56,36 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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:0.7;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:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 7,1 C 3.6951749,1 1,3.695175 1,7 c 0,3.304825 2.6951749,6 6,6 1.1597667,0 2.2406824,-0.338405 3.160156,-0.912109 l 2.763672,2.765625 c 0.195481,0.196523 0.513503,0.196523 0.708984,0 l 1.220704,-1.222657 c 0.195151,-0.195271 0.195151,-0.51176 0,-0.707031 L 12.089844,10.160156 C 12.663219,9.2408655 13,8.1594062 13,7 13,3.695175 10.304825,1 7,1 Z m 0,1.5 c 2.4941648,0 4.5,2.005835 4.5,4.5 0,2.494165 -2.0058352,4.5 -4.5,4.5 C 4.5058352,11.5 2.5,9.494165 2.5,7 2.5,4.505835 4.5058352,2.5 7,2.5 Z"
        transform="translate(0,8)"
-       id="circle818"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssccccccsssssss" />
+       id="circle818" />
     <path
-       inkscape:connector-curvature="0"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 4.8333332,14 v 4 H 6 V 12.2 H 4.8333332 C 4.5922221,13.071999 4.7244447,13.263999 3.6666664,13.4 V 14 Z"
-       id="path846"
-       sodipodi:nodetypes="cccccccc" />
+       id="path846" />
     <path
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 8,15 H 7 v 1 h 1 z"
-       id="path848"
-       inkscape:connector-curvature="0" />
+       id="path848" />
     <path
        id="path866"
        d="m 8.8333332,14 v 4 H 10 V 12.2 H 8.8333332 C 8.5922218,13.071999 8.7244435,13.263999 7.6666657,13.4 V 14 Z"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       inkscape:connector-curvature="0"
        id="path868"
        d="M 8,17 H 7 v 1 h 1 z"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <circle
        r="5.25"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle1483"
        cx="-13"
        cy="15.000001" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="rect1485"
        width="3.9282172"
        height="1.7284168"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1.svg
index 5272cf2ed..93911dca0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-1to1.svg
@@ -2,57 +2,16 @@
 <!-- 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="magnifier-1to1.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
        id="path814" />
     <circle
@@ -108,7 +65,7 @@
        cy="10"
        cx="-30"
        id="circle818"
-       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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <rect
        transform="rotate(45)"
        y="26.870058"
@@ -116,26 +73,22 @@
        height="2.5927444"
        width="5.8925962"
        id="rect820"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 6.6,8.3999999 V 14 H 8.2 V 6 H 6.6 C 6.2693334,7.1626664 6.4506666,7.4186664 5,7.6 v 0.7999999 z"
        id="path846" />
     <path
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 10.8,9.2000001 H 9.2000005 V 10.8 H 10.8 Z"
-       id="path848"
-       inkscape:connector-curvature="0" />
+       id="path848" />
     <path
        id="path866"
        d="M 12.4,8.3999999 V 14 H 14 V 6 h -1.6 c -0.330667,1.1626664 -0.149334,1.4186664 -1.600001,1.6 v 0.7999999 z"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       inkscape:connector-curvature="0"
        id="path868"
        d="M 10.8,12.199999 H 9.2000005 V 13.8 H 10.8 Z"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-crop.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-crop.svg
index 54d6e3e9e..0578d3f2d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-crop.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-crop.svg
@@ -2,59 +2,16 @@
 <!-- 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="magnifier-crop.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="6.7883212"
-     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-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
        id="path814" />
     <circle
@@ -110,7 +65,7 @@
        cy="10"
        cx="-30"
        id="circle818"
-       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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <rect
        transform="rotate(45)"
        y="26.870058"
@@ -118,23 +73,18 @@
        height="2.5927444"
        width="5.8925962"
        id="rect820"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
        d="m -14,5 v 1 h -1 v 2 h 1 v 6 h 6 v 1 h 2 v -1 h 1 V 12 H -6 V 6 h -6 V 5 Z m 2,3 h 4 v 4 h -4 z"
-       id="rect1322"
-       inkscape:connector-curvature="0" />
+       id="rect1322" />
     <path
-       sodipodi:nodetypes="ccccccc"
        id="path818"
        d="m 6,5 v 9 h 9 V 13 H 7 V 5 Z"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal" />
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path820"
        d="m 5,6 v 1 h 8 v 8 h 1 V 6 Z"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-fit.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-fit.svg
index 1d531e2d7..41ecf8f96 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-fit.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-fit.svg
@@ -2,59 +2,16 @@
 <!-- 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="magnifier-fit.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
        id="path814" />
     <circle
@@ -110,7 +65,7 @@
        cy="10"
        cx="-30"
        id="circle818"
-       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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <rect
        transform="rotate(45)"
        y="26.870058"
@@ -118,30 +73,22 @@
        height="2.5927444"
        width="5.8925962"
        id="rect820"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;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:0.9;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:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 11,6 v 1 h 2 v 2 h 1 V 6 Z"
-       id="rect921"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect921" />
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path817"
        d="M 9,14 V 13 H 7 V 11 H 6 v 3 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.9;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:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <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:0.9;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:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 9,6 V 7 H 7 V 9 H 6 V 6 Z"
-       id="path819"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path819" />
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path821"
        d="m 11,14 v -1 h 2 v -2 h 1 v 3 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.9;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:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus-small.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus-small.svg
index 08871ed77..cf8e5e61f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="magnifier-minus-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,24 +56,20 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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:0.7;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:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 7,1 C 3.6951749,1 1,3.695175 1,7 c 0,3.304825 2.6951749,6 6,6 1.1597667,0 2.2406824,-0.338405 3.160156,-0.912109 l 2.763672,2.765625 c 0.195481,0.196523 0.513503,0.196523 0.708984,0 l 1.220704,-1.222657 c 0.195151,-0.195271 0.195151,-0.51176 0,-0.707031 L 12.089844,10.160156 C 12.663219,9.2408655 13,8.1594062 13,7 13,3.695175 10.304825,1 7,1 Z m 0,1.5 c 2.4941648,0 4.5,2.005835 4.5,4.5 0,2.494165 -2.0058352,4.5 -4.5,4.5 C 4.5058352,11.5 2.5,9.494165 2.5,7 2.5,4.505835 4.5058352,2.5 7,2.5 Z"
        transform="translate(0,8)"
-       id="circle818"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssccccccsssssss" />
+       id="circle818" />
     <circle
        r="5.25"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle1483"
        cx="-13"
        cy="15.000001" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="rect1485"
        width="3.9282172"
        height="1.7284168"
@@ -124,9 +78,7 @@
        transform="matrix(0.70707151,0.70714205,-0.70707151,0.70714205,0,0)" />
     <path
        id="path4979"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 4.0142425,15 H 9.9857576"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 4.0142425,15 H 9.9857576" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus.svg
index 567845d57..7580620c2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-minus.svg
@@ -2,59 +2,16 @@
 <!-- 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="magnifier-minus.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
        id="path814" />
     <circle
@@ -110,7 +65,7 @@
        cy="10"
        cx="-30"
        id="circle818"
-       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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <rect
        transform="rotate(45)"
        y="26.870058"
@@ -118,12 +73,10 @@
        height="2.5927444"
        width="5.8925962"
        id="rect820"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path4979"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 6,10 h 8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 6,10 h 8" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus-small.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus-small.svg
index a93e8cd8e..99828597e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="magnifier-plus-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,24 +56,20 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <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:0.7;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:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 7,1 C 3.6951749,1 1,3.695175 1,7 c 0,3.304825 2.6951749,6 6,6 1.1597667,0 2.2406824,-0.338405 3.160156,-0.912109 l 2.763672,2.765625 c 0.195481,0.196523 0.513503,0.196523 0.708984,0 l 1.220704,-1.222657 c 0.195151,-0.195271 0.195151,-0.51176 0,-0.707031 L 12.089844,10.160156 C 12.663219,9.2408655 13,8.1594062 13,7 13,3.695175 10.304825,1 7,1 Z m 0,1.5 c 2.4941648,0 4.5,2.005835 4.5,4.5 0,2.494165 -2.0058352,4.5 -4.5,4.5 C 4.5058352,11.5 2.5,9.494165 2.5,7 2.5,4.505835 4.5058352,2.5 7,2.5 Z"
        transform="translate(0,8)"
-       id="circle818"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssccccccsssssss" />
+       id="circle818" />
     <circle
        r="5.25"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle1483"
        cx="-13"
        cy="15.000001" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="rect1485"
        width="3.9282172"
        height="1.7284168"
@@ -124,9 +78,7 @@
        transform="matrix(0.70707151,0.70714205,-0.70707151,0.70714205,0,0)" />
     <path
        id="path4979"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 4.0142425,15 H 9.9857576 M 7.0000001,12.014242 v 5.971515"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 4.0142425,15 H 9.9857576 M 7.0000001,12.014242 v 5.971515" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus.svg
index a98c19bad..8ff545e7a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier-plus.svg
@@ -2,59 +2,16 @@
 <!-- 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="magnifier-plus.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
        id="path814" />
     <circle
@@ -110,7 +65,7 @@
        cy="10"
        cx="-30"
        id="circle818"
-       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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <rect
        transform="rotate(45)"
        y="26.870058"
@@ -118,12 +73,10 @@
        height="2.5927444"
        width="5.8925962"
        id="rect820"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path4979"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 6,10 h 8 M 10,6 v 8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 6,10 h 8 M 10,6 v 8" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/magnifier.svg b/rtdata/icons/rawtherapee/scalable/apps/magnifier.svg
index 3b7ae2fd2..2e216d703 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/magnifier.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/magnifier.svg
@@ -2,57 +2,16 @@
 <!-- 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="magnifier.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
        id="path814" />
     <circle
@@ -108,7 +65,7 @@
        cy="10"
        cx="-30"
        id="circle818"
-       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" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <rect
        transform="rotate(45)"
        y="26.870058"
@@ -116,6 +73,6 @@
        height="2.5927444"
        width="5.8925962"
        id="rect820"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/metadata.svg b/rtdata/icons/rawtherapee/scalable/apps/metadata.svg
index 695d2af1a..78c9d8836 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/metadata.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/metadata.svg
@@ -2,57 +2,16 @@
 <!-- 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="metadata.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,9 +55,7 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g3842"
        transform="matrix(0.03878069,0,0,0.04189316,10.949046,11.097799)">
@@ -108,16 +65,16 @@
          height="310.3132"
          width="51.57206"
          id="rect3325-3"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none" />
       <rect
          y="-241.03694"
          x="-76.044189"
          height="310.3132"
          width="25.786032"
          id="rect3320-9"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect3323-9"
          width="25.786024"
          height="310.3132"
@@ -129,65 +86,65 @@
          height="310.3132"
          width="77.358055"
          id="rect3321-4"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4063-2-9"
          width="25.786036"
          height="310.3132"
          x="-179.18831"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4063-2-4"
          width="51.572056"
          height="310.3132"
          x="-127.61624"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4063-2-94"
          width="25.786028"
          height="310.3132"
          x="-50.258156"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect3327-8-0"
          width="25.786015"
          height="310.3132"
          x="284.96024"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4069-2"
          width="77.358086"
          height="310.3132"
          x="156.03008"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4065-3"
          width="25.786028"
          height="310.3132"
          x="78.671989"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4063-2-3"
          width="51.57206"
          height="310.3132"
          x="27.09993"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4063-2-7"
          width="51.572052"
          height="310.3132"
          x="104.45802"
          y="-241.03694" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none"
          id="rect4063-2-4-29"
          width="51.572052"
          height="310.3132"
@@ -195,8 +152,7 @@
          y="-241.03694" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:213.7250824px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:213.7250824px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 0.99999826,22.38002 c 0.48427994,0 0.96855984,0 1.45284214,0 0.00873,-1.316059 -0.017519,-2.634428 0.013216,-3.949034 0.018426,-0.291743 0.1835819,0.265625 0.2312746,0.371177 0.293295,0.794269 0.5865924,1.588537 0.8798898,2.382806 0.3232284,0 0.6464545,0 0.969683,0 0.3584781,-0.929269 0.6691825,-1.884022 1.0551192,-2.801485 0.1017413,-0.149121 0.058601,0.381093 0.069262,0.508572 0,1.162655 0,2.325309 0,3.487964 0.4827855,0 0.965571,0 1.4483565,0 0,-2.126535 0,-4.253068 0,-6.379603 -0.6251544,0 -1.2503089,0 -1.8754633,0 -0.3973351,1.066826 -0.7882785,2.136396 -1.1849188,3.204799 -0.3941797,-1.06781 -0.7860322,-2.136606 -1.1793124,-3.204799 -0.6266489,0 -1.2533001,0 -1.87994894,0 0,2.126535 0,4.253068 2e-7,6.379603 z m 7.34716014,0 c 1.3194397,0 2.6388796,0 3.9583196,0 0,-0.457543 0,-0.915086 0,-1.372629 -0.811618,0 -1.623237,0 -2.4348545,0 0,-0.421548 0,-0.843094 0,-1.264641 0.7380035,0 1.4760075,0 2.2140145,0 0,-0.457144 0,-0.914286 0,-1.371429 -0.738007,0 -1.476011,0 -2.2140145,0 0,-0.332758 0,-0.665517 0,-0.998275 0.7847135,0 1.5694275,0 2.3541415,0 0,-0.457543 0,-0.915086 0,-1.372629 -1.292536,0 -2.585071,0 -3.8776066,0 0,2.126535 0,4.253068 0,6.379603 z M 12.74716,17.373046 c 0.595261,0 1.190522,0 1.785784,0 0,1.66899 0,3.337982 0,5.006974 0.508195,0 1.01639,0 1.524586,0 0,-1.668992 0,-3.337984 0,-5.006974 0.59414,0 1.188279,0 1.782419,0 0,-0.457543 0,-0.915086 0,-1.372629 -1.697597,0 -3.395192,0 -5.092789,0 0,0.457543 0,0.915086 0,1.372629 z m 6.461554,-1.370229 c -0.680005,2.1259 -1.360303,4.251694 -2.041376,6.377203 0.513801,0 1.027601,0 1.541402,0 0.113359,-0.377763 0.228129,-0.755042 0.341911,-1.132658 0.690174,0 1.380347,0 2.070523,0 0.112982,0.377444 0.225123,0.754996 0.337425,1.132658 0.513802,0 1.027601,0 1.541403,0 -0.680353,-2.126573 -1.360217,-4.253325 -2.041377,-6.379603 -0.582549,0.0016 -1.1711,-0.0032 -1.749911,0.0024 z m 0.943897,2.010948 c 0.190762,0.639856 0.379993,1.280239 0.571722,1.919761 -0.427109,0 -0.854218,0 -1.281325,0 0.21472,-0.716373 0.427807,-1.433312 0.641222,-2.150132 0.02279,0.07679 0.04559,0.153581 0.06838,0.230371 z"
        id="text3155-6-3-3-4-8" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/node-move-nw-se-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/node-move-nw-se-hicontrast.svg
index 375c8ea27..e577c6293 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/node-move-nw-se-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/node-move-nw-se-hicontrast.svg
@@ -2,61 +2,16 @@
 <!-- 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-nw-se-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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="2"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -67,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,32 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g910"
        transform="rotate(45,12,12)">
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path2866-6"
          d="M 17.494308,15.514232 23.5,12 17.494308,8.4971547 Z"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <circle
          r="2"
          cy="12"
          cx="12"
          id="path1820"
-         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" />
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal" />
       <path
-         inkscape:transform-center-y="-0.0056935"
-         inkscape:transform-center-x="8.497154"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 6.505692,8.485768 0.5,12 6.505692,15.502845 Z"
-         id="path886"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         id="path886" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/node-move-sw-ne-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/node-move-sw-ne-hicontrast.svg
index fdda47505..707895b3b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/node-move-sw-ne-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/node-move-sw-ne-hicontrast.svg
@@ -2,61 +2,16 @@
 <!-- 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-sw-ne-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="11.656876"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="2"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -67,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,32 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g910"
        transform="rotate(135,12,12)">
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path2866-6"
          d="M 17.494308,15.514232 23.5,12 17.494308,8.4971547 Z"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <circle
          r="2"
          cy="12"
          cx="12"
          id="path1820"
-         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" />
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal" />
       <path
-         inkscape:transform-center-y="-0.0056935"
-         inkscape:transform-center-x="8.497154"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 6.505692,8.485768 0.5,12 6.505692,15.502845 Z"
-         id="path886"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         id="path886" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/node-move-x-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/node-move-x-hicontrast.svg
index a24af10ef..f62f5368e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/node-move-x-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/node-move-x-hicontrast.svg
@@ -2,61 +2,16 @@
 <!-- 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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="2"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -67,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,28 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 17.494308,15.514232 23.5,12 17.494308,8.4971547 Z"
-       id="path2866-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path2866-6" />
     <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"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal"
        id="path1820"
        cx="12"
        cy="12"
        r="2" />
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path886"
        d="M 6.505692,8.485768 0.5,12 6.505692,15.502845 Z"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:transform-center-x="8.497154"
-       inkscape:transform-center-y="-0.0056935" />
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/node-move-xy-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/node-move-xy-hicontrast.svg
index 05d291870..7d0bd110d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/node-move-xy-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/node-move-xy-hicontrast.svg
@@ -2,61 +2,16 @@
 <!-- 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="24.218407"
-     inkscape:cx="6.3691263"
-     inkscape:cy="12.072563"
-     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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="2"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -100,72 +55,54 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g910"
        transform="rotate(180,12,12)">
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path2866-6"
          d="M 17.494308,15.514232 23.5,12 17.494308,8.4971547 Z"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <circle
          r="2"
          cy="12"
          cx="12"
          id="path1820"
-         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" />
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal" />
       <path
-         inkscape:transform-center-y="-0.0056935"
-         inkscape:transform-center-x="8.497154"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 6.505692,8.485768 0.5,12 6.505692,15.502845 Z"
-         id="path886"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         id="path886" />
     </g>
     <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
        id="path987"
        d="M 15.514232,6.505692 12,0.5 8.4971547,6.505692 Z"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       inkscape:transform-center-y="-0.0056935"
-       inkscape:transform-center-x="8.497154"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 8.485768,17.494308 12,23.5 15.502845,17.494308 Z"
-       id="path991"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       id="path991" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M -24.491461,5.6780518 -27.999997,1 -31.508539,5.6780517 Z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
        id="path5657"
        d="M -31.508539,18.321948 -28.000003,23 l 3.508542,-4.678052 z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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="-28"
        cy="12"
        r="3" />
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M -21.678052,15.508539 -17,12.000003 -21.678052,8.4914611 Z"
-       id="path2866-3"
-       inkscape:connector-curvature="0" />
+       id="path2866-3" />
     <path
-       inkscape:connector-curvature="0"
        id="path5657-6"
        d="M -34.321948,8.491461 -39,11.999997 l 4.678052,3.508542 z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/node-move-y-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/node-move-y-hicontrast.svg
index 615f3f94a..f0718b688 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/node-move-y-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/node-move-y-hicontrast.svg
@@ -2,61 +2,16 @@
 <!-- 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="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="2"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -67,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,32 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g910"
        transform="rotate(90,12,12)">
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
          id="path2866-6"
          d="M 17.494308,15.514232 23.5,12 17.494308,8.4971547 Z"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <circle
          r="2"
          cy="12"
          cx="12"
          id="path1820"
-         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" />
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;paint-order:normal" />
       <path
-         inkscape:transform-center-y="-0.0056935"
-         inkscape:transform-center-x="8.497154"
-         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 6.505692,8.485768 0.5,12 6.505692,15.502845 Z"
-         id="path886"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         id="path886" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/one-to-one-small.svg b/rtdata/icons/rawtherapee/scalable/apps/one-to-one-small.svg
index 8b08f99d0..7ff044aff 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/one-to-one-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/one-to-one-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="one-to-one.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,39 +56,29 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g987"
        transform="translate(0,-18)">
       <path
-         inkscape:connector-curvature="0"
          id="path11691"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-         d="M 5.6806,21.24916 H 3.7403 v -7.37477 c -0.7089,0.66854 -0.8974,0.72796 -1.8595,1.04829 v -1.77579 c 0.5064,-0.16713 0.4095,-0.0478 1.0033,-0.51208 0.5938,-0.46889 1.0012,-1.0144 1.2222,-1.63651 h 1.5743 v 10.25086"
-         sodipodi:nodetypes="ccccccccc" />
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+         d="M 5.6806,21.24916 H 3.7403 v -7.37477 c -0.7089,0.66854 -0.8974,0.72796 -1.8595,1.04829 v -1.77579 c 0.5064,-0.16713 0.4095,-0.0478 1.0033,-0.51208 0.5938,-0.46889 1.0012,-1.0144 1.2222,-1.63651 h 1.5743 v 10.25086" />
       <path
-         sodipodi:nodetypes="ccccccccc"
          d="m 12.3936,21.24916 h -1.9403 v -7.37477 c -0.7089,0.66854 -0.8974,0.72796 -1.8595,1.04829 v -1.77579 c 0.5064,-0.16713 0.4095,-0.0478 1.0033,-0.51208 0.5938,-0.46889 1.0012,-1.0144 1.2222,-1.63651 h 1.5743 v 10.25086"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-         id="path11693"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+         id="path11693" />
       <path
-         sodipodi:nodetypes="ccccc"
          d="M 7,21.24916 V 19.2923 h 1.9403 v 1.95686 H 7"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-         id="path11687"
-         inkscape:connector-curvature="0" />
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+         id="path11687" />
       <path
-         inkscape:connector-curvature="0"
          id="path11695"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-         d="M 7,17.95685 V 16 h 1.9403 v 1.95685 H 7"
-         sodipodi:nodetypes="ccccc" />
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+         d="M 7,17.95685 V 16 h 1.9403 v 1.95685 H 7" />
     </g>
     <rect
-       style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="rect3849-6"
        width="11.935707"
        height="11.935707"
@@ -138,55 +86,39 @@
        y="10.155875"
        ry="2.8631849" />
     <path
-       inkscape:connector-curvature="0"
        id="path42315"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       d="M 26.3822,20.10325 H 24.882 v -5.70208 c -0.5481,0.51691 -0.6939,0.56285 -1.4378,0.81053 v -1.37302 c 0.3916,-0.12922 0.3166,-0.037 0.7758,-0.39593 0.4591,-0.36254 0.7741,-0.78432 0.9449,-1.26533 h 1.2173 v 7.92583"
-       sodipodi:nodetypes="ccccccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       d="M 26.3822,20.10325 H 24.882 v -5.70208 c -0.5481,0.51691 -0.6939,0.56285 -1.4378,0.81053 v -1.37302 c 0.3916,-0.12922 0.3166,-0.037 0.7758,-0.39593 0.4591,-0.36254 0.7741,-0.78432 0.9449,-1.26533 h 1.2173 v 7.92583" />
     <path
-       sodipodi:nodetypes="ccccccccc"
        d="m 31.551,20.10325 h -1.5002 v -5.70208 c -0.5482,0.51691 -0.6939,0.56285 -1.4378,0.81053 v -1.37302 c 0.3915,-0.12922 0.3166,-0.037 0.7757,-0.39593 0.4592,-0.36254 0.7742,-0.78432 0.945,-1.26533 h 1.2173 v 7.92583"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       id="path42317"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       id="path42317" />
     <path
-       sodipodi:nodetypes="ccccc"
        d="m 27.3807,20.10325 v -1.51301 h 1.5002 v 1.51301 h -1.5002"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       id="path42319"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       id="path42319" />
     <path
-       inkscape:connector-curvature="0"
        id="path42321"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       d="m 27.3807,17.55768 v -1.51301 h 1.5002 v 1.51301 h -1.5002"
-       sodipodi:nodetypes="ccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       d="m 27.3807,17.55768 v -1.51301 h 1.5002 v 1.51301 h -1.5002" />
     <path
-       inkscape:connector-curvature="0"
        id="path11687-3"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       d="m -14.5192,19.51664 v -1.33606 h 1.336 v 1.33606 h -1.336"
-       sodipodi:nodetypes="ccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       d="m -14.5192,19.51664 v -1.33606 h 1.336 v 1.33606 h -1.336" />
     <path
-       sodipodi:nodetypes="ccccc"
        d="m -14.5192,16.87679 v -1.33607 h 1.336 v 1.33607 h -1.336"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       id="path11695-3"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       id="path11695-3" />
     <path
-       inkscape:connector-curvature="0"
        id="path3057"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       d="m -10.2779,20.01486 h -1.5465 v -7.78227 h 1.5465 v 7.78227"
-       sodipodi:nodetypes="ccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       d="m -10.2779,20.01486 h -1.5465 v -7.78227 h 1.5465 v 7.78227" />
     <path
-       sodipodi:nodetypes="ccccc"
        d="m -15.8779,20.01486 h -1.5465 v -7.78227 h 1.5465 v 7.78227"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       id="path3061"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       id="path3061" />
     <rect
-       style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.4000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="rect3849"
        width="12.6"
        height="12.6"
@@ -194,53 +126,41 @@
        y="9.8237219"
        ry="3.0225384" />
     <path
-       sodipodi:nodetypes="ccccc"
        d="M -34.7301,20.79096 V 18.9531 h 1.8378 v 1.83786 h -1.8378"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       id="path3861"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       id="path3861" />
     <path
-       inkscape:connector-curvature="0"
        id="path3863"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       d="m -34.7301,17.15962 v -1.83786 h 1.8378 v 1.83786 h -1.8378"
-       sodipodi:nodetypes="ccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       d="m -34.7301,17.15962 v -1.83786 h 1.8378 v 1.83786 h -1.8378" />
     <path
-       sodipodi:nodetypes="ccccc"
        d="m -28.8959,21.47631 h -2.1273 V 10.77115 h 2.1273 v 10.70516"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       id="path3865"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       id="path3865" />
     <path
-       inkscape:connector-curvature="0"
        id="path3867"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
-       d="m -36.5992,21.47631 h -2.1273 V 10.77115 h 2.1273 v 10.70516"
-       sodipodi:nodetypes="ccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02110476;stroke-opacity:1"
+       d="m -36.5992,21.47631 h -2.1273 V 10.77115 h 2.1273 v 10.70516" />
     <g
        id="g840"
        transform="translate(0,20)">
       <path
          d="M 6.03125,22 H 3 V 15 H 1 v -2 c 1,0 3,-2 3,-3 h 2.03125 z"
          id="path989"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-2px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-2px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <rect
          y="16"
          x="7.5"
          height="2.5"
          width="2.5"
          id="rect1002"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
       <path
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-2px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-2px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          id="path1004"
          d="m 15,22 h -3 v -7 h -2 v -2 c 1,0 3,-2 3,-3 h 2 z" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
          id="rect1006"
          width="2.5"
          height="2.5"
@@ -248,24 +168,20 @@
          y="19.5" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
        d="m 4,14 v 7 H 6 V 11 H 4 c -0.4133333,1.453333 -0.1866667,1.773333 -2,2 v 1 z"
        id="path846" />
     <path
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
        d="M 10,14.999999 H 8.0000002 v 2 H 10 Z"
-       id="path848"
-       inkscape:connector-curvature="0" />
+       id="path848" />
     <path
        id="path866"
        d="m 12,14 v 7 h 2 V 11 h -2 c -0.413333,1.453333 -0.186667,1.773333 -2,2 v 1 z"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7"
-       inkscape:connector-curvature="0" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7" />
     <path
-       inkscape:connector-curvature="0"
        id="path868"
        d="M 10,19 H 8 v 2 h 2 z"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.7" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/padlock-locked-small.svg b/rtdata/icons/rawtherapee/scalable/apps/padlock-locked-small.svg
index 27f1bc510..1ab5c85d4 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/padlock-locked-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/padlock-locked-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="padlock-locked.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,31 +56,23 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 2.4011244,13.827807 C 1.6248731,13.827807 1,14.54498 1,15.435751 V 21.39206 C 1,22.28283 1.6248731,23 2.4011244,23 H 9.000911 c 0.776247,0 1.401307,-0.71717 1.401307,-1.60794 v -5.956309 c 0,-0.890771 -0.62506,-1.607944 -1.401307,-1.607944 z m 3.2999866,1.93302 a 1.5963236,1.5963236 0 0 1 1.5962459,1.596433 1.5963236,1.5963236 0 0 1 -0.7934815,1.377546 v 2.844763 c 0,0.05704 -0.04851,0.103037 -0.1087951,0.103037 H 5.0069542 c -0.060286,0 -0.108795,-0.046 -0.108795,-0.103037 v -2.84458 A 1.5963236,1.5963236 0 0 1 4.104865,17.35726 1.5963236,1.5963236 0 0 1 5.701111,15.760827 Z"
        id="path185" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 5.7011719,9 C 3.635691,9 1.9335938,10.593706 1.9335938,12.587891 v 1.3125 A 0.47174083,0.47174083 0 0 0 1.9453125,14 h 1.9316406 a 0.47174083,0.47174083 0 0 0 0.011719,-0.09961 v -1.019532 c 0,-0.928894 0.8366765,-1.890625 1.8125,-1.890625 0.9758209,0 1.8125,0.961735 1.8125,1.890625 V 14 H 9.46875 V 12.587891 C 9.46875,10.593702 7.7666502,9 5.7011719,9 Z"
        id="path187" />
     <path
        id="path1468"
        d="M -16.598876,13.827807 C -17.375127,13.827807 -18,14.54498 -18,15.435751 V 21.39206 C -18,22.28283 -17.375127,23 -16.598876,23 h 6.599787 c 0.776247,0 1.401307,-0.71717 1.401307,-1.60794 v -5.956309 c 0,-0.890771 -0.62506,-1.607944 -1.401307,-1.607944 z m 3.299987,1.93302 a 1.5963236,1.5963236 0 0 1 1.596246,1.596433 1.5963236,1.5963236 0 0 1 -0.793482,1.377546 v 2.844763 c 0,0.05704 -0.04851,0.103037 -0.108795,0.103037 h -1.388126 c -0.06029,0 -0.108795,-0.046 -0.108795,-0.103037 v -2.84458 a 1.5963236,1.5963236 0 0 1 -0.793294,-1.377729 1.5963236,1.5963236 0 0 1 1.596246,-1.596433 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        d="m -84.964844,437.23047 c -5.749245,0 -10.486328,4.43747 -10.486328,9.98828 v 7.01563 a 1.3130874,1.3130874 0 0 0 1.369141,1.3125 c 0.146957,-0.006 0.216026,-0.0137 0.21875,-0.0137 h 2.539062 a 1.3130874,1.3130874 0 0 0 1.3125,-1.3125 v -6.1875 c 0,-2.58556 2.330684,-5.26562 5.046875,-5.26562 2.716198,0 5.046875,2.68005 5.046875,5.26562 v 2.83985 a 1.3130874,1.3130874 0 0 0 1.3125,1.3125 h 2.814453 a 1.3130874,1.3130874 0 0 0 1.3125,-1.3125 v -3.6543 c 0,-5.5508 -4.737076,-9.98828 -10.486328,-9.98828 z"
        id="path1470"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.7735216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:original="M -84.964844 438.54297 C -90.047618 438.54297 -94.138672 442.41308 -94.138672 447.21875 L -94.138672 454.23438 C -94.046312 454.23037 -93.956654 454.2207 -93.863281 454.2207 L -91.324219 454.2207 L -91.324219 448.0332 C -91.324219 444.70228 -88.487821 441.45508 -84.964844 441.45508 C -81.441862 441.45508 -78.605469 444.70228 -78.605469 448.0332 L -78.605469 450.87305 L -75.791016 450.87305 L -75.791016 447.21875 C -75.791016 442.4131 -79.882067 438.54297 -84.964844 438.54297 z "
-       inkscape:radius="1.3129561"
-       sodipodi:type="inkscape:offset"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.7735216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        transform="matrix(-0.3592608,0,0,0.3592608,-43.823425,-148.07977)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/padlock-unlocked-small.svg b/rtdata/icons/rawtherapee/scalable/apps/padlock-unlocked-small.svg
index 0c282c8cf..8e0f284c8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/padlock-unlocked-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/padlock-unlocked-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="padlock-unlocked.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="35.797281"
-     inkscape:cx="3.8158517"
-     inkscape:cy="9.6631885"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,31 +56,23 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 2.4011244,13.827807 C 1.6248731,13.827807 1,14.54498 1,15.435751 V 21.39206 C 1,22.28283 1.6248731,23 2.4011244,23 H 9.000911 c 0.776247,0 1.401307,-0.71717 1.401307,-1.60794 v -5.956309 c 0,-0.890771 -0.62506,-1.607944 -1.401307,-1.607944 z m 3.2999866,1.93302 a 1.5963236,1.5963236 0 0 1 1.5962459,1.596433 1.5963236,1.5963236 0 0 1 -0.7934815,1.377546 v 2.844763 c 0,0.05704 -0.04851,0.103037 -0.1087951,0.103037 H 5.0069542 c -0.060286,0 -0.108795,-0.046 -0.108795,-0.103037 v -2.84458 A 1.5963236,1.5963236 0 0 1 4.104865,17.35726 1.5963236,1.5963236 0 0 1 5.701111,15.760827 Z"
        id="path185" />
     <path
        id="path1468"
        d="M -16.598876,13.827807 C -17.375127,13.827807 -18,14.54498 -18,15.435751 V 21.39206 C -18,22.28283 -17.375127,23 -16.598876,23 h 6.599787 c 0.776247,0 1.401307,-0.71717 1.401307,-1.60794 v -5.956309 c 0,-0.890771 -0.62506,-1.607944 -1.401307,-1.607944 z m 3.299987,1.93302 a 1.5963236,1.5963236 0 0 1 1.596246,1.596433 1.5963236,1.5963236 0 0 1 -0.793482,1.377546 v 2.844763 c 0,0.05704 -0.04851,0.103037 -0.108795,0.103037 h -1.388126 c -0.06029,0 -0.108795,-0.046 -0.108795,-0.103037 v -2.84458 a 1.5963236,1.5963236 0 0 1 -0.793294,-1.377729 1.5963236,1.5963236 0 0 1 1.596246,-1.596433 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.17045528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        d="m -84.964844,437.23047 c -5.749245,0 -10.486328,4.43747 -10.486328,9.98828 v 7.01563 a 1.3130874,1.3130874 0 0 0 1.369141,1.3125 c 0.146957,-0.006 0.216026,-0.0137 0.21875,-0.0137 h 2.539062 a 1.3130874,1.3130874 0 0 0 1.3125,-1.3125 v -6.1875 c 0,-2.58556 2.330684,-5.26562 5.046875,-5.26562 2.716198,0 5.046875,2.68005 5.046875,5.26562 v 2.83985 a 1.3130874,1.3130874 0 0 0 1.3125,1.3125 h 2.814453 a 1.3130874,1.3130874 0 0 0 1.3125,-1.3125 v -3.6543 c 0,-5.5508 -4.737076,-9.98828 -10.486328,-9.98828 z"
        id="path1470"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.7735216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:original="M -84.964844 438.54297 C -90.047618 438.54297 -94.138672 442.41308 -94.138672 447.21875 L -94.138672 454.23438 C -94.046312 454.23037 -93.956654 454.2207 -93.863281 454.2207 L -91.324219 454.2207 L -91.324219 448.0332 C -91.324219 444.70228 -88.487821 441.45508 -84.964844 441.45508 C -81.441862 441.45508 -78.605469 444.70228 -78.605469 448.0332 L -78.605469 450.87305 L -75.791016 450.87305 L -75.791016 447.21875 C -75.791016 442.4131 -79.882067 438.54297 -84.964844 438.54297 z "
-       inkscape:radius="1.3129561"
-       sodipodi:type="inkscape:offset"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.7735216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        transform="matrix(-0.3592608,0,0,0.3592608,-43.823425,-148.07977)" />
     <path
        id="path1475"
        d="M 11.266606,9 C 9.201125,9 7.4990258,10.593706 7.4990258,12.587891 v 1.3125 a 0.47174083,0.47174083 0 0 0 0.011718,0.09961 H 9.442387 a 0.47174083,0.47174083 0 0 0 0.01172,-0.09961 v -1.019532 c 0,-0.928894 0.836676,-1.890625 1.8125,-1.890625 0.975821,0 1.8125,0.961735 1.8125,1.890625 v 1.119142 h 1.955077 v -1.412109 c 0,-1.994189 -1.7021,-3.587891 -3.767578,-3.587891 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/palette-brush.svg b/rtdata/icons/rawtherapee/scalable/apps/palette-brush.svg
index 30eaac0d6..79614edf9 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/palette-brush.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/palette-brush.svg
@@ -2,63 +2,16 @@
 <!-- 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="palette-brush.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="23.923779"
-     inkscape:cx="3.449857"
-     inkscape:cy="13.225304"
-     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="false"
-     inkscape:bbox-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -69,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,31 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.57735956"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.57735956"
        d="M 18.454576,2.1326338 C 17.444616,1.4060245 16.227068,0.99658219 14.979944,1.0000215 13.673897,1.0275214 12.369635,1.3759426 11.18307,1.9195 9.8519554,2.5018419 8.9153018,3.9454977 9.0060702,5.4030919 9.1328388,6.3311792 9.8023513,7.0312807 10.262311,7.803605 c 0.512133,0.9184122 0.403907,2.0852866 -0.223831,2.919413 -0.5510995,0.822576 -1.1189132,1.904551 -0.581532,2.877033 0.691965,1.069714 1.652112,1.943369 2.590156,2.795859 0.871122,0.713416 1.822599,1.566704 3.025384,1.509891 1.856929,0.157608 3.74625,-0.514618 5.07705,-1.820687 1.328497,-1.099286 2.616821,-2.489415 2.804959,-4.284385 C 23.180781,9.7317213 22.535191,7.6602558 21.636913,5.8192083 20.885549,4.3642546 19.809019,3.0630339 18.454576,2.1326338 Z m 0.29542,1.6096758 c 1.037365,0.696652 0.697077,2.3764946 -0.367464,2.8648878 -0.895955,0.5441303 -2.229224,-0.042088 -2.3082,-1.1210063 -0.202717,-1.3784636 1.487132,-2.5760668 2.675664,-1.7438815 z m 1.782574,3.465207 c 1.037588,0.6968659 0.69681,2.3767261 -0.367769,2.8653004 -0.895923,0.54544 -2.231049,-0.04017 -2.308547,-1.1205305 C 17.654289,7.5735936 19.34324,6.3750668 20.53257,7.2075166 Z M 13.420545,3.8943045 c 1.046514,0.7432717 1.744156,2.291847 1.06006,3.4898449 C 13.936318,8.2831861 12.643727,8.1928409 11.902233,7.6036867 10.851544,6.8625718 10.158838,5.3098438 10.843467,4.1120862 11.392336,3.2042256 12.671994,3.3115874 13.420545,3.8943045 Z m 6.834782,7.3855415 c 1.038022,0.695703 0.701451,2.376862 -0.365034,2.864523 -0.896005,0.544021 -2.23217,-0.03992 -2.309048,-1.12088 -0.199787,-1.376449 1.485227,-2.576759 2.674082,-1.743643 z m -3.594248,2.09186 c 1.037626,0.696629 0.700132,2.378285 -0.366336,2.866298 -0.896005,0.54402 -2.232169,-0.03991 -2.309047,-1.12088 -0.199771,-1.37658 1.486184,-2.577643 2.675383,-1.745418 z"
-       id="path3964"
-       inkscape:connector-curvature="0" />
+       id="path3964" />
     <path
-       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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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"
        d="M 2.0960519,1.0610888 C 2.9270433,0.81780801 3.6906982,1.3275388 4.0351713,2.1219382 5.5131818,5.5304211 6.7934639,8.9683449 7.6091111,12.475451 7.8052519,13.318813 6.7328799,13.817673 5.9018885,14.060954 5.0708972,14.304234 3.9080857,14.45911 3.6091527,13.646477 2.456022,10.511758 1.7416035,6.7616067 1.0352025,3.0002082 0.87538351,2.1492147 1.2650606,1.3043696 2.0960519,1.0610888 Z"
-       id="rect886"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssss" />
+       id="rect886" />
     <path
-       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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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"
        d="m 4.5482824,15.000083 2.9999688,-0.87827 c 0.2769972,-0.08109 0.6977175,0.0696 0.6463732,0.353617 l -0.2072382,1.146368 c -0.051344,0.28402 -0.076619,0.565279 -0.3536164,0.646373 L 5.6337906,16.853684 C 5.3567935,16.934778 5.1838265,16.711556 4.9874174,16.500068 L 4.194666,15.646457 c -0.1964091,-0.211488 0.076619,-0.56528 0.3536164,-0.646374 z"
-       id="rect889"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssssss" />
+       id="rect889" />
     <path
-       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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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"
        d="m 6.7801585,17.060922 c -0.8930918,0.244085 -1.2999362,1.122454 -1.0608494,1.93912 0.1463288,0.499826 0.6336175,0.714103 0.9391298,1.353606 C 6.9639511,20.993151 6.9221092,22.286803 6.8903357,23 7.743947,22.207249 9.655998,20.015299 9.411035,18.667682 9.2551899,17.757277 8.4241612,17.027797 7.5033477,16.980961 c -0.24329,-0.01628 -0.4892647,0.01131 -0.7231892,0.07996 z"
-       id="path892"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cszcccc" />
+       id="path892" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/panel-to-bottom.svg b/rtdata/icons/rawtherapee/scalable/apps/panel-to-bottom.svg
index 8e63c0309..63494a4a4 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/panel-to-bottom.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/panel-to-bottom.svg
@@ -2,59 +2,16 @@
 <!-- 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="panel-to-bottom.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,21 +55,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03482621"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03482621"
        d="m 12,21.000001 -3.750003,-5 7.499997,-1e-6 z"
        id="path2876" />
     <path
-       inkscape:connector-curvature="0"
        id="rect899"
        d="m 0.999995,2.9999995 v 5 h 22 v -5 z m 2.5,1 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z m 13,0 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z m 4,0 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect901"
        width="2"
        height="8"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/panel-to-left.svg b/rtdata/icons/rawtherapee/scalable/apps/panel-to-left.svg
index d987f54f7..7046f3388 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/panel-to-left.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/panel-to-left.svg
@@ -2,59 +2,16 @@
 <!-- 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="panel-to-left.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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,21 +55,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03482621"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03482621"
        d="m 2.999999,12.000005 5,-3.750003 1e-6,7.499997 z"
        id="path2876" />
     <path
        id="rect899"
        d="m 21,1 -5,0 v 22 h 5 z M 20,3.5 A 1.5,1.5 0 0 1 18.5,5 1.5,1.5 0 0 1 17,3.5 1.5,1.5 0 0 1 18.5,2 1.5,1.5 0 0 1 20,3.5 Z m 0,13 A 1.5,1.5 0 0 1 18.5,18 1.5,1.5 0 0 1 17,16.5 1.5,1.5 0 0 1 18.5,15 1.5,1.5 0 0 1 20,16.5 Z m 0,4 A 1.5,1.5 0 0 1 18.5,22 1.5,1.5 0 0 1 17,20.5 1.5,1.5 0 0 1 18.5,19 1.5,1.5 0 0 1 20,20.5 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect901"
        width="2"
        height="8"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/panel-to-right.svg b/rtdata/icons/rawtherapee/scalable/apps/panel-to-right.svg
index 52fc38529..5081a3507 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/panel-to-right.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/panel-to-right.svg
@@ -2,59 +2,16 @@
 <!-- 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="panel-to-right.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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,23 +55,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g915" />
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03482621"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03482621"
        d="m 22.000001,11.999995 -5,3.750003 L 17,8.250001 Z"
        id="path2876" />
     <path
        id="rect899"
        d="M 4,23 H 9 L 9,1 H 4 Z M 5,20.5 A 1.5,1.5 0 0 1 6.5,19 1.5,1.5 0 0 1 8,20.5 1.5,1.5 0 0 1 6.5,22 1.5,1.5 0 0 1 5,20.5 Z M 5,7.5 A 1.5,1.5 0 0 1 6.5,6 1.5,1.5 0 0 1 8,7.5 1.5,1.5 0 0 1 6.5,9 1.5,1.5 0 0 1 5,7.5 Z m 0,-4 A 1.5,1.5 0 0 1 6.5,2 1.5,1.5 0 0 1 8,3.5 1.5,1.5 0 0 1 6.5,5 1.5,1.5 0 0 1 5,3.5 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect901"
        width="2"
        height="8"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/panel-to-top.svg b/rtdata/icons/rawtherapee/scalable/apps/panel-to-top.svg
index 5b1cccfe5..2db77dda8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/panel-to-top.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/panel-to-top.svg
@@ -2,59 +2,16 @@
 <!-- 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="panel-to-top.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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,23 +55,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g915" />
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03482621"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03482621"
        d="m 12.000005,2 -3.750003,5 7.499997,1e-6 z"
        id="path2876" />
     <path
        id="rect899"
        d="m 1,20.000001 v -5 h 22 v 5 z m 2.5,-1 a 1.5,1.5 0 0 0 1.5,-1.5 1.5,1.5 0 0 0 -1.5,-1.5 1.5,1.5 0 0 0 -1.5,1.5 1.5,1.5 0 0 0 1.5,1.5 z m 13,0 a 1.5,1.5 0 0 0 1.5,-1.5 1.5,1.5 0 0 0 -1.5,-1.5 1.5,1.5 0 0 0 -1.5,1.5 1.5,1.5 0 0 0 1.5,1.5 z m 4,0 a 1.5,1.5 0 0 0 1.5,-1.5 1.5,1.5 0 0 0 -1.5,-1.5 1.5,1.5 0 0 0 -1.5,1.5 1.5,1.5 0 0 0 1.5,1.5 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect901"
        width="2"
        height="8"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/paste.svg b/rtdata/icons/rawtherapee/scalable/apps/paste.svg
index 83d82617a..9027d29e5 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/paste.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/paste.svg
@@ -2,58 +2,16 @@
 <!-- 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="paste.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="35.236987"
-     inkscape:cy="9.798217"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.66666669;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="rect855"
        width="14"
        height="16"
@@ -110,11 +66,11 @@
        rx="1.125"
        ry="1.125" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.66666669;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 2.125,2 C 1.50175,2 1,2.50175 1,3.125 v 15.75 C 1,19.49825 1.50175,20 2.125,20 H 7 V 7.59375 C 7,6.1053824 8.4236123,5 10.0625,5 H 17 V 3.125 C 17,2.50175 16.49825,2 15.875,2 Z"
        id="path920" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.66666669;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect859"
        width="8"
        height="4"
@@ -130,23 +86,23 @@
        height="18"
        width="16"
        id="rect904"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect941"
        width="9"
        height="2"
        x="11"
        y="9" />
     <rect
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect943"
        width="9"
        height="2"
        x="11"
        y="13" />
     <rect
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect945"
        width="9"
        height="2"
@@ -160,12 +116,11 @@
        height="16"
        width="14"
        id="rect947"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.80000001;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path949"
        d="M 42.125,2 C 41.50175,2 41,2.50175 41,3.125 v 15.75 C 41,19.49825 41.50175,20 42.125,20 H 47 V 7.59375 C 47,6.1053824 48.423612,5 50.0625,5 H 57 V 3.125 C 57,2.50175 56.49825,2 55.875,2 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.66666667;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
        ry="1.125"
        rx="1.125"
@@ -174,7 +129,7 @@
        height="4"
        width="8"
        id="rect951"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.66666667;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <g
        id="g933"
        transform="translate(40)">
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left-small.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left-small.svg
index c4797a6a2..1a386806a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="perspective-horizontal-left-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,26 +56,18 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path1207"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path1207" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m -18.5,10.5 13,2 v 7 l -13,2 z"
-       id="rect1209"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect1209" />
     <path
-       inkscape:connector-curvature="0"
        id="path892"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       d="m 6.6071429,11.622449 v 8.755102 m 5.1937041,-8.013144 v 7.271186 M 14.15,17.269231 2.3313953,17.918605 M 14.15,14.730769 2.3313953,14.081395 M 14.15,19.3 2.3313953,20.988372 V 11.011628 L 14.15,12.7 Z"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       d="m 6.6071429,11.622449 v 8.755102 m 5.1937041,-8.013144 v 7.271186 M 14.15,17.269231 2.3313953,17.918605 M 14.15,14.730769 2.3313953,14.081395 M 14.15,19.3 2.3313953,20.988372 V 11.011628 L 14.15,12.7 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left.svg
index 18ce37ea3..3c7939410 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-left.svg
@@ -2,58 +2,16 @@
 <!-- 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="perspective-horizontal-left.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,19 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path829"
        d="m 23,6.2727273 c 0,0 -0.691824,-0.102916 -0.691824,-0.102916 C 22.308176,6.1698113 1,3 1,3 c 0,0 0,18 0,18 0,0 22,-2.454545 22,-2.454545 0,0 0,-12.2727277 0,-12.2727277 M 21.595745,7.212766 c 0,0 0,2.2978723 0,2.2978723 0,0 -3.075383,-0.239145 -3.075383,-0.239145 0,0 0,-2.443439 0,-2.443439 0,0 3.075383,0.3847117 3.075383,0.3847117 m 0,3.446808 c 0,0 0,3.446809 0,3.446809 0,0 -3.075383,0.05199 -3.075383,0.05199 0,0 0,-3.665158 0,-3.665158 0,0 3.075383,0.166362 3.075383,0.166362 m 0,4.595744 c 0,0 0,2.297873 0,2.297873 0,0 -3.075383,0.270338 -3.075383,0.270338 0,0 0,-2.443439 0,-2.443439 0,0 3.075383,-0.124772 3.075383,-0.124772 M 16.831776,6.6168224 c 0,0 0,2.5233646 0,2.5233646 0,0 -5.800688,-0.4510678 -5.800688,-0.4510678 0,0 0,-2.7979274 0,-2.7979274 0,0 5.800688,0.7256306 5.800688,0.7256306 m 0,3.7850466 c 0,0 0,3.785047 0,3.785047 0,0 -5.800688,0.09806 -5.800688,0.09806 0,0 0,-4.196891 0,-4.196891 0,0 5.800688,0.313786 5.800688,0.313786 m 0,5.046729 c 0,0 0,2.523364 0,2.523364 0,0 -5.800688,0.509904 -5.800688,0.509904 0,0 0,-2.797928 0,-2.797928 0,0 5.800688,-0.23534 5.800688,-0.23534 M 8.8064516,5.6129033 c 0,0 0,2.9032258 0,2.9032258 0,0 -4.9924981,-0.3882221 -4.9924981,-0.3882221 0,0 0,-3.1395348 0,-3.1395348 0,0 4.9924981,0.6245311 4.9924981,0.6245311 m 0,4.3548386 c 0,0 0,4.3548391 0,4.3548391 0,0 -4.9924981,0.0844 -4.9924981,0.0844 0,0 0,-4.7093016 0,-4.7093016 0,0 4.9924981,0.2700675 4.9924981,0.2700675 m 0,5.8064511 c 0,0 0,2.903226 0,2.903226 0,0 -4.9924981,0.43886 -4.9924981,0.43886 0,0 0,-3.139535 0,-3.139535 0,0 4.9924981,-0.202551 4.9924981,-0.202551"
-       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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        id="path1484"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right-small.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right-small.svg
index 4721117c8..e10aa2880 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="perspective-horizontal-right-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false"
-       spacingx="0.5"
-       spacingy="0.5" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,26 +56,18 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path1207"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path1207" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m -18.5,10.5 13,2 v 7 l -13,2 z"
-       id="rect1209"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="rect1209" />
     <path
-       inkscape:connector-curvature="0"
        id="path892"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       d="m 9.8742524,11.622449 v 8.755102 M 4.6805483,12.364407 v 7.271186 M 2.3313953,17.269231 14.15,17.918605 M 2.3313953,14.730769 14.15,14.081395 M 2.3313953,19.3 14.15,20.988372 V 11.011628 L 2.3313953,12.7 Z"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       d="m 9.8742524,11.622449 v 8.755102 M 4.6805483,12.364407 v 7.271186 M 2.3313953,17.269231 14.15,17.918605 M 2.3313953,14.730769 14.15,14.081395 M 2.3313953,19.3 14.15,20.988372 V 11.011628 L 2.3313953,12.7 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right.svg
index 809e94123..9e16927ae 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-right.svg
@@ -2,59 +2,16 @@
 <!-- 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="perspective-horizontal-right.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="11.997432"
-     inkscape:cy="12.150675"
-     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="false"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,19 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path829"
        d="m 1,6.2727273 c 0,0 0.6918239,-0.102916 0.6918239,-0.102916 C 1.6918239,6.1698113 23,3 23,3 c 0,0 0,18 0,18 0,0 -22,-2.454545 -22,-2.454545 0,0 0,-12.2727277 0,-12.2727277 M 2.4042553,7.212766 c 0,0 0,2.2978723 0,2.2978723 0,0 3.0753827,-0.239145 3.0753827,-0.239145 0,0 0,-2.443439 0,-2.443439 0,0 -3.0753827,0.3847117 -3.0753827,0.3847117 m 0,3.446808 c 0,0 0,3.446809 0,3.446809 0,0 3.0753827,0.05199 3.0753827,0.05199 0,0 0,-3.665158 0,-3.665158 0,0 -3.0753827,0.166362 -3.0753827,0.166362 m 0,4.595744 c 0,0 0,2.297873 0,2.297873 0,0 3.0753827,0.270338 3.0753827,0.270338 0,0 0,-2.443439 0,-2.443439 0,0 -3.0753827,-0.124772 -3.0753827,-0.124772 m 4.763969,-8.6384956 c 0,0 0,2.5233646 0,2.5233646 0,0 5.8006877,-0.4510678 5.8006877,-0.4510678 0,0 0,-2.7979274 0,-2.7979274 0,0 -5.8006877,0.7256306 -5.8006877,0.7256306 m 0,3.7850466 c 0,0 0,3.785047 0,3.785047 0,0 5.8006877,0.09806 5.8006877,0.09806 0,0 0,-4.196891 0,-4.196891 0,0 -5.8006877,0.313786 -5.8006877,0.313786 m 0,5.046729 c 0,0 0,2.523364 0,2.523364 0,0 5.8006877,0.509904 5.8006877,0.509904 0,0 0,-2.797928 0,-2.797928 0,0 -5.8006877,-0.23534 -5.8006877,-0.23534 M 15.193548,5.6129033 c 0,0 0,2.9032258 0,2.9032258 0,0 4.992499,-0.3882221 4.992499,-0.3882221 0,0 0,-3.1395348 0,-3.1395348 0,0 -4.992499,0.6245311 -4.992499,0.6245311 m 0,4.3548386 c 0,0 0,4.3548391 0,4.3548391 0,0 4.992499,0.0844 4.992499,0.0844 0,0 0,-4.7093016 0,-4.7093016 0,0 -4.992499,0.2700675 -4.992499,0.2700675 m 0,5.8064511 c 0,0 0,2.903226 0,2.903226 0,0 4.992499,0.43886 4.992499,0.43886 0,0 0,-3.139535 0,-3.139535 0,0 -4.992499,-0.202551 -4.992499,-0.202551"
-       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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        id="path1484"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-vertical.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-vertical.svg
index 0c5046879..fe267866f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-vertical.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-horizontal-vertical.svg
@@ -2,57 +2,16 @@
 <!-- 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"
-   sodipodi:docname="perspective-horizontal-vertical.svg"
-   inkscape:version="0.91 r13725"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="1017"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="12"
-     inkscape:cx="9.5946553"
-     inkscape:zoom="33.833333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,21 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path829"
        d="m 16.33328,1.6391557 c 0,0 -0.597535,0.1004573 -0.597535,0.1004573 0,0 -12.5482282,2.1095983 -12.5482282,2.1095983 0,0 -1.3974074,18.5332577 -1.3974074,18.5332577 0,0 20.6576276,-3.472946 20.6576276,-3.472946 0,0 -6.114457,-17.2703671 -6.114457,-17.2703671 m -0.870105,1.2410528 c 0,0 0.721483,2.3092989 0.721483,2.3092989 0,0 -2.653273,0.4460661 -2.653273,0.4460661 0,0 -0.540063,-2.3397989 -0.540063,-2.3397989 0,0 2.471853,-0.4155661 2.471853,-0.4155661 m 1.123451,3.5959084 C 16.586626,6.4761171 18,11 18,11 c 0,0 -3.10975,0.52281 -3.10975,0.52281 0,0 -1.057973,-4.5836339 -1.057973,-4.5836339 0,0 2.754349,-0.463059 2.754349,-0.463059 m 1.969195,6.3029399 c 0,0 1.276331,4.085239 1.276331,4.085239 0,0 -3.570455,0.600263 -3.570455,0.600263 0,0 -0.955389,-4.139196 -0.955389,-4.139196 0,0 3.249513,-0.546306 3.249513,-0.546306 M 11.755396,3.5035576 c 0,0 0.449353,2.3550492 0.449353,2.3550492 0,0 -3.979911,0.6690993 -3.979911,0.6690993 0,0 -0.1772211,-2.4007997 -0.1772211,-2.4007997 0,0 3.7077791,-0.6233488 3.7077791,-0.6233488 M 12.4551,7.1707057 c 0,0 0.880275,4.6135083 0.880275,4.6135083 0,0 -4.6646259,0.784214 -4.6646259,0.784214 0,0 -0.3471735,-4.7031334 -0.3471735,-4.7031334 0,0 4.1315244,-0.6945889 4.1315244,-0.6945889 m 1.22645,6.4278093 c 0,0 0.79492,4.166175 0.79492,4.166175 0,0 -5.3556809,0.900393 -5.3556809,0.900393 0,0 -0.3135109,-4.247109 -0.3135109,-4.247109 0,0 4.8742718,-0.819459 4.8742718,-0.819459 M 6.8116906,4.3346895 c 0,0 0.086511,2.4160496 0.086511,2.4160496 0,0 -2.6532734,0.4460663 -2.6532734,0.4460663 0,0 0.09491,-2.4465501 0.09491,-2.4465501 0,0 2.4718529,-0.4155658 2.4718529,-0.4155658 M 6.946401,8.0968242 c 0,0 0.1694737,4.7330078 0.1694737,4.7330078 0,0 -3.1097505,0.52281 -3.1097505,0.52281 0,0 0.1859267,-4.7927587 0.1859267,-4.7927587 0,0 2.7543503,-0.4630591 2.7543503,-0.4630591 m 0.2361207,6.5943038 c 0,0 0.1530412,4.274086 0.1530412,4.274086 0,0 -3.5704543,0.600261 -3.5704543,0.600261 0,0 0.1678985,-4.328041 0.1678985,-4.328041 0,0 3.2495145,-0.546306 3.2495145,-0.546306"
-       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;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;direction:ltr;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       inkscape:transform-center-x="-2.8627202"
-       inkscape:transform-center-y="2.0529462" />
+       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;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;direction:ltr;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        id="path1484"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom-small.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom-small.svg
index 80f023b74..14e4c4474 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom-small.svg
@@ -2,58 +2,16 @@
 <!-- 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"
-   sodipodi:docname="perspective-vertical-bottom-small.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 16 16"
    height="16"
-   width="16">
-  <sodipodi:namedview
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="8"
-     inkscape:cx="8"
-     inkscape:zoom="50.75"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       spacingy="0.5"
-       spacingx="0.5"
-       dotted="false"
-       empspacing="7"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,26 +56,18 @@
   </metadata>
   <g
      transform="translate(0,-8)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path1207"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z" />
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="M 2.9162881,17.179006 H 13.088261 M 3.7783196,12.788459 H 12.22623 M 9.4769099,10.802581 10.231374,20.793549 M 6.5276395,10.802581 5.773175,20.793549 m 6.063151,-9.990968 1.961607,9.990968 H 2.2066156 l 1.9616076,-9.990968 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path992"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path992" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m -18.387811,21.496377 2.323667,-10.989672 h 8.132837 l 2.323667,10.989672 z"
-       id="path1014"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path1014" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom.svg
index 4cc5bf0f3..aec86fbcd 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-bottom.svg
@@ -2,57 +2,16 @@
 <!-- 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"
-   sodipodi:docname="perspective-vertical-bottom.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="12"
-     inkscape:cx="7.684729"
-     inkscape:zoom="33.833333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,19 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path829"
        d="M 19,3 C 19,3 18.363636,3 18.363636,3 18.363636,3 5,3 5,3 5,3 1,21 1,21 1,21 23,21 23,21 23,21 19,3 19,3 m -1.076923,1.0769231 c 0,0 0.434721,2.3909668 0.434721,2.3909668 0,0 -2.825688,0 -2.825688,0 0,0 -0.241512,-2.3909668 -0.241512,-2.3909668 0,0 2.632479,0 2.632479,0 M 18.6,7.8000001 c 0,0 0.851613,4.6838709 0.851613,4.6838709 0,0 -3.311828,0 -3.311828,0 0,0 -0.473118,-4.6838709 -0.473118,-4.6838709 0,0 2.933333,0 2.933333,0 m 1.186517,6.5258429 c 0,0 0.769039,4.229713 0.769039,4.229713 0,0 -3.80247,0 -3.80247,0 0,0 -0.427243,-4.229713 -0.427243,-4.229713 0,0 3.460674,0 3.460674,0 M 13.974359,4.0769231 c 0,0 0.144907,2.3909668 0.144907,2.3909668 0,0 -4.2385321,0 -4.2385321,0 0,0 0.1449071,-2.3909668 0.1449071,-2.3909668 0,0 3.948718,0 3.948718,0 M 14.2,7.8000001 c 0,0 0.283871,4.6838709 0.283871,4.6838709 0,0 -4.967742,0 -4.967742,0 0,0 0.283871,-4.6838709 0.283871,-4.6838709 0,0 4.4,0 4.4,0 m 0.395506,6.5258429 c 0,0 0.256346,4.229713 0.256346,4.229713 0,0 -5.7037039,0 -5.7037039,0 0,0 0.2563463,-4.229713 0.2563463,-4.229713 0,0 5.1910116,0 5.1910116,0 M 8.7094017,4.0769231 c 0,0 -0.2415118,2.3909668 -0.2415118,2.3909668 0,0 -2.8256881,0 -2.8256881,0 0,0 0.4347213,-2.3909668 0.4347213,-2.3909668 0,0 2.6324786,0 2.6324786,0 m -0.3760684,3.723077 c 0,0 -0.4731182,4.6838709 -0.4731182,4.6838709 0,0 -3.311828,0 -3.311828,0 0,0 0.8516129,-4.6838709 0.8516129,-4.6838709 0,0 2.9333333,0 2.9333333,0 m -0.659176,6.5258429 c 0,0 -0.4272437,4.229713 -0.4272437,4.229713 0,0 -3.8024692,0 -3.8024692,0 0,0 0.7690387,-4.229713 0.7690387,-4.229713 0,0 3.4606742,0 3.4606742,0"
-       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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        id="path1484"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top-small.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top-small.svg
index 1ec0fafa7..ba15938ce 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top-small.svg
@@ -2,58 +2,16 @@
 <!-- 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"
-   sodipodi:docname="perspective-vertical-top-small.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 16 16"
    height="16"
-   width="16">
-  <sodipodi:namedview
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="8"
-     inkscape:cx="8"
-     inkscape:zoom="50.75"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       spacingy="0.5"
-       spacingx="0.5"
-       dotted="false"
-       empspacing="7"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="16"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,26 +56,18 @@
   </metadata>
   <g
      transform="translate(0,-8)"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path1207"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z" />
     <path
-       sodipodi:nodetypes="ccccccccccccc"
        d="M 2.9162881,14.417124 H 13.088261 M 3.7783196,18.807671 H 12.22623 M 9.4769099,20.793549 10.231374,10.802581 M 6.5276395,20.793549 5.773175,10.802581 m 6.063151,9.990968 1.961607,-9.990968 H 2.2066156 l 1.9616076,9.990968 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       id="path992"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
+       id="path992" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m -18.387811,21.496377 2.323667,-10.989672 h 8.132837 l 2.323667,10.989672 z"
-       id="path1014"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       id="path1014" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top.svg b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top.svg
index 34f75fe7f..d2fe215f7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/perspective-vertical-top.svg
@@ -2,57 +2,16 @@
 <!-- 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"
-   sodipodi:docname="perspective-vertical-top.svg"
-   inkscape:version="0.92.2 2405546, 2018-03-11"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/tmp/template.png"
    id="SVGRoot"
    version="1.1"
    viewBox="0 0 24 24"
    height="24px"
-   width="24px">
-  <sodipodi:namedview
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-grids="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:pagecheckerboard="false"
-     inkscape:grid-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:window-height="1019"
-     inkscape:window-width="1920"
-     showgrid="true"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="12"
-     inkscape:cx="12"
-     inkscape:zoom="34.25"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     borderopacity="1.0"
-     bordercolor="#666768"
-     pagecolor="#E0E1E2"
-     id="base">
-    <inkscape:grid
-       dotted="false"
-       empspacing="11"
-       originy="1"
-       originx="1"
-       id="grid1374"
-       type="xygrid" />
-  </sodipodi:namedview>
+   width="24px"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,19 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path829"
        d="m 19,21 c 0,0 -0.636364,0 -0.636364,0 C 18.363636,21 5,21 5,21 5,21 1,3 1,3 1,3 23,3 23,3 23,3 19,21 19,21 m -1.076923,-1.076923 c 0,0 0.434721,-2.390967 0.434721,-2.390967 0,0 -2.825688,0 -2.825688,0 0,0 -0.241512,2.390967 -0.241512,2.390967 0,0 2.632479,0 2.632479,0 M 18.6,16.2 c 0,0 0.851613,-4.683871 0.851613,-4.683871 0,0 -3.311828,0 -3.311828,0 0,0 -0.473118,4.683871 -0.473118,4.683871 0,0 2.933333,0 2.933333,0 m 1.186517,-6.5258426 c 0,0 0.769039,-4.2297129 0.769039,-4.2297129 0,0 -3.80247,0 -3.80247,0 0,0 -0.427243,4.2297129 -0.427243,4.2297129 0,0 3.460674,0 3.460674,0 M 13.974359,19.923077 c 0,0 0.144907,-2.390967 0.144907,-2.390967 0,0 -4.2385321,0 -4.2385321,0 0,0 0.1449071,2.390967 0.1449071,2.390967 0,0 3.948718,0 3.948718,0 M 14.2,16.2 c 0,0 0.283871,-4.683871 0.283871,-4.683871 0,0 -4.967742,0 -4.967742,0 0,0 0.283871,4.683871 0.283871,4.683871 0,0 4.4,0 4.4,0 m 0.395506,-6.5258426 c 0,0 0.256346,-4.2297129 0.256346,-4.2297129 0,0 -5.7037039,0 -5.7037039,0 0,0 0.2563463,4.2297129 0.2563463,4.2297129 0,0 5.1910116,0 5.1910116,0 M 8.7094017,19.923077 c 0,0 -0.2415118,-2.390967 -0.2415118,-2.390967 0,0 -2.8256881,0 -2.8256881,0 0,0 0.4347213,2.390967 0.4347213,2.390967 0,0 2.6324786,0 2.6324786,0 M 8.3333333,16.2 c 0,0 -0.4731182,-4.683871 -0.4731182,-4.683871 0,0 -3.311828,0 -3.311828,0 0,0 0.8516129,4.683871 0.8516129,4.683871 0,0 2.9333333,0 2.9333333,0 M 7.6741573,9.6741574 c 0,0 -0.4272437,-4.2297129 -0.4272437,-4.2297129 0,0 -3.8024692,0 -3.8024692,0 0,0 0.7690387,4.2297129 0.7690387,4.2297129 0,0 3.4606742,0 3.4606742,0"
-       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.7;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:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     <path
        id="path1484"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 56,2 V 22 M 48,2 V 22 M 42,16 H 62 M 42,8 H 62 M 42,2 H 62 V 22 H 42 Z" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/power-inconsistent-small.svg b/rtdata/icons/rawtherapee/scalable/apps/power-inconsistent-small.svg
index 305f504cd..4f3fc18d2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/power-inconsistent-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/power-inconsistent-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="power-inconsistent.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,21 +56,17 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:none;fill-opacity:0.75294118;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:0.75294118;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 11.503774,13.432989 A 5,5 0 0 1 13,17 v 0 A 5,5 0 0 1 8,22 5,5 0 0 1 3,17 5,5 0 0 1 4.499601,13.429677"
-       id="path5608"
-       inkscape:connector-curvature="0" />
+       id="path5608" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;opacity:0.7"
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal;opacity:0.7"
        d="m 7.9999994,10.437301 v 3.068104"
-       id="path2553"
-       inkscape:connector-curvature="0" />
+       id="path2553" />
     <circle
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path6217"
        cx="8"
        cy="17.5"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/power-off-small.svg b/rtdata/icons/rawtherapee/scalable/apps/power-off-small.svg
index a45e63dc5..f6da11820 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/power-off-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/power-off-small.svg
@@ -1,57 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="16"
    height="16"
    viewBox="0 0 16 16"
    version="1.1"
    id="SVGRoot"
-   inkscape:export-filename="/tmp/template.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   sodipodi:docname="power-off-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="48.806956"
-     inkscape:cx="7.6926668"
-     inkscape:cy="8.0255665"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="3440"
-     inkscape:window-height="1387"
-     inkscape:window-x="3832"
-     inkscape:window-y="-8"
-     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:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -62,7 +20,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,18 +54,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="display:inline;opacity:0.5;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="display:inline;opacity:0.5;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 11.030908,13.501206 a 4.3252046,4.3407218 0 0 1 1.294297,3.096681 v 0 A 4.3252046,4.3407218 0 0 1 8,20.938608 4.3252046,4.3407218 0 0 1 3.6747954,16.597887 4.3252046,4.3407218 0 0 1 4.9720116,13.498331"
-       id="path5608"
-       inkscape:connector-curvature="0" />
+       id="path5608" />
     <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2.6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2.6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 7.9999995,11.259782 v 3.39629"
-       id="path2553"
-       inkscape:connector-curvature="0" />
+       id="path2553" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/power-on-small.svg b/rtdata/icons/rawtherapee/scalable/apps/power-on-small.svg
index 271c8e53e..a8b6e559a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/power-on-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/power-on-small.svg
@@ -1,60 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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="16"
    height="16"
    viewBox="0 0 16 16"
    version="1.1"
    id="SVGRoot"
-   inkscape:export-filename="/tmp/template.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   sodipodi:docname="power-on-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="10.989922"
-     inkscape:cy="9.722799"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="3440"
-     inkscape:window-height="1387"
-     inkscape:window-x="3832"
-     inkscape:window-y="-8"
-     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:document-rotation="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -99,36 +54,26 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:label="Layer 1"
-     transform="translate(0,-8)"
-     inkscape:groupmode="layer">
+     transform="translate(0,-8)">
     <path
-       style="display:none;opacity:0.75;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="display:none;opacity:0.75;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#cccccc;stroke-width:2.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 11.503774,13.128228 A 5,5 0 0 1 13,16.695239 v 0 a 5,5 0 0 1 -5,5 5,5 0 0 1 -5,-5 5,5 0 0 1 1.499601,-3.570323"
-       id="path5608-3"
-       inkscape:connector-curvature="0"
-       inkscape:label="bottom round glow" />
+       id="path5608-3" />
     <path
-       style="display:none;opacity:0.75;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="display:none;opacity:0.75;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 7.9999994,10.551133 v 3.912126"
-       id="path2553-6"
-       inkscape:connector-curvature="0"
-       inkscape:label="bottom straight glow" />
+       id="path2553-6" />
     <path
        id="path839"
-       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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#f1f1f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.266667;stroke-linecap:round;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;stop-color:#000000;stop-opacity:1"
+       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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#f1f1f1;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.266667;stroke-linecap:round;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;stop-color:#000000;stop-opacity:1.0"
        d="M 8.0000002,9.2447604 A 1.2218936,1.2217828 0 0 0 6.77751,10.46714 v 3.846109 a 1.2218936,1.2217828 0 0 0 1.2224902,1.22238 1.2218936,1.2217828 0 0 0 1.22249,-1.22238 V 10.46714 A 1.2218936,1.2217828 0 0 0 8.0000002,9.2447604 Z M 4.5455258,11.780796 A 1.2218936,1.2217828 0 0 0 3.6971212,12.128 c -1.1790295,1.153783 -1.8435795,2.735852 -1.8435795,4.384817 -4e-7,3.376499 2.7671706,6.136953 6.1464585,6.136953 3.3792878,0 6.1464588,-2.760454 6.1464578,-6.136953 0,-1.646953 -0.663499,-3.22596 -1.839998,-4.379448 a 1.2218936,1.2217828 0 0 0 -1.727238,0.01611 1.2218936,1.2217828 0 0 0 0.01611,1.72887 c 0.709034,0.695164 1.107938,1.643337 1.107938,2.63447 0,2.05355 -1.642357,3.693983 -3.7032678,3.693983 -2.0609116,0 -3.7032683,-1.640433 -3.7032681,-3.693983 0,-0.992346 0.399166,-1.942703 1.1097276,-2.638049 a 1.2218936,1.2217828 0 0 0 0.019688,-1.72708 1.2218936,1.2217828 0 0 0 -0.8806222,-0.366892 z" />
     <path
-       style="display:none;opacity:0.1;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#1f90e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="display:none;opacity:0.1;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#1f90e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 11.503774,13.13695 A 5,5 0 0 1 13,16.703961 v 0 a 5,5 0 0 1 -5,5 5,5 0 0 1 -5,-5 5,5 0 0 1 1.499601,-3.570323"
-       id="path5608-36"
-       inkscape:connector-curvature="0"
-       inkscape:label="blue glow round" />
+       id="path5608-36" />
     <path
-       style="display:none;opacity:0.05;fill:none;fill-rule:evenodd;stroke:#1f90e0;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="display:none;opacity:0.05;fill:none;fill-rule:evenodd;stroke:#1f90e0;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 7.9999994,10.551133 v 3.912126"
-       id="path2553-7"
-       inkscape:connector-curvature="0"
-       inkscape:label="blue glow straight" />
+       id="path2553-7" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/preferences.svg b/rtdata/icons/rawtherapee/scalable/apps/preferences.svg
index db6794736..e742d74a7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/preferences.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/preferences.svg
@@ -2,57 +2,16 @@
 <!-- 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="preferences.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="10.829716"
-     inkscape:cy="15.38075"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,15 +55,13 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.8;fill:#2a7fff;fill-opacity:0.8;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.8;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;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 3 1 C 1.892 1 1 1.892 1 3 L 1 21 C 1 22.108 1.892 23 3 23 L 21 23 C 22.108 23 23 22.108 23 21 L 23 3 C 23 1.892 22.108 1 21 1 L 3 1 z M 4 3 L 6 3 L 6 4 L 6.5 4 C 7.331 4 8 4.669 8 5.5 L 8 8.5 C 8 9.331 7.331 10 6.5 10 L 6 10 L 6 21 L 4 21 L 4 10 L 3.5 10 C 2.669 10 2 9.331 2 8.5 L 2 5.5 C 2 4.669 2.669 4 3.5 4 L 4 4 L 4 3 z M 11 3 L 13 3 L 13 14 L 13.5 14 C 14.331 14 15 14.669 15 15.5 L 15 18.5 C 15 19.331 14.331 20 13.5 20 L 13 20 L 13 21 L 11 21 L 11 20 L 10.5 20 C 9.669 20 9 19.331 9 18.5 L 9 15.5 C 9 14.669 9.669 14 10.5 14 L 11 14 L 11 3 z M 18 3 L 20 3 L 20 8 L 20.5 8 C 21.331 8 22 8.669 22 9.5 L 22 12.5 C 22 13.331 21.331 14 20.5 14 L 20 14 L 20 21 L 18 21 L 18 14 L 17.5 14 C 16.669 14 16 13.331 16 12.5 L 16 9.5 C 16 8.669 16.669 8 17.5 8 L 18 8 L 18 3 z "
        id="rect1003" />
     <rect
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect1011"
        width="4"
        height="4"
@@ -120,9 +77,9 @@
        height="4"
        width="4"
        id="rect1013"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <rect
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect1015"
        width="4"
        height="4"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/profile-filled.svg b/rtdata/icons/rawtherapee/scalable/apps/profile-filled.svg
index d31352f11..c54a0ac21 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/profile-filled.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/profile-filled.svg
@@ -2,59 +2,16 @@
 <!-- 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="profile-filled.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04245924"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04245924"
        id="rect14301"
        width="14"
        height="3.0338154"
@@ -114,26 +69,24 @@
        height="3.0338154"
        width="9"
        id="rect14305"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03404313" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03404313" />
     <rect
        y="1.9661846"
        x="8"
        height="3.0338154"
        width="15"
        id="rect14313"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04394949" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04394949" />
     <rect
        y="17"
        x="8"
        height="3"
        width="12"
        id="rect42711"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03930962" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03930962" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.44948983;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.44948983;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 1,3 v 16 h 2 v 0 H 6 V 18 H 3 V 14 H 6 V 13 H 3 V 9 H 6 V 8 H 3 V 4 H 6 V 3 H 3 Z m 0,18 v 2 h 2 v -2 z"
-       id="rect1095"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccc" />
+       id="rect1095" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/profile-partial.svg b/rtdata/icons/rawtherapee/scalable/apps/profile-partial.svg
index 90d22c74a..5d58013ba 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/profile-partial.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/profile-partial.svg
@@ -2,59 +2,16 @@
 <!-- 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="profile-partial.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04245924"
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04245924"
        id="rect14301"
        width="14"
        height="3.0338154"
@@ -114,26 +69,24 @@
        height="3.0338154"
        width="9"
        id="rect14305"
-       style="opacity:0.2;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03404313" />
+       style="opacity:0.2;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03404313" />
     <rect
        y="1.9661846"
        x="8"
        height="3.0338154"
        width="15"
        id="rect14313"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04394949" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04394949" />
     <rect
        y="17"
        x="8"
        height="3"
        width="12"
        id="rect42711"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.03930962" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.03930962" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.44948983;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.44948983;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 1,3 v 16 h 2 v 0 H 6 V 18 H 3 V 14 H 6 V 13 H 3 V 9 H 6 V 8 H 3 V 4 H 6 V 3 H 3 Z m 0,18 v 2 h 2 v -2 z"
-       id="rect1095"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccc" />
+       id="rect1095" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/questionmark.svg b/rtdata/icons/rawtherapee/scalable/apps/questionmark.svg
index 4c4b59590..855873047 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/questionmark.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/questionmark.svg
@@ -2,57 +2,16 @@
 <!-- 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.4 5da689c313, 2019-01-14"
-   sodipodi:docname="questionmark.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.125"
-     inkscape:cx="2.4963333"
-     inkscape:cy="9.7590888"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,27 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.52196503px;line-height:125%;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.522px;line-height:125%;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        x="-11.29845"
        y="19"
        id="text821"><tspan
-         sodipodi:role="line"
          id="tspan819"
          x="-11.29845"
          y="19"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.52196503px;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';fill:#ffffff;stroke-width:1px">?</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.522px;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';fill:#ffffff;fill-opacity:1;stroke-width:1px">?</tspan></text>
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 12 1 A 11 11 0 0 0 1 12 A 11 11 0 0 0 12 23 A 11 11 0 0 0 23 12 A 11 11 0 0 0 12 1 z M 11.804688 5.3027344 C 13.125101 5.3027344 14.193859 5.6466458 15.007812 6.3339844 C 15.827796 7.021323 16.236328 7.9291641 16.236328 9.0566406 C 16.236328 10.268527 15.820323 11.250246 14.988281 12.003906 C 14.156239 12.757567 13.046892 13.188348 11.660156 13.296875 L 11.607422 14.527344 L 10.800781 14.527344 L 10.800781 11.009766 C 11.675027 10.937414 12.361067 10.663813 12.855469 10.1875 C 13.349871 9.705157 13.595703 9.0506215 13.595703 8.2246094 C 13.595703 7.5674173 13.421964 7.0422942 13.072266 6.6503906 C 12.728596 6.2524578 12.264528 6.0527344 11.679688 6.0527344 C 11.432487 6.0527344 11.212469 6.0805023 11.019531 6.1347656 C 10.826594 6.1829996 10.639863 6.2625663 10.458984 6.3710938 C 10.519278 6.5640309 10.587635 6.8136002 10.666016 7.1210938 C 10.750426 7.422558 10.792969 7.7016782 10.792969 7.9609375 C 10.792969 8.3829875 10.6543 8.7121235 10.376953 8.9472656 C 10.105635 9.1763785 9.7247003 9.2910156 9.2363281 9.2910156 C 8.7781025 9.2910156 8.4176323 9.1468276 8.1523438 8.8574219 C 7.8930844 8.5680162 7.7636719 8.2130656 7.7636719 7.7910156 C 7.7636719 7.0976478 8.1574292 6.5096866 8.9472656 6.0273438 C 9.737102 5.5450009 10.689269 5.3027344 11.804688 5.3027344 z M 11.244141 15.332031 C 11.708396 15.332031 12.113362 15.502204 12.457031 15.839844 C 12.806729 16.171454 12.980469 16.565212 12.980469 17.023438 C 12.980469 17.481663 12.806729 17.877374 12.457031 18.208984 C 12.113362 18.534566 11.708396 18.697266 11.244141 18.697266 C 10.773857 18.697266 10.365324 18.534566 10.015625 18.208984 C 9.6719557 17.877374 9.5 17.481663 9.5 17.023438 C 9.5 16.565212 9.6719557 16.171454 10.015625 15.839844 C 10.365324 15.502204 10.773857 15.332031 11.244141 15.332031 z "
        id="path939" />
     <g
        aria-label="?"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.52196503px;line-height:125%;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:18.52196503px;line-height:125%;font-family:Georgia;-inkscape-font-specification:'Georgia Bold';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#ffffff;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text943" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/redo-all.svg b/rtdata/icons/rawtherapee/scalable/apps/redo-all.svg
index f9dbaad23..0d9dac982 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/redo-all.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/redo-all.svg
@@ -2,66 +2,16 @@
 <!-- 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="redo-all.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -72,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,28 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g934"
        transform="matrix(-1,0,0,1,24.153196,0)">
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
          id="path815"
          d="M 9.949033,8.4948032 7.969092,6.0502179 6.5454982,13.646832 l 7.8944748,0.719941 -2.021592,-2.59938 c 4.275719,-5.1547511 9.942843,-1.673533 9.942843,-1.673533 0,0 -6.425864,-8.1931439 -12.412191,-1.5990568 z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <path
          id="path829"
          d="M 3.2089844,8.4277344 A 0.79229534,0.79229534 0 0 0 2.4375,9.0722656 L 1.0136719,16.669922 a 0.79229534,0.79229534 0 0 0 0.7070312,0.935547 l 7.8945313,0.71875 A 0.79229534,0.79229534 0 0 0 10.3125,17.048828 L 9.1230469,15.519531 6.9746094,15.324219 a 0.79229534,0.79229534 0 0 0 0.064453,0.09766 l 0.9003906,1.158203 -5.2089843,-0.474609 0.9472656,-5.056641 0.9023437,1.113281 a 0.79229534,0.79229534 0 0 0 0.070312,0.07617 L 5.03125,10.205078 3.8320312,8.7207031 A 0.79229534,0.79229534 0 0 0 3.2089844,8.4277344 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.35;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:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         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.35;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
          id="path880"
          d="m 3.6777344,11.048828 -0.9472656,5.056641 5.2089843,0.474609 -0.9003906,-1.158203 a 0.79229534,0.79229534 0 0 1 -0.064453,-0.09766 L 5.1347656,15.15625 C 4.5913076,15.107137 4.2081598,14.600804 4.3085938,14.064453 l 0.3417968,-1.826172 a 0.79229534,0.79229534 0 0 1 -0.070312,-0.07617 z"
-         style="opacity:0.35;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:none;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.35;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/redo-small.svg b/rtdata/icons/rawtherapee/scalable/apps/redo-small.svg
index 639aebb42..6c0fabd46 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/redo-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/redo-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="redo-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.5"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26899993;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.26899993;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="m 10.491605,14.688218 1.593819,-1.947275 1.145969,6.051211 -6.3549192,0.573481 1.6273482,-2.07058 C 4.865759,13.000001 0.5,15.961974 0.5,15.961974 c 0,0 5.365759,-6.9619734 9.991605,-1.273756 z"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path815" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/redo.svg b/rtdata/icons/rawtherapee/scalable/apps/redo.svg
index 14f9f7c00..394ae22e2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/redo.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/redo.svg
@@ -2,66 +2,16 @@
 <!-- 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="redo.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -72,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="m 17.856983,9.375818 2.499244,-3.0857555 1.796976,9.5890675 -9.965051,0.908768 2.551819,-3.28115 C 9.3428079,7 2.1893009,11.394278 2.1893009,11.394278 c 0,0 8.1112511,-10.3420561 15.6676821,-2.01846 z"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path815" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/refresh-red-small.svg b/rtdata/icons/rawtherapee/scalable/apps/refresh-red-small.svg
index 498faafe8..22222eb69 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/refresh-red-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/refresh-red-small.svg
@@ -2,62 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="refresh-red-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -68,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,39 +56,27 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g1780"
        transform="matrix(0.9262047,0,0,0.94685391,0.59948418,0.83978254)"
        style="stroke-width:1.06783724">
       <path
-         sodipodi:nodetypes="csc"
-         inkscape:connector-curvature="0"
          id="path853"
          d="M 2,16.018348 C 2,12.694506 4.6803835,10 7.9868041,10 c 1.5874923,0 3.1304979,0.654539 4.2531899,1.782813"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:2.13567448;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:2.13567448;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
       <path
-         sodipodi:nodetypes="cccsc"
-         inkscape:connector-curvature="0"
          id="path846"
          d="m 14,15.981653 v 0 0 C 14,19.305495 11.319616,22 8.0131954,22 6.4257033,22 4.863002,21.325381 3.7403094,20.197107"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:2.13567448;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#c00000;stroke-width:2.13567448;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
       <path
-         inkscape:transform-center-y="0.1182266"
-         inkscape:transform-center-x="0.20689655"
-         inkscape:connector-curvature="0"
          id="path2876"
          d="M 15.547876,15.0907 14.720906,9.3019016 9.7590817,14.263724 Z"
-         style="display:inline;opacity:0.7;fill:#c00000;fill-opacity:1;stroke:none;stroke-width:0.03718871" />
+         style="display:inline;opacity:0.7;fill:#c00000;fill-opacity:1.0;stroke:none;stroke-width:0.03718871" />
       <path
-         style="display:inline;opacity:0.7;fill:#c00000;fill-opacity:1;stroke:none;stroke-width:0.03718871"
+         style="display:inline;opacity:0.7;fill:#c00000;fill-opacity:1.0;stroke:none;stroke-width:0.03718871"
          d="m 0.4324269,16.889219 0.82697,5.788799 4.961825,-4.961823 z"
-         id="path829"
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-x="-0.20689655"
-         inkscape:transform-center-y="-0.1182266" />
+         id="path829" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/refresh-small.svg b/rtdata/icons/rawtherapee/scalable/apps/refresh-small.svg
index d9ca603ef..d1c6c821f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/refresh-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/refresh-small.svg
@@ -2,62 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="refresh-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -102,37 +56,29 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g1780"
        transform="matrix(0.79388974,0,0,0.81158906,1.6567007,3.0040201)"
        style="stroke-width:1.24581015">
       <path
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
          d="M 3.3537416 6.9582168 C 3.8197786 4.7633151 5.7218112 3.1199107 7.9973425 3.1199107 C 9.2576364 3.1199107 10.482613 3.6511274 11.373906 4.5668222 "
          id="path1772"
          transform="matrix(1.2596208,0,0,1.2321507,-2.0868146,6.1558)" />
       <path
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
          d="M 12.637947 9.1276442 C 12.133704 11.268755 10.256705 12.858979 8.0182943 12.858979 C 6.7580006 12.858979 5.5173881 12.311466 4.626094 11.395771 "
          id="path1769"
          transform="matrix(1.2596208,0,0,1.2321507,-2.0868146,6.1558)" />
       <path
-         inkscape:transform-center-y="0.1182266"
-         inkscape:transform-center-x="0.20689655"
-         inkscape:connector-curvature="0"
          id="path2876"
          d="M 15.547876,15.0907 14.720906,9.3019016 9.7590817,14.263724 Z"
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04338683" />
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04338683" />
       <path
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.04338683"
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.04338683"
          d="m 0.4324269,16.889219 0.82697,5.788799 4.961825,-4.961823 z"
-         id="path829"
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-x="-0.20689655"
-         inkscape:transform-center-y="-0.1182266" />
+         id="path829" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/refresh.svg b/rtdata/icons/rawtherapee/scalable/apps/refresh.svg
index 3b0b0cb72..8d4aa1c73 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/refresh.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/refresh.svg
@@ -2,62 +2,16 @@
 <!-- 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="refresh.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-5.4380772"
-     inkscape:cy="10.923359"
-     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="true"
-     inkscape:snap-others="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -68,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,34 +55,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 3,12 c 0,-4.9705627 4.0294373,-9 9,-9 2.386487,0 4.706096,0.9788144 6.393847,2.6660655"
-       id="path853"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path853" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 21,12 v 0 0 c 0,4.970563 -4.029437,9 -9,9 -2.3864868,0 -4.7357054,-1.008844 -6.4234561,-2.696095"
-       id="path846"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccsc" />
+       id="path846" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="M 21.701729,8.9739529 20.874759,3.1851542 15.912934,8.1469769 Z"
-       id="path2876"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="0.20689655"
-       inkscape:transform-center-y="0.1182266" />
+       id="path2876" />
     <path
-       inkscape:transform-center-y="-0.1182266"
-       inkscape:transform-center-x="-0.20689655"
-       inkscape:connector-curvature="0"
        id="path829"
        d="m 2.2686614,14.996017 0.82697,5.788799 4.961825,-4.961823 z"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/remove-small.svg b/rtdata/icons/rawtherapee/scalable/apps/remove-small.svg
index 1bffa469c..796a415a7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/remove-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/remove-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="remove-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,32 +56,22 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        d="M 55,16 H 65"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4977" />
     <path
        id="path4979"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 2.5213637,16.478636 H 12.521364"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 2.5213637,16.478636 H 12.521364" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        d="M 24,16 H 34"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4981" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        d="M 39,16 H 49"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4983" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/remove.svg b/rtdata/icons/rawtherapee/scalable/apps/remove.svg
index bccfdb160..b3487a896 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/remove.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/remove.svg
@@ -2,64 +2,16 @@
 <!-- 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="remove.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-text-baseline="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -103,26 +55,20 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        d="m 34.028485,12 h 11.94303"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        id="path4947" />
     <circle
        r="10"
        cy="12"
        cx="40"
        id="circle4949"
-       style="opacity:0.7;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path4951"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 3,12 H 21"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="M 3,12 H 21" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode-hicontrast.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode-hicontrast.svg
index fda645c55..28d0eecf3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode-hicontrast.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode-hicontrast.svg
@@ -2,62 +2,16 @@
 <!-- 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>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -68,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,17 +55,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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"
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1.0;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.0;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"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        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>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode.svg
index 67ac406fa..a515aae6a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-aroundnode.svg
@@ -2,62 +2,16 @@
 <!-- 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>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -101,33 +55,25 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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"
+         style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;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" />
+         id="path1597" />
       <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" />
+         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:#cccccc;fill-opacity:1.0;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" />
+         style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1" />
     </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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;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"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-left-90.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-left-90.svg
index 7d08954b4..ddf7fb604 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-left-90.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-left-90.svg
@@ -2,63 +2,16 @@
 <!-- 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-left-90.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.3722628"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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-smooth-nodes="true"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -102,65 +55,57 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="m 1,12 3.999996,5 4.000005,-5 z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 5,12 A 7,7 0 0 1 12,5"
        id="path1684" />
     <g
        aria-label="90°"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text1716">
       <path
          d="m 7.6526021,20.366514 1.8688202,-0.235333 q 0.07383,0.392221 0.249176,0.553724 0.1753461,0.161503 0.4291367,0.161503 0.452208,0 0.705999,-0.456823 0.184574,-0.336849 0.276862,-1.42584 -0.336849,0.346078 -0.692156,0.507581 -0.355306,0.161503 -0.8213578,0.161503 -0.9090311,0 -1.5365855,-0.646012 -0.6229401,-0.646012 -0.6229401,-1.633488 0,-0.673698 0.3183916,-1.227422 0.3183916,-0.553725 0.8767305,-0.835201 0.5583388,-0.286091 1.4027683,-0.286091 1.015162,0 1.628873,0.350692 0.613712,0.346078 0.978247,1.107449 0.36915,0.756757 0.36915,2.002637 0,1.831905 -0.7706,2.685564 -0.7706,0.849044 -2.136454,0.849044 -0.8075149,0 -1.2735664,-0.184575 Q 8.4370451,21.626237 8.1278823,21.266316 7.8187194,20.906395 7.6526021,20.366514 Z M 11.11338,17.348715 q 0,-0.54911 -0.276862,-0.858273 -0.276862,-0.313777 -0.673698,-0.313777 -0.3737642,0 -0.6229402,0.281476 -0.2445617,0.281477 -0.2445617,0.84443 0,0.567568 0.2537904,0.867502 0.2584048,0.299934 0.6413975,0.299934 0.396836,0 0.659855,-0.290705 0.263019,-0.290706 0.263019,-0.830587 z"
-         style="stroke-width:0.99999994px"
+         style="stroke-width:0.99999994px;fill-opacity:1.0;fill:#cccccc"
          id="path20" />
       <path
          d="m 13.882003,18.474622 q 0,-1.928807 0.692156,-2.699407 0.69677,-0.7706 2.117996,-0.7706 0.682927,0 1.121292,0.170731 0.438365,0.166118 0.715227,0.438366 0.276863,0.267633 0.433751,0.567567 0.161503,0.29532 0.258405,0.692156 0.189189,0.756757 0.189189,1.578115 0,1.841134 -0.62294,2.694792 -0.62294,0.853659 -2.145682,0.853659 -0.853659,0 -1.379697,-0.272248 -0.526039,-0.272248 -0.862888,-0.798286 -0.244561,-0.373764 -0.382992,-1.019776 -0.133817,-0.650626 -0.133817,-1.435069 z m 1.864206,0.0046 q 0,1.292024 0.226104,1.767304 0.230718,0.470666 0.664469,0.470666 0.286091,0 0.493738,-0.198418 0.212261,-0.203032 0.309163,-0.636783 0.101516,-0.433751 0.101516,-1.352011 0,-1.347396 -0.230719,-1.808833 -0.226104,-0.466052 -0.682926,-0.466052 -0.466052,0 -0.673699,0.47528 -0.207646,0.470666 -0.207646,1.748847 z"
-         style="stroke-width:0.99999994px"
+         style="stroke-width:0.99999994px;fill-opacity:1.0;fill:#cccccc"
          id="path22" />
       <path
          d="m 23,16.31971 q 0,0.544496 -0.387607,0.932103 -0.387607,0.387607 -0.936718,0.387607 -0.544495,0 -0.932103,-0.387607 -0.387607,-0.387607 -0.387607,-0.932103 0,-0.54911 0.387607,-0.932103 Q 21.13118,15 21.675675,15 22.224786,15 22.612393,15.387607 23,15.7706 23,16.31971 Z m -0.858273,-0.0046 q 0,-0.193804 -0.138431,-0.332235 -0.133817,-0.138431 -0.327621,-0.138431 -0.193803,0 -0.332234,0.138431 -0.138431,0.138431 -0.138431,0.332235 0,0.193804 0.138431,0.332235 0.138431,0.133816 0.332234,0.133816 0.193804,0 0.327621,-0.133816 0.138431,-0.138431 0.138431,-0.332235 z"
-         style="stroke-width:0.99999994px"
+         style="stroke-width:0.99999994px;fill-opacity:1.0;fill:#cccccc"
          id="path24" />
     </g>
     <path
-       inkscape:connector-curvature="0"
        id="path1724"
        d="m -39,12 3.999996,5 4.000005,-5 z"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <path
        id="path1726"
        d="m -35,12 a 7,7 0 0 1 7,-7"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path1728"
        d="m -28,5 a 7,7 0 0 1 7,7 v 0 0 a 7,7 0 0 1 -7,7 7,7 0 0 1 -4.949657,-2.050162"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1.0;paint-order:normal" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1.0;paint-order:normal"
        d="M 12 5 A 7 7 0 0 1 19 12 L 19 12 L 19 12 A 7 7 0 0 1 18.707883 14.001075 "
        id="path1734" />
     <text
        id="text18"
        y="21.884642"
        x="27.181936"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        xml:space="preserve"><tspan
-         style="stroke-width:0.99999994px"
+         style="fill:#cccccc;fill-opacity:1;stroke-width:1px"
          y="21.884642"
          x="27.181936"
-         id="tspan16"
-         sodipodi:role="line">90°</tspan></text>
+         id="tspan16">90°</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-left-small.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-left-small.svg
index d85b5e8ea..fad01fe23 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-left-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-left-small.svg
@@ -2,65 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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-left-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -71,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,49 +56,33 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       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:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 5.268672,12.405793 c -0.0019,0.0019 -0.0038,0.0039 -0.0057,0.0058"
-       id="path1029"
-       inkscape:connector-curvature="0" />
+       id="path1029" />
     <path
-       inkscape:connector-curvature="0"
        id="path1597-3"
        d="M 3.390028,10.527595 7.1358337,14.295686 2,15.656154 Z"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.54308969"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.54308969" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m 6.511406,20.495343 a 5,5 0 0 0 1.1548863,0.39684 5,5 0 0 0 1.2161127,0.105074"
-       id="path1085"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-1.0007498"
-       inkscape:transform-center-y="4.7347907" />
+       id="path1085" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m 4.701135,19 a 5,5 0 0 0 0.887626,0.913413"
-       id="path1096"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-3.5527073"
-       inkscape:transform-center-y="3.443561" />
+       id="path1096" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m 3.863677,17.263528 a 5,5 0 0 0 0.303842,0.84478"
-       id="path1103"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-4.6820573"
-       inkscape:transform-center-y="1.6727725" />
+       id="path1103" />
     <path
-       inkscape:connector-curvature="0"
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="M 13.549711,17.212025 A 5,5 0 0 0 13.698835,16 a 5,5 0 0 0 -5,-5 5,5 0 0 0 -3.459061,1.389612"
        id="path1078" />
     <path
-       inkscape:connector-curvature="0"
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m 10.454545,20.681611 a 5,5 0 0 0 2.48396,-2.031101"
        id="path1105" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-left.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-left.svg
index c66020379..7c1e5fa1c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-left.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-left.svg
@@ -2,61 +2,16 @@
 <!-- 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-left.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="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -67,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,40 +55,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="cscssccsscc"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="M 5.657714,5.0739174 C 6.130198,4.5791883 6.651928,4.1327287 7.214296,3.7408118 8.225928,3.0357998 9.328665,2.5406377 10.466341,2.247929 10.78489,2.1659695 11.105849,2.0994861 11.428819,2.0489379 15.20193,1.4584087 19.194453,2.9935821 21.49872,6.3098302 c 1.015861,1.4620018 1.593481,3.1119896 1.762046,4.7859648 l -3.329858,0.350074 C 19.821156,10.313122 19.436785,9.2000776 18.756771,8.2214161 16.614675,5.1385632 12.200807,4.3428615 9.12454,6.486728 8.723826,6.7659874 8.351592,7.0896074 8.017718,7.4480763 Z"
-       id="path7246"
-       inkscape:connector-curvature="0" />
+       id="path7246" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 7.400268,16.135401 c 0.228291,0.328551 0.483021,0.630525 0.758557,0.906309 L 5.785488,19.400292 C 5.376762,18.9887 4.999293,18.53771 4.658317,18.046987 Z"
-       id="path7240"
-       inkscape:connector-curvature="0" />
+       id="path7240" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 19.858848,13.357326 3.299252,0.576553 c -0.336197,1.941642 -1.216191,3.78767 -2.593047,5.271303 l -2.446361,-2.283701 c 0.921811,-0.999329 1.512961,-2.249538 1.740156,-3.564155 z"
-       id="path7236"
-       inkscape:connector-curvature="0" />
+       id="path7236" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 9.672517,18.182052 c 0.563529,0.312882 1.167355,0.545082 1.790956,0.694595 l -0.770617,3.265899 C 9.767791,21.921175 8.870857,21.575189 8.033994,21.107094 Z"
-       id="path7234"
-       inkscape:connector-curvature="0" />
+       id="path7234" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 16.630398,18.128098 1.726088,2.866186 c -1.505625,0.901929 -3.176284,1.369133 -4.850989,1.429649 l -0.15383,-3.351185 c 1.135347,-0.03451 2.266561,-0.342874 3.278729,-0.944656 z"
-       id="path9832"
-       inkscape:connector-curvature="0" />
+       id="path9832" />
     <path
-       inkscape:connector-curvature="0"
        id="path1597"
        d="M 3.38911,2.7918742 10.286322,9.7301195 0.82963,12.235182 Z"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-right-90.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-right-90.svg
index bb2e66482..edc9afa38 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-right-90.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-right-90.svg
@@ -2,63 +2,16 @@
 <!-- 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-right-90.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.3722628"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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-smooth-nodes="true"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:bbox-paths="false"
-     inkscape:snap-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -102,66 +55,57 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
        d="m 23,12 -3.999996,5 -4.000005,-5 z"
-       id="path2866"
-       inkscape:connector-curvature="0" />
+       id="path2866" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="M 19,12 A 7,7 0 0 0 12,5"
        id="path1684" />
     <g
        aria-label="90°"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text1716">
       <path
          d="m 1.1430455,20.366514 1.8688202,-0.235333 q 0.07383,0.392221 0.249176,0.553724 0.1753461,0.161503 0.4291365,0.161503 0.4522084,0 0.7059988,-0.456823 0.1845748,-0.336849 0.2768622,-1.42584 -0.3368491,0.346078 -0.6921556,0.507581 -0.3553066,0.161503 -0.821358,0.161503 -0.9090311,0 -1.5365855,-0.646012 Q 1,18.340805 1,17.353329 q 0,-0.673698 0.3183916,-1.227422 0.3183916,-0.553725 0.8767305,-0.835201 0.5583388,-0.286091 1.4027687,-0.286091 1.0151616,0 1.6288729,0.350692 0.6137114,0.346078 0.9782467,1.107449 0.3691496,0.756757 0.3691496,2.002637 0,1.831905 -0.7705999,2.685564 -0.7706,0.849044 -2.1364537,0.849044 -0.8075149,0 -1.2735664,-0.184575 Q 1.9274886,21.626237 1.6183257,21.266316 1.3091629,20.906395 1.1430455,20.366514 Z m 3.4607782,-3.017799 q 0,-0.54911 -0.2768623,-0.858273 -0.2768622,-0.313777 -0.6736981,-0.313777 -0.3737641,0 -0.6229401,0.281476 -0.2445617,0.281477 -0.2445617,0.84443 0,0.567568 0.2537904,0.867502 0.2584048,0.299934 0.6413976,0.299934 0.3968359,0 0.659855,-0.290705 0.2630192,-0.290706 0.2630192,-0.830587 z"
-         style="stroke-width:0.99999994px"
+         style="stroke-width:0.99999994px;fill-opacity:1.0;fill:#cccccc"
          id="path20" />
       <path
          d="m 7.3724463,18.474622 q 0,-1.928807 0.6921556,-2.699407 0.69677,-0.7706 2.1179961,-0.7706 0.682927,0 1.121292,0.170731 0.438366,0.166118 0.715228,0.438366 0.276862,0.267633 0.433751,0.567567 0.161503,0.29532 0.258404,0.692156 0.18919,0.756757 0.18919,1.578115 0,1.841134 -0.62294,2.694792 -0.622941,0.853659 -2.145683,0.853659 -0.8536585,0 -1.3796968,-0.272248 Q 8.2261049,21.455505 7.8892558,20.929467 7.6446942,20.555703 7.5062631,19.909691 7.3724463,19.259065 7.3724463,18.474622 Z m 1.8642058,0.0046 q 0,1.292024 0.2261042,1.767304 0.2307185,0.470666 0.6644697,0.470666 0.286091,0 0.493737,-0.198418 0.212261,-0.203032 0.309163,-0.636783 0.101516,-0.433751 0.101516,-1.352011 0,-1.347396 -0.230718,-1.808833 -0.226104,-0.466052 -0.682927,-0.466052 -0.4660515,0 -0.6736982,0.47528 -0.2076467,0.470666 -0.2076467,1.748847 z"
-         style="stroke-width:0.99999994px"
+         style="stroke-width:0.99999994px;fill-opacity:1.0;fill:#cccccc"
          id="path22" />
       <path
          d="m 16.490443,16.31971 q 0,0.544496 -0.387607,0.932103 -0.387607,0.387607 -0.936717,0.387607 -0.544496,0 -0.932103,-0.387607 -0.387607,-0.387607 -0.387607,-0.932103 0,-0.54911 0.387607,-0.932103 Q 14.621623,15 15.166119,15 q 0.54911,0 0.936717,0.387607 0.387607,0.382993 0.387607,0.932103 z m -0.858273,-0.0046 q 0,-0.193804 -0.138431,-0.332235 -0.133817,-0.138431 -0.32762,-0.138431 -0.193804,0 -0.332235,0.138431 -0.138431,0.138431 -0.138431,0.332235 0,0.193804 0.138431,0.332235 0.138431,0.133816 0.332235,0.133816 0.193803,0 0.32762,-0.133816 0.138431,-0.138431 0.138431,-0.332235 z"
-         style="stroke-width:0.99999994px"
+         style="stroke-width:0.99999994px;fill-opacity:1.0;fill:#cccccc"
          id="path24" />
     </g>
     <path
-       inkscape:connector-curvature="0"
        id="path1724"
        d="m -39,12 3.999996,5 4.000005,-5 z"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <path
        id="path1726"
        d="m -35,12 a 7,7 0 0 1 7,-7"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     <path
        id="path1728"
        d="m -28,5 a 7,7 0 0 1 7,7 v 0 0 a 7,7 0 0 1 -7,7 7,7 0 0 1 -4.949657,-2.050162"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1.0;paint-order:normal" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1.0;paint-order:normal"
        d="m 12,5 a 7,7 0 0 0 -7,7 v 0 0 a 7,7 0 0 0 0.292117,2.001075"
-       id="path1734"
-       inkscape:connector-curvature="0" />
+       id="path1734" />
     <text
        id="text18"
        y="21.884642"
        x="28.67238"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        xml:space="preserve"><tspan
-         style="stroke-width:0.99999994px"
+         style="fill:#cccccc;fill-opacity:1;stroke-width:1px"
          y="21.884642"
          x="28.67238"
-         id="tspan16"
-         sodipodi:role="line">90°</tspan></text>
+         id="tspan16">90°</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-right-small.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-right-small.svg
index 89e6d4ac2..ba1410815 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-right-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-right-small.svg
@@ -2,65 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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-right-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -71,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,48 +56,34 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       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:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        d="m 11.430163,12.405793 c 0.0019,0.0019 0.0038,0.0039 0.0057,0.0058"
-       id="path1029"
-       inkscape:connector-curvature="0" />
+       id="path1029" />
     <path
-       inkscape:connector-curvature="0"
        id="path1597-3"
        d="m 13.308807,10.527595 -3.7458057,3.768091 5.1358337,1.360468 z"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.54308969"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.54308969" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="M 10.187429,20.495343 A 5,5 0 0 1 9.0325427,20.892183 5,5 0 0 1 7.81643,20.997257"
-       id="path1085"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-1.0007498"
-       inkscape:transform-center-y="4.7347907" />
+       id="path1085" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m 11.9977,19 a 5,5 0 0 1 -0.887626,0.913413"
-       id="path1096"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-3.5527073"
-       inkscape:transform-center-y="3.443561" />
+       id="path1096" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="m 12.835158,17.263528 a 5,5 0 0 1 -0.303842,0.84478"
-       id="path1103"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-4.6820573"
-       inkscape:transform-center-y="1.6727725" />
+       id="path1103" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="M 3.1491244 9.2120253 A 5 5 0 0 1 3 8 A 5 5 0 0 1 8 3 A 5 5 0 0 1 11.459061 4.3896124 "
        id="path1078"
        transform="translate(0,8)" />
     <path
-       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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1.0;paint-order:normal"
        d="M 6.2442904 12.681611 A 5 5 0 0 1 3.7603303 10.65051 "
        id="path1105"
        transform="translate(0,8)" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-right.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-right.svg
index 26a46a3f6..4d5763e1e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-right.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-right.svg
@@ -2,61 +2,16 @@
 <!-- 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-right.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     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="true"
-     inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -100,40 +55,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="cscssccsscc"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="M 18.432682,5.0739174 C 17.960198,4.5791883 17.438468,4.1327287 16.8761,3.7408118 15.864468,3.0357998 14.761731,2.5406377 13.624055,2.247929 13.305506,2.1659695 12.984547,2.0994861 12.661577,2.0489379 8.8884658,1.4584087 4.8959427,2.9935821 2.5916756,6.3098302 1.5758151,7.771832 0.99819486,9.4218198 0.82963039,11.095795 L 4.1594877,11.445869 C 4.26924,10.313122 4.6536113,9.2000776 5.3336254,8.2214161 7.4757206,5.1385632 11.889589,4.3428615 14.965856,6.486728 c 0.400714,0.2792594 0.772948,0.6028794 1.106822,0.9613483 z"
-       id="path7246"
-       inkscape:connector-curvature="0" />
+       id="path7246" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 16.690128,16.135401 c -0.228291,0.328551 -0.483021,0.630525 -0.758557,0.906309 l 2.373337,2.358582 c 0.408726,-0.411592 0.786195,-0.862582 1.127171,-1.353305 z"
-       id="path7240"
-       inkscape:connector-curvature="0" />
+       id="path7240" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 4.2315477,13.357326 -3.29925202,0.576553 c 0.33619772,1.941642 1.21619152,3.78767 2.59304722,5.271303 L 5.9717038,16.921481 C 5.0498934,15.922152 4.4587433,14.671943 4.2315477,13.357326 Z"
-       id="path7236"
-       inkscape:connector-curvature="0" />
+       id="path7236" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 14.417879,18.182052 c -0.563529,0.312882 -1.167355,0.545082 -1.790956,0.694595 l 0.770617,3.265899 c 0.925065,-0.221371 1.821999,-0.567357 2.658862,-1.035452 z"
-       id="path7234"
-       inkscape:connector-curvature="0" />
+       id="path7234" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994"
        d="m 7.4599979,18.128098 -1.7260877,2.866186 c 1.5056246,0.901929 3.1762836,1.369133 4.8509888,1.429649 l 0.15383,-3.351185 C 9.6033817,19.038237 8.4721677,18.729874 7.4599995,18.128092 Z"
-       id="path9832"
-       inkscape:connector-curvature="0" />
+       id="path9832" />
     <path
-       inkscape:connector-curvature="0"
        id="path1597"
        d="m 20.701286,2.7918742 -6.897212,6.9382453 9.456692,2.5050625 z"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999994" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten-small.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten-small.svg
index 00da936f8..5a63b665e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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-straighten-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,36 +56,26 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2,1;stroke-dashoffset:2.4;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2,1;stroke-dashoffset:2.4;stroke-opacity:1.0"
        d="M 1,22 15,18"
-       id="path886"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path886" />
     <path
-       sodipodi:nodetypes="cc"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 1,22.5 H 15"
-       id="path888"
-       inkscape:connector-curvature="0" />
+       id="path888" />
     <path
-       inkscape:connector-curvature="0"
        id="path890"
        d="M 14.99615,13.144029 14.012235,17 10.466293,15.193649 Z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0216444" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0216444" />
     <path
-       sodipodi:nodetypes="cc"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.86449265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.86449265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        d="m 7.6181805,10.843357 c 2.2119757,0 4.2161825,1.303531 5.1130595,3.325522"
-       id="path937"
-       inkscape:connector-curvature="0" />
+       id="path937" />
     <path
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.62149757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.24299514, 1.24299514;stroke-dashoffset:1;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.62149757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.24299514, 1.24299514;stroke-dashoffset:1;stroke-opacity:1.0;paint-order:normal"
        d="M 2.7738413,19.233149 A 5.5934781,5.5934781 0 0 1 2.0247024,16.436835 5.5934781,5.5934781 0 0 1 7.6181805,10.843357"
-       id="path942"
-       inkscape:connector-curvature="0" />
+       id="path942" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten.svg b/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten.svg
index 34765aa2b..e833ae8b1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/rotate-straighten.svg
@@ -2,68 +2,16 @@
 <!-- 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-straighten.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="7.684729"
-     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="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-nodes="true"
-     showguides="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -107,9 +55,7 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g950"
        transform="translate(-20)">
@@ -117,13 +63,11 @@
          transform="matrix(-1,0,0,1,-2,0)"
          id="g1732">
         <path
-           style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+           style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
            d="m 1,12 3.999996,5 4.000005,-5 z"
-           id="path2866"
-           inkscape:connector-curvature="0" />
+           id="path2866" />
         <path
-           inkscape:connector-curvature="0"
-           style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+           style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
            d="M 5,12 A 7,7 0 0 1 12,5"
            id="path1684" />
       </g>
@@ -131,107 +75,86 @@
          id="text1716"
          y="21.884642"
          x="-25.32762"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023155px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.45023px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          xml:space="preserve"><tspan
-           style="stroke-width:0.99999994px"
+           style="fill:#cccccc;fill-opacity:1;stroke-width:1px"
            y="21.884642"
            x="-25.32762"
-           id="tspan1714"
-           sodipodi:role="line">90°</tspan></text>
+           id="tspan1714">90°</tspan></text>
       <path
-         inkscape:connector-curvature="0"
          id="path1734"
          d="m -14,5 a 7,7 0 0 0 -7,7 v 0 0 a 7,7 0 0 0 0.292117,2.001075"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:10;stroke-opacity:1.0;paint-order:normal" />
     </g>
     <g
        id="g851"
        transform="translate(0,-34)">
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path825"
          d="M 1,16 12,-5"
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="path827"
          d="M 1,16 H 23"
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262"
          d="M 23,9 19.000004,14 14.999999,9 Z"
-         id="path2866-3"
-         inkscape:connector-curvature="0" />
+         id="path2866-3" />
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
          d="M 19,9 A 7,7 0 0 0 12,2"
          id="path1684-6" />
     </g>
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path853"
        d="M 0.5,62.133975 22,56"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path855"
        d="M 1.5,61.934174 23,62"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:nodetypes="cc" />
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <g
        id="g865"
        transform="rotate(-30,93.71906,36.172835)">
       <path
-         inkscape:connector-curvature="0"
          id="path857"
          d="M 23,9 19.000004,14 14.999999,9 Z"
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
       <path
          id="path859"
          d="M 19,9 A 7,7 0 0 0 12,2"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
     </g>
     <rect
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0;paint-order:normal"
        id="rect872"
        width="24"
        height="24"
        x="0"
        y="40" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1.0"
        d="M 1,22 23,16"
-       id="path886"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path886" />
     <path
-       sodipodi:nodetypes="cc"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 1,22 H 23"
-       id="path888"
-       inkscape:connector-curvature="0" />
+       id="path888" />
     <path
-       inkscape:connector-curvature="0"
        id="path890"
        d="m 23.256923,7.6062159 -1.583136,6.2043231 -5.70548,-2.90645 z"
-       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.0348262" />
     <g
        id="g982">
       <path
-         inkscape:connector-curvature="0"
          id="path937"
          d="m 11.385646,3.9043962 c 3.559106,0 6.783908,2.097404 8.226998,5.3508215"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         sodipodi:nodetypes="cc" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
       <path
-         inkscape:connector-curvature="0"
          id="path942"
          d="M 3.5910231,17.403713 A 9,9 0 0 1 2.3856461,12.904396 9,9 0 0 1 11.385646,3.9043962"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:1;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:1;stroke-opacity:1.0;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/save-small.svg b/rtdata/icons/rawtherapee/scalable/apps/save-small.svg
index 3398e27c8..94de504b8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/save-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/save-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="save-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        transform="matrix(0.7,0,0,-0.7,-62.4,24.4)"
@@ -107,8 +63,7 @@
       <path
          id="path35010"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <rect
          ry="1"
          rx="1"
@@ -117,10 +72,10 @@
          height="5"
          width="3"
          id="rect35012"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35224"
        width="8.3999996"
        height="1.4"
@@ -129,7 +84,7 @@
        rx="0.69999999"
        ry="0.69999999" />
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.53362322;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.53362322;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35226"
        width="8.3999996"
        height="1.4"
@@ -141,24 +96,21 @@
        id="g1521"
        transform="matrix(0.65000001,0,0,-0.65000001,-38.800001,24.3)">
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 70.378907,11.001116 c 0.186488,-0.217887 0.365457,-0.448939 0.619419,-0.594308 0.689239,-0.450738 1.668267,-0.360989 2.268415,0.200893 0.12989,0.120409 0.238764,0.259983 0.354353,0.393415 -1.080729,0 -2.161458,0 -3.242187,0 z"
-         id="path1601"
-         inkscape:connector-curvature="0" />
+         id="path1601" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 5.5410156,1 H 1.6992188 C 1.3114188,1 1,1.3114188 1,1.6992188 V 14.300781 C 1,14.688581 1.3114188,15 1.6992188,15 H 12.199219 L 15,12.199219 V 1.6992188 C 15,1.3114188 14.688581,1 14.300781,1 h -3.841797 v 1.4003906 h 2.519532 c 0.344711,0 0.621093,0.2818394 0.621093,0.6308594 v 5.0390625 c 0,0.34902 -0.276382,0.6289063 -0.621093,0.6289063 H 9.1347656 L 9,8.8574219 a 1.3173912,1.3173912 0 0 1 -0.021484,0.023437 1.3173912,1.3173912 0 0 1 -0.091797,0.09375 1.3173912,1.3173912 0 0 1 -0.1015626,0.083984 1.3173912,1.3173912 0 0 1 -0.109375,0.072266 1.3173912,1.3173912 0 0 1 -0.1171874,0.0625 A 1.3173912,1.3173912 0 0 1 8.4375,9.2421875 1.3173912,1.3173912 0 0 1 8.3105469,9.2792969 1.3173912,1.3173912 0 0 1 8.1816406,9.3046875 1.3173912,1.3173912 0 0 1 8.0507812,9.3164062 1.3173912,1.3173912 0 0 1 7.9179688,9.3144531 1.3173912,1.3173912 0 0 1 7.7871094,9.3007812 1.3173912,1.3173912 0 0 1 7.6582031,9.2714844 1.3173912,1.3173912 0 0 1 7.5332031,9.2324219 1.3173912,1.3173912 0 0 1 7.4121094,9.1796875 1.3173912,1.3173912 0 0 1 7.2988281,9.1152344 1.3173912,1.3173912 0 0 1 7.1894531,9.0390625 1.3173912,1.3173912 0 0 1 7.0898438,8.953125 1.3173912,1.3173912 0 0 1 7,8.8574219 L 6.8652344,8.6992188 h -3.84375 c -0.3447108,0 -0.6210938,-0.2798863 -0.6210938,-0.6289063 V 3.03125 c 0,-0.34902 0.276383,-0.6308594 0.6210938,-0.6308594 H 5.5410156 Z M 4.5,10.099609 h 7 c 0.3878,0 0.699219,0.313372 0.699219,0.701172 v 2.798828 c 0,0.3878 -0.311419,0.701172 -0.699219,0.701172 h -7 c -0.3878,0 -0.6992188,-0.313372 -0.6992188,-0.701172 v -2.798828 c 0,-0.3878 0.3114188,-0.701172 0.6992188,-0.701172 z"
          id="path1599"
-         transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 5.5410156,1 V 2.4003906 H 10.458984 V 1 Z"
          id="path1517"
-         transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect1519"
          width="3"
          height="5"
@@ -170,8 +122,6 @@
     <path
        id="path34980"
        d="m 6.85714,9 v 4 H 4.571427 L 8,17 11.428573,13 H 9.14286 V 9 Z"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.14285719;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.14285719;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/save.svg b/rtdata/icons/rawtherapee/scalable/apps/save.svg
index eae40ed09..818b8d52d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/save.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/save.svg
@@ -2,60 +2,16 @@
 <!-- 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="save.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -99,32 +55,26 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g34984"
        transform="translate(-80)">
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 12.603516,20 c -0.453776,0 -0.907552,0 -1.361328,0 0.395652,0.284746 0.964388,0.278373 1.361328,0 z"
-         id="path35160"
-         inkscape:connector-curvature="0" />
+         id="path35160" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 7.9765625,9 c 0.058261,0.3878133 0.1578463,0.7487678 0.1933594,1.150391 H 6.4023438 a 1.2115585,1.2115585 0 0 0 -0.1210938,0.0059 1.2115585,1.2115585 0 0 0 -0.1191406,0.01758 1.2115585,1.2115585 0 0 0 -0.1171875,0.03125 1.2115585,1.2115585 0 0 0 -0.1152344,0.04102 1.2115585,1.2115585 0 0 0 -0.1074219,0.05273 1.2115585,1.2115585 0 0 0 -0.1035156,0.0625 1.2115585,1.2115585 0 0 0 -0.097656,0.07422 1.2115585,1.2115585 0 0 0 -0.087891,0.08203 1.2115585,1.2115585 0 0 0 -0.080078,0.0918 1.2115585,1.2115585 0 0 0 -0.070312,0.09766 A 1.2115585,1.2115585 0 0 0 5.3222656,10.8125 1.2115585,1.2115585 0 0 0 5.2734375,10.923828 1.2115585,1.2115585 0 0 0 5.2480469,11 H 18.59375 a 1.2115585,1.2115585 0 0 0 -0.02734,-0.08203 1.2115585,1.2115585 0 0 0 -0.05078,-0.111328 1.2115585,1.2115585 0 0 0 -0.06055,-0.103516 1.2115585,1.2115585 0 0 0 -0.07031,-0.09961 1.2115585,1.2115585 0 0 0 -0.08008,-0.08984 1.2115585,1.2115585 0 0 0 -0.08984,-0.08203 1.2115585,1.2115585 0 0 0 -0.0957,-0.07227 1.2115585,1.2115585 0 0 0 -0.103516,-0.0625 1.2115585,1.2115585 0 0 0 -0.109375,-0.05273 1.2115585,1.2115585 0 0 0 -0.115234,-0.04102 1.2115585,1.2115585 0 0 0 -0.117188,-0.0293 1.2115585,1.2115585 0 0 0 -0.11914,-0.01758 1.2115585,1.2115585 0 0 0 -0.115235,-0.0059 H 15.238281 C 15.170332,9.7604272 15.03518,9.3853944 14.941406,9 Z"
-         id="path35158"
-         inkscape:connector-curvature="0" />
+         id="path35158" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 2.8554688,2.0605469 C 2.3812131,2.1393366 2,2.5027155 2,3 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 18,2 h -7.617188 c 0.376118,0.2871423 0.636213,0.6726392 0.97461,1 H 17 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 h -2.058594 c 0.09377,0.3853944 0.228926,0.7604272 0.296875,1.150391 h 2.201172 a 1.2115585,1.2115585 0 0 1 0.115235,0.0059 1.2115585,1.2115585 0 0 1 0.11914,0.01758 1.2115585,1.2115585 0 0 1 0.117188,0.0293 1.2115585,1.2115585 0 0 1 0.115234,0.04102 1.2115585,1.2115585 0 0 1 0.109375,0.05273 1.2115585,1.2115585 0 0 1 0.103516,0.0625 1.2115585,1.2115585 0 0 1 0.0957,0.07227 1.2115585,1.2115585 0 0 1 0.08984,0.08203 1.2115585,1.2115585 0 0 1 0.08008,0.08984 1.2115585,1.2115585 0 0 1 0.07031,0.09961 1.2115585,1.2115585 0 0 1 0.06055,0.103516 1.2115585,1.2115585 0 0 1 0.05078,0.111328 A 1.2115585,1.2115585 0 0 1 18.59375,11 h 0.517578 C 19.603773,11 20,11.401791 20,11.900391 v 7.199218 C 20,19.598209 19.603773,20 19.111328,20 h -6.507812 a 1.2115585,1.2115585 0 0 1 -0.04297,0.0293 1.2115585,1.2115585 0 0 1 -0.107422,0.05859 1.2115585,1.2115585 0 0 1 -0.111328,0.04883 1.2115585,1.2115585 0 0 1 -0.115235,0.03516 1.2115585,1.2115585 0 0 1 -0.11914,0.02539 1.2115585,1.2115585 0 0 1 -0.119141,0.01172 1.2115585,1.2115585 0 0 1 -0.121093,0.002 A 1.2115585,1.2115585 0 0 1 11.746093,20.19927 1.2115585,1.2115585 0 0 1 11.626952,20.17583 1.2115585,1.2115585 0 0 1 11.511718,20.14067 1.2115585,1.2115585 0 0 1 11.40039,20.0938 1.2115585,1.2115585 0 0 1 11.292968,20.03521 1.2115585,1.2115585 0 0 1 11.242188,20 H 4.8886719 C 4.3962275,20 4,19.598209 4,19.099609 V 11.900391 C 4,11.401791 4.3962275,11 4.8886719,11 h 0.359375 a 1.2115585,1.2115585 0 0 1 0.025391,-0.07617 1.2115585,1.2115585 0 0 1 0.048828,-0.111328 1.2115585,1.2115585 0 0 1 0.060547,-0.105469 1.2115585,1.2115585 0 0 1 0.070312,-0.09766 1.2115585,1.2115585 0 0 1 0.080078,-0.0918 1.2115585,1.2115585 0 0 1 0.087891,-0.08203 1.2115585,1.2115585 0 0 1 0.097656,-0.07422 1.2115585,1.2115585 0 0 1 0.1035156,-0.0625 1.2115585,1.2115585 0 0 1 0.1074219,-0.05273 1.2115585,1.2115585 0 0 1 0.1152344,-0.04102 1.2115585,1.2115585 0 0 1 0.1171875,-0.03125 1.2115585,1.2115585 0 0 1 0.1191406,-0.01758 1.2115585,1.2115585 0 0 1 0.1210938,-0.0059 H 8.1699219 C 8.1344088,9.7487678 8.0348231,9.3878133 7.9765625,9 H 7 C 6.446,9 6,8.554 6,8 V 5.0019531 C 5.3956127,4.440978 4.7593255,3.8884314 3.9589844,3.609375 A 1.2115585,1.2115585 0 0 1 3.9179688,3.59375 1.2115585,1.2115585 0 0 1 3.8085938,3.5449219 1.2115585,1.2115585 0 0 1 3.703125,3.484375 C 3.396755,3.2879905 3.1688672,3.0378127 3.0175781,2.75 2.9085777,2.5426374 2.8850498,2.29953 2.8554688,2.0605469 Z"
-         id="path35156"
-         inkscape:connector-curvature="0" />
+         id="path35156" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 2.8554688,2.0605469 C 2.8850498,2.29953 2.9085777,2.5426374 3.0175781,2.75 3.1688672,3.0378127 3.396755,3.2879905 3.703125,3.484375 a 1.2115585,1.2115585 0 0 0 0.1054688,0.060547 1.2115585,1.2115585 0 0 0 0.109375,0.048828 1.2115585,1.2115585 0 0 0 0.041016,0.015625 C 4.7593255,3.8884314 5.3956127,4.440978 6,5.0019531 V 4 C 6,3.446 6.446,3 7,3 h 4.357422 C 11.019025,2.6726392 10.75893,2.2871423 10.382812,2 H 3 C 2.943284,2 2.909558,2.051561 2.8554688,2.0605469 Z"
-         id="rect34888"
-         inkscape:connector-curvature="0" />
+         id="rect34888" />
       <rect
          ry="1"
          rx="1"
@@ -133,24 +83,21 @@
          height="5"
          width="3"
          id="rect34916"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:1;fill:#008000;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"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;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 -33,4.9999998 v 3.5 h -2 L -32,12 -29,8.4999998 h -2 v -3.5 z"
        id="rect1539" />
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.83998775;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.83998775;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m -75.99996,1.7904779 c -0.0042,-0.508414 0.541236,-0.9177892 1.027542,-0.7537564 3.036185,0.1570363 5.655209,2.2074491 7.292254,4.656142 1.115625,1.6861578 1.747033,3.6633289 1.946108,5.6681995 h 3.173129 L -68.077806,19 -73.597798,11.361136 h 3.127166 c -0.09036,-2.3412669 -0.365859,-4.878771 -1.987224,-6.7117469 -0.827859,-1.015285 -1.955596,-1.755963 -3.184266,-2.1843655 -0.223239,-0.1430971 -0.360557,-0.4140485 -0.357838,-0.6745457 z"
-       id="path8807-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
+       id="path8807-3" />
     <g
        id="g34988"
        transform="matrix(1,0,0,-1,-60,25)">
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect34976"
          width="3"
          height="5"
@@ -159,52 +106,44 @@
          rx="1"
          ry="1" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          mask="none"
          d="m 70.710938,11 c 0.22253,-0.273714 0.523106,-0.485307 0.867187,-0.574219 0.596781,-0.164167 1.275209,0.04638 1.66866,0.525678 0.01538,0.0216 0.06821,0.06024 0.01043,0.04854 -0.84876,0 -1.697521,0 -2.546281,0 z"
-         id="path35172"
-         inkscape:connector-curvature="0" />
+         id="path35172" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          mask="none"
          d="M 88.65625,2 H 83 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 15 l 4,-4 V 3 c 0,-0.554 -0.446,-1 -1,-1 h -5.65625 v 2 h 3.767578 C 99.603773,4 100,4.4017906 100,4.9003906 V 12.099609 C 100,12.598209 99.603773,13 99.111328,13 h -5.822266 l -0.05273,0.06055 a 1.6285444,1.6285444 0 0 1 -0.02539,0.0293 1.6285444,1.6285444 0 0 1 -0.115235,0.115234 1.6285444,1.6285444 0 0 1 -0.125,0.103516 1.6285444,1.6285444 0 0 1 -0.136719,0.08984 1.6285444,1.6285444 0 0 1 -0.142578,0.07617 1.6285444,1.6285444 0 0 1 -0.152344,0.0625 1.6285444,1.6285444 0 0 1 -0.154296,0.04687 1.6285444,1.6285444 0 0 1 -0.160157,0.0293 1.6285444,1.6285444 0 0 1 -0.162109,0.01367 1.6285444,1.6285444 0 0 1 -0.164062,-0.002 1.6285444,1.6285444 0 0 1 -0.16211,-0.01758 1.6285444,1.6285444 0 0 1 -0.158203,-0.0332 1.6285444,1.6285444 0 0 1 -0.154297,-0.05078 1.6285444,1.6285444 0 0 1 -0.15039,-0.06445 A 1.6285444,1.6285444 0 0 1 91.132816,13.37886 1.6285444,1.6285444 0 0 1 90.998051,13.28511 1.6285444,1.6285444 0 0 1 90.875,13.177734 1.6285444,1.6285444 0 0 1 90.763672,13.060547 L 90.710938,13 H 84.888672 C 84.396228,13 84,12.598209 84,12.099609 V 4.9003906 C 84,4.4017906 84.396228,4 84.888672,4 H 88.65625 Z M 87,15 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 87 c -0.554,0 -1,-0.446 -1,-1 v -4 c 0,-0.554 0.446,-1 1,-1 z"
          id="path35170"
-         transform="matrix(1,0,0,-1,-20,24)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1,0,0,-1,-20,24)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          mask="none"
          d="m 88.65625,2 v 2 h 6.6875 V 2 Z"
          id="path34974"
-         transform="matrix(1,0,0,-1,-20,24)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1,0,0,-1,-20,24)" />
     </g>
     <path
        id="path34980"
        d="M 10.28571,1 V 7.0000001 H 6.85714 L 12,13 17.14286,7.0000001 H 13.71429 V 1 Z"
-       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       style="opacity:1;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <g
        transform="matrix(1,0,0,-1,20,24)"
        id="g34994">
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 70.63281,11 c 0.40056,-0.486481 1.1182,-0.670076 1.70508,-0.443359 0.23845,0.08811 0.48079,0.251886 0.62997,0.443359 -0.77835,0 -1.5567,0 -2.33505,0 z"
-         id="path35202"
-         inkscape:connector-curvature="0" />
+         id="path35202" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 165.67188,2 H 163 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 15 l 4,-4 V 3 c 0,-0.554 -0.446,-1 -1,-1 h -7.91992 c 0.0734,0.101194 0.19683,0.1705282 0.26562,0.2734375 a 1.5394022,1.5394022 0 0 1 0.004,0.00586 C 173.70099,2.810366 173.83316,3.4186571 174.04688,4 h 5.06445 C 179.60377,4 180,4.4017906 180,4.9003906 V 12.099609 C 180,12.598209 179.60377,13 179.11133,13 h -6.13867 a 1.5394022,1.5394022 0 0 1 -0.008,0.0098 1.5394022,1.5394022 0 0 1 -0.10742,0.111328 1.5394022,1.5394022 0 0 1 -0.11719,0.09961 1.5394022,1.5394022 0 0 1 -0.12695,0.08789 1.5394022,1.5394022 0 0 1 -0.13476,0.07422 1.5394022,1.5394022 0 0 1 -0.14063,0.06055 1.5394022,1.5394022 0 0 1 -0.14648,0.04687 1.5394022,1.5394022 0 0 1 -0.15039,0.03125 1.5394022,1.5394022 0 0 1 -0.1543,0.01563 1.5394022,1.5394022 0 0 1 -0.1543,0 1.5394022,1.5394022 0 0 1 -0.15234,-0.01367 1.5394022,1.5394022 0 0 1 -0.15039,-0.0293 1.5394022,1.5394022 0 0 1 -0.14844,-0.04492 1.5394022,1.5394022 0 0 1 -0.14063,-0.05859 1.5394022,1.5394022 0 0 1 -0.13671,-0.07422 1.5394022,1.5394022 0 0 1 -0.12696,-0.08594 1.5394022,1.5394022 0 0 1 -0.11914,-0.09766 A 1.5394022,1.5394022 0 0 1 170.65021,13.02152 1.5394022,1.5394022 0 0 1 170.63281,13 h -5.74414 C 164.39623,13 164,12.598209 164,12.099609 V 4.9003906 C 164,4.4017906 164.39623,4 164.88867,4 h 3.05469 c -0.0867,-0.1648858 -0.0987,-0.4155498 -0.21484,-0.546875 a 1.5394022,1.5394022 0 0 1 -0.041,-0.046875 C 167.3352,2.9741583 166.82725,2.6295882 166.25393,2.4296875 a 1.5394022,1.5394022 0 0 1 -0.0508,-0.019531 1.5394022,1.5394022 0 0 1 -0.14062,-0.0625 1.5394022,1.5394022 0 0 1 -0.13281,-0.076172 C 165.81443,2.1976065 165.76576,2.0862504 165.67188,2 Z M 167,15 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 h -10 c -0.554,0 -1,-0.446 -1,-1 v -4 c 0,-0.554 0.446,-1 1,-1 z"
          id="path35200"
-         transform="matrix(1,0,0,-1,-100,24)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1,0,0,-1,-100,24)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 165.67188,2 c 0.0939,0.08625 0.14255,0.1976065 0.25781,0.2714844 a 1.5394022,1.5394022 0 0 0 0.13281,0.076172 1.5394022,1.5394022 0 0 0 0.14062,0.0625 1.5394022,1.5394022 0 0 0 0.0508,0.019531 c 0.57332,0.1999007 1.08127,0.5444708 1.43359,0.9765625 a 1.5394022,1.5394022 0 0 0 0.041,0.046875 C 167.84468,3.5844502 167.85667,3.8351142 167.94336,4 h 6.10352 c -0.21372,-0.5813429 -0.34589,-1.189634 -0.69727,-1.7207031 a 1.5394022,1.5394022 0 0 0 -0.004,-0.00586 C 173.27691,2.1705282 173.15353,2.101194 173.08008,2 Z"
          id="path34990"
-         transform="matrix(1,0,0,-1,-100,24)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1,0,0,-1,-100,24)" />
       <rect
          ry="1"
          rx="1"
@@ -213,33 +152,28 @@
          height="5"
          width="3"
          id="rect34992"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:connector-curvature="0"
        id="path34978"
        d="m 86.52033,0.52698491 c -0.003,-0.33894273 0.36082,-0.61185903 0.68503,-0.50250393 2.02412,0.10469018 3.77014,1.47163272 4.86149,3.10409392 0.74376,1.1241054 1.1647,2.4422197 1.29741,3.7788 h 2.11543 L 91.80176,12 88.12177,6.9074235 h 2.08478 C 90.14625,5.3465791 89.96264,3.6549096 88.88173,2.4329257 88.32983,1.7560691 87.578,1.2622837 86.75889,0.9766824 86.61006,0.8812835 86.51852,0.70065 86.52033,0.52698491 Z"
-       style="opacity:1;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55999184;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:1;fill:#008000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.55999184;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <g
        transform="matrix(1,0,0,-1,-20,24)"
        id="g35004">
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 70.99805,11 C 71.51593,10.448744 72.4833,10.446116 73,11 c -0.66732,0 -1.33463,0 -2.00195,0 z"
-         id="path35191"
-         inkscape:connector-curvature="0" />
+         id="path35191" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 128.86914,2 H 123 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 15 l 4,-4 V 3 c 0,-0.554 -0.446,-1 -1,-1 h -5.86914 v 2 h 3.98047 C 139.60377,4 140,4.4017906 140,4.9003906 V 12.099609 C 140,12.598209 139.60377,13 139.11133,13 H 133 a 1.4164738,1.4164738 0 0 1 -0.0488,0.04883 1.4164738,1.4164738 0 0 1 -0.10937,0.08984 1.4164738,1.4164738 0 0 1 -0.11719,0.08008 1.4164738,1.4164738 0 0 1 -0.125,0.06641 1.4164738,1.4164738 0 0 1 -0.13086,0.05274 1.4164738,1.4164738 0 0 1 -0.13672,0.03906 1.4164738,1.4164738 0 0 1 -0.13867,0.02734 1.4164738,1.4164738 0 0 1 -0.14063,0.01172 1.4164738,1.4164738 0 0 1 -0.14257,-0.002 1.4164738,1.4164738 0 0 1 -0.14063,-0.01562 1.4164738,1.4164738 0 0 1 -0.13672,-0.0293 1.4164738,1.4164738 0 0 1 -0.13476,-0.04492 1.4164738,1.4164738 0 0 1 -0.13086,-0.05664 1.4164738,1.4164738 0 0 1 -0.12305,-0.06836 1.4164738,1.4164738 0 0 1 -0.11523,-0.08203 1.4164738,1.4164738 0 0 1 -0.10743,-0.0918 A 1.4164738,1.4164738 0 0 1 130.99805,13 h -6.10938 C 124.39623,13 124,12.598209 124,12.099609 V 4.9003906 C 124,4.4017906 124.39623,4 124.88867,4 h 3.98047 z M 127,15 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 h -10 c -0.554,0 -1,-0.446 -1,-1 v -4 c 0,-0.554 0.446,-1 1,-1 z"
          id="path35189"
-         transform="matrix(1,0,0,-1,-60,24)"
-         inkscape:connector-curvature="0" />
+         transform="matrix(1,0,0,-1,-60,24)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 68.86914,22 c 0,-0.666667 0,-1.333333 0,-2 2.08724,0 4.17448,0 6.26172,0 0,0.666667 0,1.333333 0,2 -2.08724,0 -4.17448,0 -6.26172,0 z"
-         id="path35000"
-         inkscape:connector-curvature="0" />
+         id="path35000" />
       <rect
          ry="1"
          rx="1"
@@ -248,22 +182,19 @@
          height="5"
          width="3"
          id="rect35002"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 51.28516,0 c -0.554,0 -1,0.446 -1,1 V 6 H 46.85742 L 52,12 57.14258,6 H 53.71484 V 1 c 0,-0.554 -0.446,-1 -1,-1 z"
-       id="path35006"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="scccccccss" />
+       id="path35006" />
     <g
        transform="matrix(1,0,0,-1,-100,24)"
        id="g35014">
       <path
          id="path35010"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <rect
          ry="1"
          rx="1"
@@ -272,23 +203,21 @@
          height="5"
          width="3"
          id="rect35012"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
        id="path35018"
        d="m -25,5 v 3.5 h -2 l 3,3.5 3,-3.5 h -2 V 5 Z"
-       style="opacity:1;fill:#008000;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"
-       inkscape:connector-curvature="0" />
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <g
        id="g35026"
        transform="matrix(0,1,1,0,120,-60)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
          id="path35022" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect35024"
          width="3"
          height="5"
@@ -298,21 +227,18 @@
          ry="1" />
     </g>
     <path
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.28571427;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.28571427;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 135,6 v 7 h -2 l 3,5 3,-5 h -2 V 6 Z"
        id="path35030" />
     <g
        id="g35064"
        transform="translate(-80,40)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 3,2 C 2.446,2 2,2.446 2,3 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 18,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 7 C 6.446,9 6,8.554 6,8 V 4 C 6,3.446 6.446,3 7,3 Z M 4.8886719,11 H 19.111328 C 19.603773,11 20,11.401791 20,11.900391 v 7.199218 C 20,19.598209 19.603773,20 19.111328,20 H 4.8886719 C 4.3962275,20 4,19.598209 4,19.099609 V 11.900391 C 4,11.401791 4.3962275,11 4.8886719,11 Z"
          id="path35060" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect35062"
          width="3"
          height="5"
@@ -324,14 +250,11 @@
     <path
        id="path35066"
        d="m -33,45 v 3.5 h -2 l 3,3.5 3,-3.5 h -2 V 45 Z"
-       style="opacity:1;fill:#008000;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"
-       inkscape:connector-curvature="0" />
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       sodipodi:nodetypes="ccccccccccc"
-       inkscape:connector-curvature="0"
        id="path35068"
        d="m -75.99996,41.790478 c -0.0042,-0.508414 0.541236,-0.917789 1.027542,-0.753757 3.036185,0.157037 5.655209,2.20745 7.292254,4.656143 1.115625,1.686157 1.747033,3.663328 1.946108,5.668199 h 3.173129 L -68.077806,59 -73.597798,51.361136 h 3.127166 c -0.09036,-2.341267 -0.365859,-4.878771 -1.987224,-6.711747 -0.827859,-1.015285 -1.955596,-1.755963 -3.184266,-2.184365 -0.223239,-0.143098 -0.360557,-0.414049 -0.357838,-0.674546 z"
-       style="opacity:1;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.83998775;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:1;fill:#008000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.83998775;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <g
        transform="matrix(1,0,0,-1,-60,64)"
        id="g35074">
@@ -343,30 +266,26 @@
          height="5"
          width="3"
          id="rect35070"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <path
          mask="none"
          id="path35072"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
-       sodipodi:nodetypes="cccccccc"
-       inkscape:connector-curvature="0"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 10.28571,40 v 6 H 6.85714 L 12,52 17.14286,46 h -3.42857 v -6 z"
        id="path35076" />
     <g
        id="g35082"
        transform="matrix(1,0,0,-1,20,64)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
          id="path35078" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect35080"
          width="3"
          height="5"
@@ -376,21 +295,18 @@
          ry="1" />
     </g>
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55999184;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2.55999184;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 86.52033,40.526985 c -0.003,-0.338943 0.36082,-0.611859 0.68503,-0.502504 2.02412,0.10469 3.77014,1.471633 4.86149,3.104094 0.74376,1.124105 1.1647,2.44222 1.29741,3.7788 h 2.11543 L 91.80176,52 88.12177,46.907423 h 2.08478 c -0.0603,-1.560844 -0.24391,-3.252513 -1.32482,-4.474497 -0.5519,-0.676857 -1.30373,-1.170642 -2.12284,-1.456244 -0.14883,-0.0954 -0.24037,-0.276032 -0.23856,-0.449697 z"
-       id="path35084"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
+       id="path35084" />
     <g
        id="g35090"
        transform="matrix(1,0,0,-1,-20,64)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
          id="path35086" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect35088"
          width="3"
          height="5"
@@ -400,21 +316,18 @@
          ry="1" />
     </g>
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.71428573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 51.28516,40 c -0.554,0 -1,0.446 -1,1 v 5 H 46.85742 L 52,52 57.14258,46 h -3.42774 v -5 c 0,-0.554 -0.446,-1 -1,-1 z"
-       id="path35092"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="scccccccss" />
+       id="path35092" />
     <g
        id="g35100"
        transform="matrix(1,0,0,-1,-100,64)">
       <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
          id="path35096" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect35098"
          width="3"
          height="5"
@@ -424,8 +337,7 @@
          ry="1" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:1;fill:#008000;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"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;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 -25,45 v 3.5 h -2 l 3,3.5 3,-3.5 h -2 V 45 Z"
        id="path35102" />
     <g
@@ -434,8 +346,7 @@
       <path
          id="path35104"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <rect
          ry="1"
          rx="1"
@@ -444,13 +355,11 @@
          height="5"
          width="3"
          id="rect35106"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
        id="path35110"
        d="m 135,46 v 7 h -2 l 3,5 3,-5 h -2 v -7 z"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.28571427;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.28571427;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg b/rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg
index 02b245aa1..20b6dfb43 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/saved-no-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="saved-no-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        transform="matrix(0.7,0,0,-0.7,-62.4,24.4)"
@@ -107,8 +63,7 @@
       <path
          id="path35010"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <rect
          ry="1"
          rx="1"
@@ -117,10 +72,10 @@
          height="5"
          width="3"
          id="rect35012"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35224"
        width="8.3999996"
        height="1.4"
@@ -129,7 +84,7 @@
        rx="0.69999999"
        ry="0.69999999" />
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.53362322;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.53362322;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35226"
        width="8.3999996"
        height="1.4"
@@ -141,37 +96,33 @@
        id="g1614"
        transform="matrix(0.7,0,0,-0.7,-42.4,24.4)">
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 8.3300781 2.4003906 L 9.4472656 1.2832031 A 1.0134702 1.0134702 0 0 1 9.5 1.234375 A 1.0134702 1.0134702 0 0 1 9.5800781 1.171875 A 1.0134702 1.0134702 0 0 1 9.6660156 1.1171875 A 1.0134702 1.0134702 0 0 1 9.7558594 1.0722656 A 1.0134702 1.0134702 0 0 1 9.8515625 1.0351562 A 1.0134702 1.0134702 0 0 1 9.9492188 1.0097656 A 1.0134702 1.0134702 0 0 1 10.003906 1 L 5.9941406 1 A 1.0134702 1.0134702 0 0 1 6.0234375 1.0039062 A 1.0134702 1.0134702 0 0 1 6.1210938 1.0273438 A 1.0134702 1.0134702 0 0 1 6.2167969 1.0605469 A 1.0134702 1.0134702 0 0 1 6.3085938 1.1035156 A 1.0134702 1.0134702 0 0 1 6.3964844 1.1542969 A 1.0134702 1.0134702 0 0 1 6.4785156 1.2148438 A 1.0134702 1.0134702 0 0 1 6.5527344 1.2832031 L 7.6699219 2.4003906 L 8.3300781 2.4003906 z "
          id="path1633"
          transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 77.711496,19.999442 c -0.609992,0.589285 -1.17969,1.22436 -1.819197,1.780133 -0.59538,0.389465 -1.46564,0.274009 -1.922149,-0.281524 -0.499537,-0.499536 -0.999073,-0.999073 -1.49861,-1.498609 1.746652,0 3.493304,0 5.239956,0 z"
-         id="path1631"
-         inkscape:connector-curvature="0" />
+         id="path1631" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 72.613839,11.001116 c 0.562189,-0.542269 1.085357,-1.1288927 1.676898,-1.6378349 0.634662,-0.4433227 1.531777,-0.2354298 1.995179,0.354554 0.42776,0.4277599 0.855521,0.8555209 1.283281,1.2832809 -1.651785,0 -3.303572,0 -4.955358,0 z"
-         id="path1629"
-         inkscape:connector-curvature="0" />
+         id="path1629" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 66.430804,11.001116 c 0.562188,-0.542269 1.085357,-1.1288927 1.676897,-1.6378349 0.634663,-0.4433227 1.531779,-0.2354284 1.995179,0.354554 0.427761,0.4277599 0.855521,0.8555209 1.283281,1.2832809 -1.651786,0 -3.303571,0 -4.955357,0 z"
-         id="path1627"
-         inkscape:connector-curvature="0" />
+         id="path1627" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 5.6738281 1 L 1.6992188 1 C 1.3114188 1 1 1.3114188 1 1.6992188 L 1 14.300781 C 1 14.688581 1.3114188 15 1.6992188 15 L 12.199219 15 L 15 12.199219 L 15 1.6992188 C 15 1.3114188 14.688581 1 14.300781 1 L 10.322266 1 A 1.0134702 1.0134702 0 0 1 10.351562 1.0039062 A 1.0134702 1.0134702 0 0 1 10.449219 1.0273438 A 1.0134702 1.0134702 0 0 1 10.544922 1.0605469 A 1.0134702 1.0134702 0 0 1 10.636719 1.1035156 A 1.0134702 1.0134702 0 0 1 10.724609 1.1542969 A 1.0134702 1.0134702 0 0 1 10.806641 1.2148438 A 1.0134702 1.0134702 0 0 1 10.880859 1.2832031 L 11.998047 2.4003906 L 12.978516 2.4003906 C 13.323227 2.4003906 13.599609 2.68223 13.599609 3.03125 L 13.599609 8.0703125 C 13.599609 8.4193325 13.323227 8.6992188 12.978516 8.6992188 L 11.898438 8.6992188 L 10.880859 9.7167969 A 1.0134702 1.0134702 0 0 1 10.828125 9.765625 A 1.0134702 1.0134702 0 0 1 10.748047 9.828125 A 1.0134702 1.0134702 0 0 1 10.662109 9.8828125 A 1.0134702 1.0134702 0 0 1 10.572266 9.9277344 A 1.0134702 1.0134702 0 0 1 10.476562 9.9648438 A 1.0134702 1.0134702 0 0 1 10.378906 9.9902344 A 1.0134702 1.0134702 0 0 1 10.279297 10.007812 A 1.0134702 1.0134702 0 0 1 10.177734 10.013672 A 1.0134702 1.0134702 0 0 1 10.078125 10.009766 A 1.0134702 1.0134702 0 0 1 9.9765625 9.9960938 A 1.0134702 1.0134702 0 0 1 9.8789062 9.9726562 A 1.0134702 1.0134702 0 0 1 9.7832031 9.9394531 A 1.0134702 1.0134702 0 0 1 9.6914062 9.8964844 A 1.0134702 1.0134702 0 0 1 9.6035156 9.8457031 A 1.0134702 1.0134702 0 0 1 9.5214844 9.7851562 A 1.0134702 1.0134702 0 0 1 9.4472656 9.7167969 L 8.4296875 8.6992188 L 7.5703125 8.6992188 L 6.5527344 9.7167969 A 1.0134702 1.0134702 0 0 1 6.5 9.765625 A 1.0134702 1.0134702 0 0 1 6.4199219 9.828125 A 1.0134702 1.0134702 0 0 1 6.3339844 9.8828125 A 1.0134702 1.0134702 0 0 1 6.2441406 9.9277344 A 1.0134702 1.0134702 0 0 1 6.1484375 9.9648438 A 1.0134702 1.0134702 0 0 1 6.0507812 9.9902344 A 1.0134702 1.0134702 0 0 1 5.9511719 10.007812 A 1.0134702 1.0134702 0 0 1 5.8496094 10.013672 A 1.0134702 1.0134702 0 0 1 5.75 10.009766 A 1.0134702 1.0134702 0 0 1 5.6484375 9.9960938 A 1.0134702 1.0134702 0 0 1 5.5507812 9.9726562 A 1.0134702 1.0134702 0 0 1 5.4550781 9.9394531 A 1.0134702 1.0134702 0 0 1 5.3632812 9.8964844 A 1.0134702 1.0134702 0 0 1 5.2753906 9.8457031 A 1.0134702 1.0134702 0 0 1 5.1933594 9.7851562 A 1.0134702 1.0134702 0 0 1 5.1191406 9.7167969 L 4.1015625 8.6992188 L 3.0214844 8.6992188 C 2.6767736 8.6992188 2.4003906 8.4193325 2.4003906 8.0703125 L 2.4003906 3.03125 C 2.4003906 2.68223 2.6767736 2.4003906 3.0214844 2.4003906 L 4.0019531 2.4003906 L 5.1191406 1.2832031 A 1.0134702 1.0134702 0 0 1 5.171875 1.234375 A 1.0134702 1.0134702 0 0 1 5.25 1.171875 A 1.0134702 1.0134702 0 0 1 5.3359375 1.1171875 A 1.0134702 1.0134702 0 0 1 5.4277344 1.0722656 A 1.0134702 1.0134702 0 0 1 5.5214844 1.0371094 A 1.0134702 1.0134702 0 0 1 5.6191406 1.0097656 A 1.0134702 1.0134702 0 0 1 5.6738281 1 z M 4.5 10.099609 L 11.5 10.099609 C 11.8878 10.099609 12.199219 10.412981 12.199219 10.800781 L 12.199219 13.599609 C 12.199219 13.987409 11.8878 14.300781 11.5 14.300781 L 4.5 14.300781 C 4.1122 14.300781 3.8007812 13.987409 3.8007812 13.599609 L 3.8007812 10.800781 C 3.8007812 10.412981 4.1122 10.099609 4.5 10.099609 z "
          id="path1625"
          transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 68.676898,22 c -0.686037,-0.101884 -1.065435,-0.732688 -1.54705,-1.159215 -0.280448,-0.280448 -0.560895,-0.560896 -0.841343,-0.841343 1.746652,0 3.493303,0 5.239955,0 -0.609991,0.589285 -1.179689,1.22436 -1.819196,1.780133 -0.305924,0.2245 -0.671515,0.23551 -1.032366,0.220425 z"
-         id="path1610"
-         inkscape:connector-curvature="0" />
+         id="path1610" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect1612"
          width="3"
          height="5"
@@ -182,8 +133,7 @@
     </g>
     <path
        id="path1994"
-       style="fill:none;fill-rule:evenodd;stroke:#c00000;stroke-width:1.88826501;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 10.832397,10.667603 -5.6647946,5.664794 m 0,-5.664794 5.6647946,5.664794"
-       inkscape:connector-curvature="0" />
+       style="fill:none;fill-rule:evenodd;stroke:#c00000;stroke-width:1.88826501;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 10.832397,10.667603 -5.6647946,5.664794 m 0,-5.664794 5.6647946,5.664794" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg b/rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg
index f545e9b18..3dee64650 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/saved-yes-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="saved-yes-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -64,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        transform="matrix(0.7,0,0,-0.7,-62.4,24.4)"
@@ -107,8 +63,7 @@
       <path
          id="path35010"
          d="m 63,2 c -0.554,0 -1,0.446 -1,1 v 18 c 0,0.554 0.446,1 1,1 h 18 c 0.554,0 1,-0.446 1,-1 V 6 L 78,2 Z m 4,1 h 10 c 0.554,0 1,0.446 1,1 v 4 c 0,0.554 -0.446,1 -1,1 H 67 C 66.446,9 66,8.554 66,8 V 4 c 0,-0.554 0.446,-1 1,-1 z m -2.111328,8 H 79.111328 C 79.603773,11 80,11.401791 80,11.900391 v 7.199218 C 80,19.598209 79.603773,20 79.111328,20 H 64.888672 C 64.396228,20 64,19.598209 64,19.099609 V 11.900391 C 64,11.401791 64.396228,11 64.888672,11 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
       <rect
          ry="1"
          rx="1"
@@ -117,10 +72,10 @@
          height="5"
          width="3"
          id="rect35012"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     </g>
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35224"
        width="8.3999996"
        height="1.4"
@@ -129,7 +84,7 @@
        rx="0.69999999"
        ry="0.69999999" />
     <rect
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.53362322;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.53362322;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        id="rect35226"
        width="8.3999996"
        height="1.4"
@@ -138,31 +93,27 @@
        rx="0.84000003"
        ry="0.69999999" />
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="m 5.0666663,12.6 1.4666667,1.466667 4.4,-4.3999996 L 12.4,11.133334 6.5333329,17 3.6,14.066667 Z"
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.45144057" />
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.45144057" />
     <g
        id="g1668"
        transform="matrix(0.7,0,0,-0.7,-42.4,24.4)">
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 67.189732,11.001116 c 0.610583,-0.586741 1.174814,-1.2261007 1.819197,-1.7745536 0.36824,-0.3022225 0.844138,-0.2148197 1.280692,-0.226004 0.706995,0.1846013 1.112568,0.8395012 1.632424,1.3003926 0.233388,0.233388 0.466777,0.466776 0.700165,0.700165 -1.810826,0 -3.621652,0 -5.432478,0 z"
-         id="path1677"
-         inkscape:connector-curvature="0" />
+         id="path1677" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="M 10 1 L 1.6992188 1 C 1.3114188 1 1 1.3114188 1 1.6992188 L 1 14.300781 C 1 14.688581 1.3114188 15 1.6992188 15 L 12.199219 15 L 15 12.199219 L 15 1.6992188 C 15 1.3114188 14.688581 1 14.300781 1 L 11.869141 1 L 13.201172 2.3320312 A 1.1312078 1.1312078 0 0 1 13.255859 2.390625 A 1.1312078 1.1312078 0 0 1 13.326172 2.4785156 A 1.1312078 1.1312078 0 0 1 13.386719 2.5742188 A 1.1312078 1.1312078 0 0 1 13.4375 2.6757812 A 1.1312078 1.1312078 0 0 1 13.476562 2.78125 A 1.1312078 1.1312078 0 0 1 13.505859 2.890625 A 1.1312078 1.1312078 0 0 1 13.515625 2.9453125 C 13.525319 2.9896541 13.599609 2.9838777 13.599609 3.03125 L 13.599609 8.0703125 C 13.599609 8.4193325 13.323227 8.6992188 12.978516 8.6992188 L 8.4355469 8.6992188 L 7.3339844 9.8007812 A 1.1312078 1.1312078 0 0 1 7.2734375 9.8574219 A 1.1312078 1.1312078 0 0 1 7.1835938 9.9257812 A 1.1312078 1.1312078 0 0 1 7.0878906 9.9863281 A 1.1312078 1.1312078 0 0 1 6.9882812 10.037109 A 1.1312078 1.1312078 0 0 1 6.8808594 10.078125 A 1.1312078 1.1312078 0 0 1 6.8027344 10.099609 L 11.5 10.099609 C 11.8878 10.099609 12.199219 10.412981 12.199219 10.800781 L 12.199219 13.599609 C 12.199219 13.987409 11.8878 14.300781 11.5 14.300781 L 4.5 14.300781 C 4.1122 14.300781 3.8007812 13.987409 3.8007812 13.599609 L 3.8007812 10.800781 C 3.8007812 10.412981 4.1122 10.099609 4.5 10.099609 L 6.2714844 10.099609 A 1.1312078 1.1312078 0 0 1 6.2128906 10.085938 A 1.1312078 1.1312078 0 0 1 6.1074219 10.048828 A 1.1312078 1.1312078 0 0 1 6.0039062 10 A 1.1312078 1.1312078 0 0 1 5.90625 9.9414062 A 1.1312078 1.1312078 0 0 1 5.8164062 9.875 A 1.1312078 1.1312078 0 0 1 5.7324219 9.7988281 L 4.6328125 8.6992188 L 3.0214844 8.6992188 C 2.6767736 8.6992188 2.4003906 8.4193325 2.4003906 8.0703125 L 2.4003906 3.03125 C 2.4003906 2.68223 2.6767736 2.4003906 3.0214844 2.4003906 L 8.5996094 2.4003906 L 10 1 z "
          id="path1675"
          transform="matrix(1.4285714,0,0,-1.4285714,60.571429,23.428571)" />
       <path
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          d="m 74.857143,22 c -0.666853,-0.666853 -1.333705,-1.333706 -2.000558,-2.000558 2.111082,-0.0029 4.222484,0.0058 6.333366,-0.0043 0.395455,0.07624 0.6865,-0.692021 0.675562,-0.696024 -0.14988,0.710011 -0.805049,1.109 -1.25738,1.620104 C 78.24787,21.279474 77.887607,21.639737 77.527344,22 c -0.890067,0 -1.780134,0 -2.670201,0 z"
-         id="path1664"
-         inkscape:connector-curvature="0" />
+         id="path1664" />
       <rect
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
          id="rect1666"
          width="3"
          height="5"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/spot-active.svg b/rtdata/icons/rawtherapee/scalable/apps/spot-active.svg
index bc36a7a19..500cbe09b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/spot-active.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/spot-active.svg
@@ -2,39 +2,17 @@
 <!-- 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="11"
    height="11"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spot-active.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#a94a4a"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="1.6872889"
-     inkscape:cy="2.4074225"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -43,13 +21,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1041.3622)">
     <path
@@ -60,10 +36,9 @@
     <path
        id="path3784"
        d="m 5,1042.3622 0,4 -4,0 0,1 4,0 0,4 1,0 0,-4 4,0 0,-1 -4,0 0,-4 -1,0 z"
-       style="fill:#ffffff;fill-opacity:0.58823532;stroke:none"
-       inkscape:connector-curvature="0" />
+       style="fill:#ffffff;fill-opacity:0.58823532;stroke:none" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:none"
        id="rect3788"
        width="1"
        height="3"
@@ -75,7 +50,7 @@
        height="3"
        width="1"
        id="rect3790"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:none"
        transform="matrix(0,-1,1,0,0,0)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/spot-normal.svg b/rtdata/icons/rawtherapee/scalable/apps/spot-normal.svg
index d0320e31f..67b954642 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/spot-normal.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/spot-normal.svg
@@ -2,39 +2,17 @@
 <!-- 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="11"
    height="11"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="spot-normal.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#a94a4a"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="8.1603829"
-     inkscape:cy="7.1741798"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1005"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -48,26 +26,19 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1041.3622)">
     <path
        style="fill:#000000;fill-opacity:0.66666667;stroke:none"
        d="M 6,1043.3622 5.378906,1046.7411 2,1047.3622 v 1 l 3.378906,0.6211 L 6,1052.3622 H 7 L 7.621094,1048.9833 11,1048.3622 v -1 L 7.621094,1046.7411 7,1043.3622 Z"
-       id="path818"
-       inkscape:connector-curvature="0" />
+       id="path818" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:none"
        d="m 5,1042.3622 h 1 l 0.8286408,4.5 L 6,1051.3622 H 5 l -0.8286408,-4.5 z"
-       id="rect2989"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="rect2989" />
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path11"
        d="m 1,1047.3622 v -1 l 4.5,-0.8286 4.5,0.8286 v 1 l -4.5,0.8286 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#ffffff;fill-opacity:1.0;stroke:none" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/spot-prelight.svg b/rtdata/icons/rawtherapee/scalable/apps/spot-prelight.svg
index 9cfc1acfa..e53acfcbf 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/spot-prelight.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/spot-prelight.svg
@@ -2,39 +2,17 @@
 <!-- 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="11"
    height="11"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spot-prelight.svg">
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#a94a4a"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="1.6872889"
-     inkscape:cy="2.4074225"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -48,8 +26,6 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-1041.3622)">
     <path
@@ -57,7 +33,7 @@
        d="m 6,1043.3622 0,4 -4,0 0,1 4,0 0,4 1,0 0,-4 4,0 0,-1 -4,0 0,-4 -1,0 z"
        id="rect2987" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       style="fill:#ffffff;fill-opacity:1.0;stroke:none"
        id="rect2985"
        width="9"
        height="1"
@@ -69,6 +45,6 @@
        height="9"
        width="1"
        id="rect2989"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#ffffff;fill-opacity:1.0;stroke:none" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-off-narrow.svg
index 23d835032..86c7fa8c7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-black-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-on-narrow.svg
index 431f8bd58..43f6cee0e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-black-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-black-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-off-narrow.svg
index 4da563f36..201df582a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-blue-off.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#3030d0;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-on-narrow.svg
index 6aa7e2cb1..3e6d90887 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-blue-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-blue-on.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#3030d0;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#3030d0;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-off-narrow.svg
index 3bc716d8e..779ec1b6e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-gray-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#777777;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#777777;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-on-narrow.svg
index 6e3ddb2ed..cd7b044e8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-gray-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-gray-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#777777;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#777777;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-off-narrow.svg
index 814feedf6..695e41e04 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-green-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,9 +55,7 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
        style="opacity:1;fill:#000000;fill-opacity:0.95679016;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#30d043;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-on-narrow.svg
index ed178b3b0..e381a32f0 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-green-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-green-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,9 +55,7 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
        style="opacity:1;fill:#000000;fill-opacity:0.95679016;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#30d043;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#30d043;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-off-narrow.svg
index 9d5ad85ed..45dfafd9c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-luminosity-off-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.333333"
-     inkscape:cx="5"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -115,23 +72,22 @@
        style="opacity:1;fill:#77777f;fill-opacity:0.94117647;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <g
        aria-label="L"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text7395">
       <path
          d="m 3.6643927,20.999977 v -3.844475 h 0.8049114 v 3.222374 h 2.0627558 v 0.622101 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px;fill-opacity:1.0;fill:#000000"
          id="path20" />
     </g>
     <text
        id="text18"
        y="20.999977"
        x="23.290586"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke-width:0.1397px"
          y="20.999977"
          x="23.290586"
-         id="tspan16"
-         sodipodi:role="line">L</tspan></text>
+         id="tspan16">L</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-on-narrow.svg
index f7e83e8bb..7422df22c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-luminosity-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-luminosity-on-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="0.37226277"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -115,23 +72,22 @@
        style="opacity:1;fill:#77777f;fill-opacity:0.94117647;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <g
        aria-label="L"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text7395">
       <path
          d="M 3.6643927,6.9999771 V 3.1555023 h 0.8049114 v 3.2223739 h 2.0627558 v 0.6221009 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px;fill-opacity:1.0;fill:#000000"
          id="path16" />
     </g>
     <text
        id="text14"
        y="6.9999771"
        x="23.290586"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke-width:0.1397px"
          y="6.9999771"
          x="23.290586"
-         id="tspan12"
-         sodipodi:role="line">L</tspan></text>
+         id="tspan12">L</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-off-narrow.svg
index b05b91ae5..7ccb866f2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-red-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#d03030;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-on-narrow.svg
index 52382d0df..b5a36ac78 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-red-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-red-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#d03030;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#d03030;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-off-narrow.svg
index 311552709..b7a2f6ec1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-theme-off-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="0.37226277"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -115,23 +72,22 @@
        style="opacity:1;fill:#77777f;fill-opacity:0.94117647;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <g
        aria-label="T"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text7395">
       <path
          d="m 5.0818554,17.851296 v 3.222373 H 4.2769441 V 17.851296 H 3.0354707 v -0.622101 h 3.2905866 v 0.622101 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px;fill-opacity:1.0;fill:#000000"
          id="path16" />
     </g>
     <text
        id="text14"
        y="21.073669"
        x="22.972715"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke-width:0.1397px"
          y="21.073669"
          x="22.972715"
-         id="tspan12"
-         sodipodi:role="line">T</tspan></text>
+         id="tspan12">T</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-on-narrow.svg
index 3c8efd85b..16983479e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-theme-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-theme-on-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="0.37226277"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1021"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -115,23 +72,22 @@
        style="opacity:1;fill:#77777f;fill-opacity:0.94117647;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <g
        aria-label="T"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text7395">
       <path
          d="M 5.0818554,3.8514272 V 7.073801 H 4.2769441 V 3.8514272 H 3.0354707 V 3.2293263 h 3.2905866 v 0.6221009 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px;fill-opacity:1.0;fill:#000000"
          id="path16" />
     </g>
     <text
        id="text14"
        y="7.073801"
        x="22.972715"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799458px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.13969988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:5.58799px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.13969988px"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#000000;fill-opacity:1;stroke-width:0.1397px"
          y="7.073801"
          x="22.972715"
-         id="tspan12"
-         sodipodi:role="line">T</tspan></text>
+         id="tspan12">T</tspan></text>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-off-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-off-narrow.svg
index 99e675f83..5290de8a6 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-off-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-off-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-white-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#e6e6e6;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-on-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-on-narrow.svg
index 97b5e5e41..15155f1ae 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-on-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/square-toggle-white-on-narrow.svg
@@ -2,57 +2,16 @@
 <!-- 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="10"
    height="24"
    viewBox="0 0 10 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="square-toggle-white-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="5"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,11 +55,9 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect10210"
        width="7.9999995"
        height="7.9999995"
@@ -112,6 +69,6 @@
        height="6"
        width="6"
        id="rect10216"
-       style="opacity:1;fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:1;fill:#e6e6e6;fill-opacity:1.0;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-narrow.svg
index 82ab83a4a..e3f7b74d9 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-narrow.svg
@@ -2,64 +2,16 @@
 <!-- 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="10"
    height="16"
    viewBox="0 0 10 16"
    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="star-gold-hollow-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5"
-     inkscape:cy="8"
-     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-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff9900;stroke-width:1.67633033;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff9900;stroke-width:1.67633033;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.56919272,-0.18374267,0.18494192,0.56550181,-2.5126125,8.8701237)"
-       inkscape:transform-center-y="-0.34067766" />
+       transform="matrix(0.56919272,-0.18374267,0.18494192,0.56550181,-2.5126125,8.8701237)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-small.svg
index ecdcf65f7..9914f9869 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-gold-hollow-small.svg
@@ -2,64 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="star-gold-hollow-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff9900;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff9900;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671628)"
-       inkscape:transform-center-y="-0.51970384" />
+       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671628)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-gold-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/star-gold-narrow.svg
index ee54c8214..56b18d5ae 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-gold-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-gold-narrow.svg
@@ -2,64 +2,16 @@
 <!-- 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="10"
    height="16"
    viewBox="0 0 10 16"
    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="star-gold-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#ffee00;fill-opacity:1;fill-rule:nonzero;stroke:#ffcc00;stroke-width:1.67414868;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#ffee00;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffcc00;stroke-width:1.67414868;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.56980386,-0.18402433,0.18514049,0.56636866,-2.5206787,8.8590542)"
-       inkscape:transform-center-y="-0.34119964" />
+       transform="matrix(0.56980386,-0.18402433,0.18514049,0.56636866,-2.5206787,8.8590542)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-gold-small.svg b/rtdata/icons/rawtherapee/scalable/apps/star-gold-small.svg
index 48694c3f1..fa588ae59 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-gold-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-gold-small.svg
@@ -2,64 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="star-gold-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="5.1581509"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#ffee00;fill-opacity:1;fill-rule:nonzero;stroke:#ffcc00;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#ffee00;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffcc00;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671628)"
-       inkscape:transform-center-y="-0.51970384" />
+       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671628)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-hollow-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/star-hollow-narrow.svg
index 66b1c233c..b305a320b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-hollow-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-hollow-narrow.svg
@@ -2,64 +2,16 @@
 <!-- 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="10"
    height="16"
    viewBox="0 0 10 16"
    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="star-hollow-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5"
-     inkscape:cy="8"
-     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-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.5;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.67633033;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:none;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.67633033;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.56919272,-0.18374267,0.18494192,0.56550181,-2.5126125,8.8701237)"
-       inkscape:transform-center-y="-0.34067766" />
+       transform="matrix(0.56919272,-0.18374267,0.18494192,0.56550181,-2.5126125,8.8701237)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-hollow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/star-hollow-small.svg
index 6d63a6e8b..03dd8e8b1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-hollow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-hollow-small.svg
@@ -2,64 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="star-hollow-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.5;fill:none;fill-opacity:0.53333309;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:none;fill-opacity:0.53333309;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671628)"
-       inkscape:transform-center-y="-0.51970384" />
+       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671628)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/star-narrow.svg
index 90add16d5..8c8400439 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-narrow.svg
@@ -2,64 +2,16 @@
 <!-- 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="10"
    height="16"
    viewBox="0 0 10 16"
    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="star-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.67581487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.67581487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.56924178,-0.18383994,0.18495787,0.56580117,-2.5132602,8.8663162)"
-       inkscape:transform-center-y="-0.34085803" />
+       transform="matrix(0.56924178,-0.18383994,0.18495787,0.56580117,-2.5132602,8.8663162)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star-small.svg b/rtdata/icons/rawtherapee/scalable/apps/star-small.svg
index cd7a9b8ef..a1e44d60c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star-small.svg
@@ -2,64 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="star-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8.0194647"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -104,25 +56,11 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:type="star"
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:0.53333288;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081-7"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671624)"
-       inkscape:transform-center-y="-0.51970384" />
+       transform="matrix(0.86350439,-0.28029946,0.28056958,0.86267304,-3.3971484,4.0671624)" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/star.svg b/rtdata/icons/rawtherapee/scalable/apps/star.svg
index af9ca870e..e5304fdf5 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/star.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/star.svg
@@ -2,57 +2,16 @@
 <!-- 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="star.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,28 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.10192215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal"
        id="path2081-7"
-       sodipodi:sides="5"
-       sodipodi:cx="8"
-       sodipodi:cy="16"
-       sodipodi:r1="6"
-       sodipodi:r2="3"
-       sodipodi:arg1="0"
-       sodipodi:arg2="0.62831853"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
        d="M 14,16 10.427051,17.763356 9.854102,21.706339 7.072949,18.85317 3.145898,19.526712 5,16 3.145898,12.473288 l 3.927051,0.673542 2.781153,-2.853169 0.572949,3.942983 z"
-       transform="matrix(1.5183042,-0.49285198,0.49332694,1.5168424,-8.0396646,-7.2232632)"
-       inkscape:transform-center-y="-0.91379864" />
+       transform="matrix(1.5183042,-0.49285198,0.49332694,1.5168424,-8.0396646,-7.2232632)" />
     <path
-       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5440954;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.5;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.5440954;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 11.998047 5.5175781 L 9.7695312 10.035156 L 4.7792969 10.759766 L 8.390625 14.275391 L 7.5371094 19.238281 L 12 16.896484 L 16.460938 19.240234 L 15.611328 14.277344 L 19.220703 10.759766 L 14.230469 10.033203 L 11.998047 5.5175781 z "
        id="path1807" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/template-16.svg b/rtdata/icons/rawtherapee/scalable/apps/template-16.svg
index d38151609..2af54c644 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/template-16.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/template-16.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="template-16.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,7 +56,5 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)" />
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/template-24.svg b/rtdata/icons/rawtherapee/scalable/apps/template-24.svg
index 88d934fc5..9d95f52af 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/template-24.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/template-24.svg
@@ -2,57 +2,16 @@
 <!-- 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="template-24.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,7 +55,5 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1" />
+     id="layer1" />
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/template-narrow.svg b/rtdata/icons/rawtherapee/scalable/apps/template-narrow.svg
index 9a6321317..dc8602564 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/template-narrow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/template-narrow.svg
@@ -2,64 +2,16 @@
 <!-- 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="10"
    height="16"
    viewBox="0 0 10 16"
    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="template-narrow.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5"
-     inkscape:cy="8"
-     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="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -70,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -104,7 +56,5 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)" />
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow-small.svg
index fcac2954d..9ff9cbde8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="tick-green-hollow-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="m 4.0349213,15.013352 1.982539,1.973297 5.9476157,-5.91989 1.982541,1.973297 -7.9301567,7.893185 -3.9650776,-3.946592 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#008000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#008000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow.svg b/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow.svg
index 9b1eca47d..0286260eb 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick-green-hollow.svg
@@ -2,57 +2,16 @@
 <!-- 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="tick-green-hollow.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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="M 5.6097942,10.407824 8.8048964,13.592176 18.390205,4.0391229 21.585308,7.2234736 8.8048964,19.960877 2.414692,13.592176 Z"
-       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#008000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#008000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick-green-small.svg b/rtdata/icons/rawtherapee/scalable/apps/tick-green-small.svg
index edf2dd4b4..afe11e7c5 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick-green-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick-green-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="tick-green-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.1160494"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="m 3.3333326,14.833333 2.3333332,2.333334 6.9999992,-7 L 15,12.5 5.6666658,21.833333 0.9999997,17.166667 Z"
-       style="opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
+       style="opacity:0.7;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:2.30911016" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick-green.svg b/rtdata/icons/rawtherapee/scalable/apps/tick-green.svg
index fa250d9fe..158fd7d8b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick-green.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick-green.svg
@@ -2,57 +2,16 @@
 <!-- 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="tick-green.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="7.684729"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="M 4.6666624,10.166665 8.3333305,13.833335 19.333336,2.833329 23.000006,6.4999972 8.3333305,21.166671 0.99999442,13.833335 Z"
-       style="opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
+       style="opacity:0.7;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:2.30911016" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick-hollow-small.svg b/rtdata/icons/rawtherapee/scalable/apps/tick-hollow-small.svg
index 010fba31e..044caa1b5 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick-hollow-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick-hollow-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="tick-hollow-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="m 4.0349213,15.013352 1.982539,1.973297 5.9476157,-5.91989 1.982541,1.973297 -7.9301567,7.893185 -3.9650776,-3.946592 z"
-       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#2a7fff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick-small.svg b/rtdata/icons/rawtherapee/scalable/apps/tick-small.svg
index 943c61d76..0ed45e432 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="tick-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="m 3.3333326,14.833333 2.3333332,2.333334 6.9999992,-7 L 15,12.5 5.6666658,21.833333 0.9999997,17.166667 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2.30911016" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/tick.svg b/rtdata/icons/rawtherapee/scalable/apps/tick.svg
index dd4ab4bdd..287d4121f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/tick.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/tick.svg
@@ -2,57 +2,16 @@
 <!-- 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.91 r13725"
-   sodipodi:docname="tick.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -96,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
        id="path2996-6"
        d="M 6.0000005,10.299997 9.0000007,13.533332 18.000004,3.833329 21.000006,7.066663 9.0000007,20 3,13.533332 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:2.30911016" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/transform.svg b/rtdata/icons/rawtherapee/scalable/apps/transform.svg
index 09b55309d..357504a7f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/transform.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/transform.svg
@@ -2,57 +2,16 @@
 <!-- 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="transform.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="8.1681456"
-     inkscape:cy="12.233485"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,9 +55,7 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g905"
        transform="matrix(0.98392076,0,0,0.98392076,0.23073647,-0.0669615)"
@@ -108,26 +65,22 @@
          transform="matrix(0.0245346,0,0,0.0245346,16.938917,-17.752189)"
          id="g5390">
         <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1151.59460449;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:1151.59460449;marker:none;enable-background:accumulate"
            d="m -358.82208,767.81105 c -30.77338,-0.8322 -61.65799,12.1131 -83.42926,33.6404 -6.63788,8.9403 1.12099,18.3701 7.58515,24.5361 89.1147,100.0036 178.22941,200.00735 267.34411,300.01105 11.98478,-11.0635 25.17705,-20.7924 36.98378,-31.933 7.70951,-11.3471 11.61269,-30.6392 23.54747,-32.0359 -50.72759,-82.81265 -101.46634,-166.02345 -161.35677,-242.63645 -22.27801,-27.6492 -54.04294,-50.4922 -90.67448,-51.5822 z m -0.9375,27.8125 c 36.52318,0.7825 63.27756,30.3513 82.98005,57.9303 51.58475,69.2089 97.10265,142.6788 142.1137,216.25725 -0.35727,10.8156 -15.56862,30.4861 -24.18706,23.9428 -83.87515,-94.13725 -167.75029,-188.27445 -251.62544,-282.41165 14.98641,-9.7631 32.6397,-16.3204 50.71875,-15.7187 z"
-           id="path1459-8-6"
-           inkscape:connector-curvature="0" />
+           id="path1459-8-6" />
         <path
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1151.59460449;marker:none"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1151.59460449;marker:none"
            d="m 93.71875,1046.9062 c -39.310514,0.1378 -81.051075,17.4128 -101.375,52.3438 -3.986381,7.0548 -6.906518,14.7081 -8.5625,22.625 -20.188392,-13.5427 -41.447375,-26.1013 -60.59375,-40.8125 -3.037774,-8.5921 -12.19722,-15.8025 -21.59375,-13.7813 -8.12192,-7.615 -23.62433,-1.185 -23.53125,10.125 -2.59261,11.0156 -9.85867,20.3061 -19.51273,26.1834 -13.7914,11.9118 -27.55354,23.8575 -41.33102,35.7854 7.40612,11.1334 20.34251,17.252 27.15625,28.5938 1.57487,9.0245 11.7573,11.3187 18.1534,15.6418 13.53056,12.4785 26.72613,25.3472 40.2216,37.8582 -30.48244,17.668 -44.34727,54.6312 -43.21875,88.8124 0.0334,63.619 34.96749,127.0693 90.9375,157.875 25.414788,13.0008 58.3632788,15.8334 83.0625,-0.4062 25.896508,-16.4537 38.536513,-47.2532 40.21875,-77 3.630599,-44.4076 -13.911119,-87.5175 -37.840276,-123.9518 -7.815986,-12.9739 -15.843266,-25.8193 -23.753474,-38.7357 40.734495,12.1993 81.41479,29.4399 124.68691,29.1843 37.91824,-1.0376 77.78907,-17.0388 98.75059,-49.8406 19.09867,-31.6588 13.48677,-74.8901 -10.77112,-102.1636 -30.75778,-39.3345 -81.79042,-59.0079 -131.10388,-58.3364 z m 9.09375,57.3438 c 31.05536,-0.1936 64.1348,16.0371 76.65625,45.625 6.71578,19.3173 -8.0679,41.2272 -27.594,45.3473 -35.95595,12.704 -80.656851,-2.2149 -99.56225,-35.8785 -6.762403,-13.5433 -4.343691,-31.8721 8.21875,-41.2188 11.508127,-10.0898 27.220418,-13.7681 42.28125,-13.875 z M -53.28125,1278.5 c 25.343356,1.1095 44.8817226,21.2048 56.4421543,42.2784 12.7763627,23.2873 17.9634907,53.1077 6.0265957,77.6904 -7.8855265,13.7992 -27.33687,18.2883 -40.65625,9.8124 -28.989965,-13.7461 -45.558983,-44.7968 -50.34375,-75.4374 -2.293567,-18.1177 0.779822,-40.0203 17.0625,-50.9376 3.475298,-2.0487 7.433671,-3.2326 11.46875,-3.4062 z"
-           id="path1452-5-3"
-           inkscape:connector-curvature="0" />
+           id="path1452-5-3" />
         <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1151.59460449;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1151.59460449;marker:none;enable-background:accumulate"
            d="m -290.07208,988.27985 c -60.99103,-32.6057 -121.90126,-65.3715 -182.94279,-97.8772 -9.75967,-4.3802 -19.03873,4.5327 -20.9103,13.7795 -15.08352,36.8154 -13.51263,81.8194 11.12794,114.20055 23.46869,33.1743 62.8837,47.6828 98.97188,62.5654 71.25671,28.5087 144.27963,52.3302 217.53452,75.113 -8.38796,-7.3549 -23.95035,-17.477 -7.12354,-24.7915 12.47812,-8.2745 -13.33828,-8.577 -20.01042,-12.9226 -76.40679,-24.78 -153.15796,-49.5362 -226.16075,-83.3204 -27.94822,-13.0507 -53.48353,-37.80085 -55.78894,-70.13515 -1.54805,-14.0951 0.19585,-28.4374 4.3649,-41.9554 78.22917,41.875 156.45833,83.75005 234.6875,125.62505 -17.91667,-20.0937 -35.83333,-40.1875 -53.75,-60.28125 z"
-           id="path5382"
-           inkscape:connector-curvature="0" />
+           id="path5382" />
       </g>
       <path
          id="path1722"
          d="M 0.81928912,4.926433 V 9.3280936 A 0.36644812,0.36644812 0 0 1 1.1635402,9.123383 h 1.6691195 a 0.36644812,0.36644812 0 1 1 0,0.7322046 H 1.1635402 A 0.36644812,0.36644812 0 0 1 0.81928912,9.650877 V 11.70795 A 0.36648559,0.36648559 0 0 1 1.1635402,11.464904 h 1.6691195 a 0.36648559,0.36648559 0 0 1 0,0.732971 H 1.1635402 A 0.36648559,0.36648559 0 0 1 0.81928912,11.955596 v 2.094641 A 0.36648559,0.36648559 0 0 1 1.1635402,13.807192 h 1.6691195 a 0.36648559,0.36648559 0 0 1 0,0.732971 H 1.1635402 A 0.36648559,0.36648559 0 0 1 0.81928912,14.297884 v 2.094641 A 0.36648559,0.36648559 0 0 1 1.1635402,16.149479 h 1.6691195 a 0.36648559,0.36648559 0 0 1 0,0.732971 H 1.1635402 A 0.36648559,0.36648559 0 0 1 0.81928912,16.640171 v 2.094642 A 0.36648559,0.36648559 0 0 1 1.1635402,18.491767 h 1.6691195 a 0.36648559,0.36648559 0 0 1 0,0.732971 H 1.1635402 A 0.36648559,0.36648559 0 0 1 0.81928912,18.982459 V 21.0771 A 0.36648559,0.36648559 0 0 1 1.1635402,20.834054 h 1.6691195 a 0.36648559,0.36648559 0 0 1 0,0.732971 H 1.1635402 A 0.36648559,0.36648559 0 0 1 0.81928912,21.324746 v 2.119176 H 18.297892 Z m 0,16.398313 V 21.0771 a 0.36648559,0.36648559 0 0 0 0,0.247646 z m 0,-2.342287 v -0.247646 a 0.36648559,0.36648559 0 0 0 0,0.247646 z m 0,-2.342288 v -0.247646 a 0.36648559,0.36648559 0 0 0 0,0.247646 z m 0,-2.342287 v -0.247647 a 0.36648559,0.36648559 0 0 0 0,0.247647 z m 0,-2.342288 V 11.70795 a 0.36648559,0.36648559 0 0 0 0,0.247646 z m 0,-2.304719 V 9.3280936 a 0.36644812,0.36644812 0 0 0 0,0.3227834 z M 4.4373759,13.57718 10.657664,20.16472 H 4.4373759 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.01634204"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.01634204" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg
index 7593e6001..941db86c8 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-delete.svg
@@ -2,228 +2,146 @@
 <!-- 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="trash-delete.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-global="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect934"
-       is_visible="true"
-       pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 Z"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -268,101 +186,78 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="m 14.460938,17.884766 c -0.256181,0.217575 -0.631642,-0.0034 -0.855469,0.160156 -0.250964,0.193431 -0.596148,0.256747 -0.898438,0.160156 -0.367665,0.390151 -1.048091,0.390075 -1.416015,0 -0.346134,0.111798 -0.746255,0.0097 -1,-0.25 C 10.05374,18.09234 9.6777951,17.897147 9.53125,17.935547 9.4026776,18.875462 9.2971573,19.100193 9,20 c 0.9179712,1.167952 1.725382,1.710928 3,2.125 1.29934,-0.340299 2.027741,-1.621257 3,-2.125 -0.181779,-0.556705 -0.279794,-0.626524 -0.384766,-1.205078 -0.05898,-0.302181 -0.109877,-0.605505 -0.154296,-0.910156 z"
-       id="path976"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
+       id="path976" />
     <path
-       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.3;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 10.291016,15.655808 C 10.196759,15.68506 10.098691,15.700199 10,15.70073 9.925718,15.70049 9.8516932,15.69193 9.7792969,15.67534 c -0.018554,0.973703 -0.09925,1.24593 -0.2402344,2.209427 0.3193177,0.244053 0.7310385,-0.05803 0.9921875,0.248046 0.321059,0.239268 0.737084,-0.05321 1,0.25 0.374971,0.208312 0.878624,0.130614 1.175781,-0.177734 0.398453,0.191196 0.782103,-0.144129 1.097657,-0.224609 0.265325,0.05197 0.803583,0.02502 0.61914,-0.365235 -0.118137,-0.875749 -0.18379,-1.056312 -0.201172,-1.939895 -0.07303,0.01678 -0.14772,0.0253 -0.222656,0.02539 -0.09935,-3.38e-4 -0.198086,-0.01548 -0.292969,-0.04492 C 13.519846,15.84407 13.265482,15.950172 13,15.95073 12.900654,15.950392 12.801914,15.935252 12.707031,15.905808 12.519846,16.09407 12.265482,16.200172 12,16.20073 c -0.266159,-3.9e-5 -0.521321,-0.106181 -0.708984,-0.294922 -0.09426,0.02925 -0.192325,0.04439 -0.291016,0.04492 -0.266159,-3.9e-5 -0.521321,-0.106181 -0.708984,-0.294922 z"
-       id="path974"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccccc" />
+       id="path974" />
     <path
-       style="opacity:0.6;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.6;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 12 3 C 10.530865 3.004934 9.0819545 3.6431388 7.6503906 4.8691406 C 6.4806398 2.3093199 5.2468453 3.0411348 4 4.4902344 C -0.79733023 7.5171023 1.7702043 11.457144 5.9863281 9.7324219 C 6.4794089 10.592196 7.4905791 10.446109 8 10 C 8.5464309 9.5214802 8.4122164 9.0565631 8.0527344 7.8789062 C 7.8116237 7.9543499 7.5574573 7.999678 7.296875 8 C 5.8306397 8 4.6425781 6.7527487 4.6425781 5.2148438 C 4.6428981 5.1422311 4.6466338 5.0704109 4.6523438 4.9980469 C 4.7440225 6.2418034 5.7528277 7.2037681 6.9667969 7.2050781 C 8.2497531 7.2050781 9.2890625 6.1365637 9.2890625 4.8183594 C 9.2885925 4.7805213 9.2873463 4.7428531 9.2851562 4.7050781 C 9.9666695 5.7715137 11.082858 6.4064272 12.275391 6.4082031 C 13.154363 6.4061388 14.003354 6.0589847 14.666016 5.4296875 C 14.897562 6.4755411 15.687166 7.20465 16.589844 7.2050781 C 17.558317 7.2055946 18.386907 6.3703458 18.552734 5.2265625 C 18.570994 5.3543948 18.579348 5.4835914 18.580078 5.6132812 C 18.580078 6.9314855 17.689521 8 16.589844 8 C 16.366278 7.999894 16.15019 7.954261 15.947266 7.8710938 C 15.551159 9.0923571 15.456221 9.5146377 16 10 C 16.782153 10.698129 18.667754 10.332769 19.125 9.6445312 C 20.011169 10.253998 21.373008 10.349664 22.042969 9.6445312 C 23.086843 8.5458565 23.370372 6.3856357 21.810547 5.1035156 C 19.491445 3.3330498 17.943696 4.0184654 16.466797 4.9277344 C 14.957383 3.6236023 13.469135 2.995066 12 3 z M 9.7988281 6.140625 C 9.5162311 6.9811125 8.8752348 7.6104622 8.09375 7.8691406 C 8.8770981 9.3750692 9.6789017 10.239159 9.4980469 11.701172 C 9.3099615 13.221636 8 12.701172 8 14.201172 C 8 14.753457 8.4477153 15.201172 9 15.201172 C 9.043787 15.200785 9.087501 15.197606 9.1308594 15.191406 C 9.3075428 15.505569 9.6395925 15.700288 10 15.701172 C 10.09869 15.700641 10.196759 15.6855 10.291016 15.65625 C 10.478679 15.844989 10.733841 15.951133 11 15.951172 C 11.09869 15.950641 11.196759 15.9355 11.291016 15.90625 C 11.478679 16.094989 11.733841 16.201133 12 16.201172 C 12.265482 16.200614 12.519846 16.094512 12.707031 15.90625 C 12.801911 15.93569 12.900654 15.950832 13 15.951172 C 13.265482 15.950614 13.519846 15.844512 13.707031 15.65625 C 13.801911 15.68569 13.900654 15.700832 14 15.701172 C 14.361107 15.700993 14.694067 15.506143 14.871094 15.191406 C 14.913804 15.197406 14.956864 15.200672 15 15.201172 C 15.552285 15.201172 16 14.753457 16 14.201172 C 16 12.701142 14.433561 12.93627 14.496094 11.730469 C 14.556476 10.566148 15.146965 9.4066305 15.921875 7.859375 C 15.317567 7.6005528 14.837786 7.0004683 14.666016 6.2246094 C 14.003354 6.8539067 13.154363 7.2030181 12.275391 7.2050781 C 11.356298 7.203265 10.472323 6.8221324 9.7988281 6.140625 z "
        id="path934" />
     <path
-       style="opacity:0.6;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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.6;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 5 2 C 2.790861 2 1 3.5670034 1 5.5 C 1 7.4329966 2.790861 9.7011719 5 9.7011719 C 6.3181208 9.7011719 7.4763459 8.8860801 8.2050781 7.8242188 C 7.9192048 7.934028 7.6134867 7.9996087 7.296875 8 C 5.8306397 8 4.6425781 6.7527487 4.6425781 5.2148438 C 4.6428981 5.1422311 4.6466338 5.0704109 4.6523438 4.9980469 C 4.7440225 6.2418034 5.7528277 7.2037681 6.9667969 7.2050781 C 7.8019456 7.2050781 8.5280978 6.7480795 8.9375 6.0683594 C 8.9696009 5.877989 9 5.6864764 9 5.5 C 9 3.5670034 7.209139 2 5 2 z "
        id="path988" />
     <path
-       style="opacity:0.6;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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.6;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 19 2 C 16.790861 2 15 3.5670034 15 5.5 C 15 5.8179739 15.06544 6.1442447 15.15625 6.46875 C 15.522464 6.9256992 16.033654 7.2048143 16.589844 7.2050781 C 17.558317 7.2055946 18.386907 6.3703458 18.552734 5.2265625 C 18.570994 5.3543948 18.579348 5.4835914 18.580078 5.6132812 C 18.580078 6.9314855 17.689521 8 16.589844 8 C 16.292878 7.9998592 16.010538 7.9145694 15.753906 7.7714844 C 16.479664 8.8604126 17.659155 9.7011719 19 9.7011719 C 21.209139 9.7011719 23 7.4329966 23 5.5 C 23 3.5670034 21.209139 2 19 2 z "
        id="ellipse990" />
     <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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 10 1 C 7.790861 1 6 2.5670034 6 4.5 C 6 5.4170806 6.4126398 6.4035051 7.0722656 7.1933594 C 8.3050023 7.1353003 9.2890625 6.099309 9.2890625 4.8183594 C 9.2885925 4.7805213 9.2873463 4.7428531 9.2851562 4.7050781 C 9.9666695 5.7715137 11.082858 6.4064272 12.275391 6.4082031 C 12.734666 6.4071245 13.184926 6.3076038 13.605469 6.1269531 C 13.851624 5.5949408 14 5.0360264 14 4.5 C 14 2.5670034 12.209139 1 10 1 z M 9.7988281 6.140625 C 9.4868927 7.0683692 8.7359988 7.7332453 7.84375 7.9316406 C 8.4669237 8.3987321 9.2040085 8.7011719 10 8.7011719 C 11.191346 8.7011719 12.249636 8.0339085 12.982422 7.1230469 C 12.751135 7.1733687 12.514268 7.2045183 12.275391 7.2050781 C 11.356298 7.203265 10.472323 6.8221324 9.7988281 6.140625 z "
        id="ellipse992" />
     <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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 15 1 C 12.238576 1 10 2.9587542 10 5.375 C 10 5.4320694 10.007291 5.4808495 10.009766 5.5351562 C 10.64709 6.0887236 11.44017 6.4069593 12.275391 6.4082031 C 13.154363 6.4061388 14.003354 6.0589847 14.666016 5.4296875 C 14.897562 6.4755411 15.687166 7.20465 16.589844 7.2050781 C 17.558317 7.2055946 18.386907 6.3703458 18.552734 5.2265625 C 18.570994 5.3543948 18.579348 5.4835914 18.580078 5.6132812 C 18.580078 6.4526377 18.218358 7.1877527 17.671875 7.6132812 C 19.067235 7.4420822 20 6.9289177 20 5.375 C 20 2.9587542 17.761424 1 15 1 z M 14.666016 6.2246094 C 14.003354 6.8539067 13.154363 7.2030181 12.275391 7.2050781 C 11.543725 7.2036348 10.839092 6.9537032 10.240234 6.5117188 C 10.886747 7.7572327 12.77246 7.7011719 15 7.7011719 C 15.21903 7.7011719 15.405592 7.6935165 15.617188 7.6933594 C 15.159208 7.3852746 14.807778 6.8649254 14.666016 6.2246094 z "
        id="ellipse994" />
     <path
-       inkscape:connector-curvature="0"
        id="path1020"
        d="m 23,23 c 0,0 1,-7 -11,-0.875952 v 0 C 0,16 1,23 1,23"
-       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;stroke-opacity:1;paint-order:normal"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="m 15.921875,7.859375 c 0,0 -5.644508,3.696254 0.07813,6.341797 0,-1.50003 -1.566439,-1.264902 -1.503906,-2.470703 0.06038,-1.164321 0.650871,-2.3238385 1.425781,-3.871094 z"
-       id="path1002"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsc" />
+       id="path1002" />
     <path
-       style="opacity:0.9;fill:#ffffff;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;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 4.1308594,19.601562 C 1.0705975,19.65429 0.95120112,21.993443 0.984375,22.708984 0.96888979,21.783983 1.5993855,18.56016 12,22.125 8.25,20.211235 5.769043,19.573337 4.1308594,19.601562 Z M 12,22.125 C 22.400614,18.56016 23.03111,21.783983 23.015625,22.708984 23.066557,21.610408 22.755309,16.636164 12,22.125 Z"
-       id="path1014"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccsccc" />
+       id="path1014" />
     <path
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.95902729;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.95902729;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 19.988868,2.0961083 A 3.8361684,3.0637929 0 0 0 15.454775,4.4753074 3.8361684,3.0637929 0 0 0 15.384318,4.9158601 3.8361684,3.0637929 0 0 1 19.766709,2.9533074 3.8361684,3.0637929 0 0 1 22.816153,6.133951 3.8361684,3.0637929 0 0 0 22.967854,5.7173043 3.8361684,3.0637929 0 0 0 19.988863,2.0961076 Z"
-       id="path1007"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="3.7155344"
-       inkscape:transform-center-y="-1.4120832" />
+       id="path1007" />
     <path
        id="path1012"
        d="M 6.1680981,2.0901599 A 3.6323633,2.7493193 0 0 0 1.5930257,3.8582584 3.6323633,2.7493193 0 0 0 1.4697825,4.2457335 3.6323633,2.7493193 0 0 1 5.8482288,2.8374385 3.6323633,2.7493193 0 0 1 8.3074597,5.912815 3.6323633,2.7493193 0 0 0 8.5040857,5.5530115 3.6323633,2.7493193 0 0 0 6.1680981,2.0901599 Z"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80579805;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.80579805;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
        id="path1015"
        d="m 15,0.94160584 a 4.0839416,2.6581675 0 0 0 -4.083941,2.65816746 4.0839416,2.6581675 0 0 0 0.04558,0.3841883 4.0839416,2.6581675 0 0 1 4.038363,-2.2828794 4.0839416,2.6581675 0 0 1 4.038362,2.2739792 4.0839416,2.6581675 0 0 0 0.04558,-0.3752881 A 4.0839416,2.6581675 0 0 0 15,0.94160584 Z"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88275099;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.88275099;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88275099;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.88275099;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 10.211679,0.97080292 A 4.0839416,2.6581675 0 0 0 6.1277377,3.6289704 4.0839416,2.6581675 0 0 0 6.1733177,4.0131587 4.0839416,2.6581675 0 0 1 10.211681,1.7302793 4.0839416,2.6581675 0 0 1 14.250043,4.0042585 4.0839416,2.6581675 0 0 0 14.295623,3.6289704 4.0839416,2.6581675 0 0 0 10.211679,0.97080292 Z"
-       id="path1017"
-       inkscape:connector-curvature="0" />
+       id="path1017" />
     <path
-       style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 8.3300781,8.2910156 C 9.0271028,9.5362215 9.6603668,10.388993 9.4980469,11.701172 9.3204647,13.136729 8.1563646,12.773143 8.0253906,13.988281 8.1706678,13.928787 12.656094,12.032815 8.3300781,8.2910156 Z"
-       id="path1019"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscc" />
+       id="path1019" />
     <path
-       inkscape:connector-curvature="0"
        id="path1026"
        d="M 7.2968756,8.40625 A 2.2558171,2.0028774 0 0 1 5.0410587,6.4033726 2.2558171,2.0028774 0 0 1 5.0662354,6.1138942 2.2558171,2.0028774 0 0 0 7.2968767,7.8339993 2.2558171,2.0028774 0 0 0 9.5275173,6.1206003 2.2558171,2.0028774 0 0 1 9.552694,6.4033726 2.2558171,2.0028774 0 0 1 7.2968756,8.40625 Z"
-       style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21462178;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.9;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.21462178;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21462178;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.21462178;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="m 16.546876,8.53125 a 2.2558171,2.0028774 0 0 1 -2.255817,-2.0028774 2.2558171,2.0028774 0 0 1 0.02518,-0.2894784 2.2558171,2.0028774 0 0 0 2.230642,1.7201051 2.2558171,2.0028774 0 0 0 2.23064,-1.713399 2.2558171,2.0028774 0 0 1 0.02518,0.2827723 2.2558171,2.0028774 0 0 1 -2.255818,2.0028774 z"
-       id="path1028"
-       inkscape:connector-curvature="0" />
+       id="path1028" />
     <path
-       inkscape:connector-curvature="0"
        id="path1030"
        d="M 12.109374,7.78125 A 3.2870653,2.0028774 0 0 1 8.822309,5.7783726 3.2870653,2.0028774 0 0 1 8.8590001,5.4888942 3.2870653,2.0028774 0 0 0 12.109381,7.2089993 3.2870653,2.0028774 0 0 0 15.35976,5.4956003 3.2870653,2.0028774 0 0 1 15.396451,5.7783726 3.2870653,2.0028774 0 0 1 12.109384,7.78125 Z"
-       style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.46620023;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.9;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.46620023;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg
index 366b15bd6..2d618c7ac 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-empty-show.svg
@@ -2,210 +2,146 @@
 <!-- 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="trash-show.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="false"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -250,38 +186,32 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g5377"
        transform="matrix(0.05116532,0,0,0.05161071,10.463854,12.351531)"
        style="stroke-width:39.57666016">
       <path
-         inkscape:connector-curvature="0"
          d="m -14.2123,-217.38426 c -9.196325,4.65637 -15.133193,12.80501 -16.413694,22.23415 l -0.814865,5.47123 h 61.464048 61.464047 l -0.814865,-4.77277 c -1.047682,-6.75174 -5.820459,-15.59883 -10.360417,-18.9747 -8.381461,-6.4025 -9.312734,-6.51891 -51.10363,-6.51891 -36.9017098,0.11641 -38.9970751,0.23281 -43.420624,2.561 z"
          id="path8"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:39.57666016" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:39.57666016;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          d="m -105.59351,-173.73082 c -15.94805,2.67741 -30.96484,12.45578 -40.39398,26.07566 -4.77278,6.86814 -9.66196,21.30288 -9.66196,28.28743 v 5.35482 H 30.023189 215.69583 v -4.07432 c 0,-24.44593 -21.76852,-49.70672 -47.49494,-55.17795 -4.30714,-0.93128 -45.05036,-1.2805 -138.526929,-1.16409 -72.755738,0.1164 -133.637741,0.46563 -135.267471,0.69845 z"
          id="path10"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:39.57666016" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:39.57666016;fill-opacity:1.0" />
       <path
-         style="opacity:0.1;fill:#2a7fff;stroke:none;stroke-width:26.25347519"
+         style="opacity:0.1;fill:#cccccc;stroke:none;stroke-width:26.25347519;fill-opacity:1.0"
          d="m 95.107856,-65.809072 c -20.946043,-0.0963 -42.547706,4.701385 -59.535658,17.330941 3.250757,2.552971 16.05912,9.927934 13.537392,19.608696 -0.0684,56.551827 0.134857,113.1103 -0.101631,169.657945 -0.58438,13.03967 -17.749464,23.3102 -28.528503,13.95379 21.306131,19.96337 52.003817,27.15054 80.664504,25.99007 18.7593,-0.61034 36.85253,-6.48978 53.76831,-14.05089 12.20031,-0.01 12.98962,31.07987 25.18927,14.05844 9.94582,-8.56876 6.16095,-22.96984 7.3319,-34.49989 0.51617,-56.817935 0.24333,-113.639628 0.31935,-170.45921 -22.45427,-26.479548 -57.92358,-41.495439 -92.645443,-41.589892 z m 25.728484,15.969918 c 12.45285,-0.416852 21.42396,11.98234 19.65902,23.627713 -0.0665,55.665829 0.13485,111.338285 -0.10164,166.999951 -0.51421,14.58495 -20.84933,23.81498 -31.31527,12.75993 -5.12206,-5.90723 -8.86552,-13.47907 -7.90164,-21.42104 0,-54.108616 0,-108.21721 0,-162.325823 1.87002,-9.870102 8.25086,-19.919493 19.659,-19.640731 z M 9.7534216,-30.047059 c -20.0051226,16.988353 -33.2663326,41.0508 -37.3152026,66.802005 -7.138159,38.37312 6.128323,79.885084 33.8903438,107.433534 4.6848532,3.12125 10.7597092,8.90356 4.8527402,0.67253 -2.7429909,-8.7736 -0.881457,-18.25322 -1.4279205,-27.35263 0,-49.18518 0,-98.370339 0,-147.555517 z"
-         id="path992"
-         inkscape:connector-curvature="0" />
+         id="path992" />
       <path
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
          d="M 3.8691406 7.3085938 L 3.8691406 10.888672 L 3.8691406 11.818359 C 3.8691406 17.453826 3.8939504 20.729323 3.9296875 20.933594 C 4.0785903 21.732652 4.615151 22.436249 5.3417969 22.802734 L 5.7460938 23 L 12 23 L 18.253906 23 L 18.582031 22.84375 C 18.945897 22.668353 19.08061 22.301708 19.322266 22.011719 C 19.135249 21.849072 18.991985 21.615701 18.876953 21.378906 C 18.738396 21.093685 18.590726 20.869676 18.28125 20.980469 C 17.34518 21.457254 16.293872 21.696492 15.246094 21.6875 C 14.198315 21.678508 13.154062 21.42019 12.234375 20.900391 C 11.961707 20.754774 11.755701 20.523282 11.511719 20.337891 C 11.388853 20.268449 11.286996 20.210704 11.203125 20.097656 C 11.030413 19.947596 10.816898 19.845928 10.662109 19.677734 C 10.211954 19.188594 9.8412478 18.62688 9.5605469 18.023438 C 9.2798459 17.419995 9.0905187 16.774843 9.0058594 16.115234 C 8.9212 15.455626 8.940156 14.78264 9.078125 14.125 C 9.2058771 13.395272 9.4766729 12.704696 9.8554688 12.080078 C 10.149001 11.596056 10.553421 11.193322 10.962891 10.800781 L 10.962891 10.792969 C 10.962891 10.230764 11.41335 9.7792969 11.970703 9.7792969 C 12.070153 9.7792969 12.133984 9.8579234 12.224609 9.8847656 C 12.542635 9.6998771 12.831427 9.4640028 13.175781 9.3359375 C 13.860696 9.0812179 14.590089 8.9450088 15.330078 8.9550781 C 16.416743 8.954079 17.500122 9.2444868 18.445312 9.7792969 C 19.029685 10.096384 19.55127 10.510298 19.998047 10.994141 C 20.02743 11.025962 20.041587 11.069147 20.070312 11.101562 L 20.070312 10.888672 L 20.070312 7.3085938 L 11.970703 7.3085938 L 3.8691406 7.3085938 z M 7.2929688 9.7792969 C 7.8503218 9.7792969 8.3007812 10.230764 8.3007812 10.792969 L 8.3007812 19.513672 C 8.3007812 20.075877 7.8503218 20.529297 7.2929688 20.529297 C 6.7356157 20.529297 6.2890625 20.075877 6.2890625 19.513672 L 6.2890625 10.792969 C 6.2890625 10.230764 6.7356157 9.7792969 7.2929688 9.7792969 z "
          id="path5310"
          transform="matrix(19.544488,0,0,19.375823,-204.51067,-239.32108)" />
     </g>
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50748265;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c00000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.50748265;marker:none;enable-background:accumulate"
        d="m 15.330078,10 c -1.364856,0 -2.728928,0.545431 -3.769531,1.583984 -2.081169,2.077113 -2.081169,5.436558 0,7.513672 1.64763,1.644377 4.091786,1.976798 6.078125,1.017578 0.05225,-0.02526 0.118329,-0.04914 0.169922,-0.07617 0.309657,-0.122066 1.062171,-0.355788 1.466797,0.0059 0.404627,0.361628 0.297215,0.778637 0.783203,1.263672 L 21.767578,23 22.998047,21.697266 21.332031,20.039062 C 20.846044,19.554028 20.460818,19.659604 20.0625,19.191406 19.664182,18.723209 20.11283,17.714114 20.14258,17.650391 21.103668,15.667984 20.755056,13.228367 19.107424,11.583984 18.066815,10.545431 16.694935,10 15.330078,10 Z m -0.01953,1.623047 A 3.6885595,3.6885595 0 0 1 19,15.310547 3.6885595,3.6885595 0 0 1 15.310547,19 a 3.6885595,3.6885595 0 0 1 -3.6875,-3.689453 3.6885595,3.6885595 0 0 1 3.687501,-3.6875 z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       id="path3803" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg
index 47ceae609..c943d8934 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-empty.svg
@@ -2,210 +2,146 @@
 <!-- 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="trash-empty.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.6444444"
-     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-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -217,7 +153,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -250,29 +186,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g5377"
        transform="matrix(0.05116532,0,0,0.05161071,10.463854,12.351531)"
        style="stroke-width:39.57666016">
       <path
-         inkscape:connector-curvature="0"
          d="m -14.2123,-217.38426 c -9.196325,4.65637 -15.133193,12.80501 -16.413694,22.23415 l -0.814865,5.47123 h 61.464048 61.464047 l -0.814865,-4.77277 c -1.047682,-6.75174 -5.820459,-15.59883 -10.360417,-18.9747 -8.381461,-6.4025 -9.312734,-6.51891 -51.10363,-6.51891 -36.9017098,0.11641 -38.9970751,0.23281 -43.420624,2.561 z"
          id="path8"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:39.57666016" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:39.57666016;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          d="m -105.59351,-173.73082 c -15.94805,2.67741 -30.96484,12.45578 -40.39398,26.07566 -4.77278,6.86814 -9.66196,21.30288 -9.66196,28.28743 v 5.35482 H 30.023189 215.69583 v -4.07432 c 0,-24.44593 -21.76852,-49.70672 -47.49494,-55.17795 -4.30714,-0.93128 -45.05036,-1.2805 -138.526929,-1.16409 -72.755738,0.1164 -133.637741,0.46563 -135.267471,0.69845 z"
          id="path10"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:39.57666016" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:39.57666016;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="path5310"
          transform="matrix(0.66335753,0,0,0.66335753,-301.65558,-296.97895)"
          d="M 260.46875,300.375 V 404.96875 432.125 c 0,164.60477 0.69708,260.25227 1.75,266.21875 4.38712,23.33947 20.1846,43.88918 41.59375,54.59375 l 11.9375,5.78125 H 500 684.25 l 9.65625,-4.5625 c 19.82979,-9.47619 34.40852,-25.63417 40.375,-44.9375 3.50971,-11.23103 3.5,-15.77772 3.5,-272.6875 V 404.96875 300.375 H 499.125 Z m 100.875,72.1875 c 16.42128,0 29.65625,13.20372 29.65625,29.625 v 254.71875 c 0,16.42128 -13.23497,29.625 -29.65625,29.625 -16.42128,0 -29.625,-13.20372 -29.625,-29.625 V 402.1875 c 0,-16.42128 13.20372,-29.625 29.625,-29.625 z m 137.78125,0 c 16.42128,0 29.65625,13.20372 29.65625,29.625 v 254.71875 c 0,16.42128 -13.23497,29.625 -29.65625,29.625 -16.42128,0 -29.65625,-13.20372 -29.65625,-29.625 V 402.1875 c 0,-16.42128 13.23497,-29.625 29.65625,-29.625 z m 137.78125,0 c 16.42128,0 29.625,13.20372 29.625,29.625 v 254.71875 c 0,16.42128 -13.20372,29.625 -29.625,29.625 -16.42128,0 -29.65625,-13.20372 -29.65625,-29.625 V 402.1875 c 0,-16.42128 13.23497,-29.625 29.65625,-29.625 z"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:39.57666016" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:39.57666016;fill-opacity:1.0" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg
index 8ec3f9092..215e41a11 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-full-show.svg
@@ -2,211 +2,146 @@
 <!-- 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="trash-full-show.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -218,7 +153,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -251,41 +186,38 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.3;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.3;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="M 11.210938 20.119141 C 11.076837 19.946711 10.962891 19.750416 10.962891 19.513672 L 10.962891 10.792969 C 10.962891 10.769158 10.986691 10.755809 10.988281 10.732422 C 10.938247 10.779341 10.871085 10.795027 10.822266 10.84375 C 10.202247 11.46256 9.7377437 12.179463 9.4277344 12.945312 C 9.117725 13.711162 8.9628906 14.524981 8.9628906 15.339844 C 8.9628906 16.154706 9.117725 16.970479 9.4277344 17.736328 C 9.7377437 18.502178 10.202247 19.21908 10.822266 19.837891 C 10.939343 19.954736 11.087286 20.013345 11.210938 20.119141 z "
        id="path989" />
     <path
-       style="opacity:0.3;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.3;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="M 20.070312 11.152344 C 19.984193 11.055295 19.938725 10.936588 19.845703 10.84375 C 19.227585 10.226854 18.50919 9.7554439 17.740234 9.4375 C 16.971278 9.1195561 16.151761 8.9550781 15.330078 8.9550781 C 14.508396 8.9550781 13.68911 9.1193256 12.921875 9.4375 C 12.673531 9.5404889 12.478198 9.7576659 12.242188 9.8925781 C 12.649842 10.021794 12.976563 10.337845 12.976562 10.792969 L 12.976562 19.513672 C 12.976562 20.075876 12.528056 20.529297 11.970703 20.529297 C 11.794389 20.529297 11.663575 20.421637 11.519531 20.341797 C 11.827687 20.57466 12.116421 20.846392 12.453125 21.015625 C 13.041412 21.311308 13.666849 21.509822 14.304688 21.611328 C 14.942526 21.712835 15.592854 21.717586 16.232422 21.625 C 16.87199 21.532414 17.500275 21.343235 18.09375 21.056641 C 18.08089 21.062841 18.158716 21.025419 18.191406 21.011719 C 18.289256 20.973149 18.488422 20.913209 18.613281 20.900391 C 18.620081 20.912771 18.612086 20.885341 18.666016 21.019531 C 18.752983 21.23582 18.944841 21.658988 19.306641 22.029297 C 19.519362 21.778401 19.855834 21.615819 19.951172 21.304688 C 20.070295 20.920178 20.070313 20.764403 20.070312 11.96875 L 20.070312 11.152344 z M 16.646484 9.7792969 C 17.203837 9.7792969 17.652344 10.230764 17.652344 10.792969 L 17.652344 19.513672 C 17.652344 20.075876 17.203837 20.529297 16.646484 20.529297 C 16.089131 20.529297 15.640625 20.075876 15.640625 19.513672 L 15.640625 10.792969 C 15.640625 10.230764 16.089131 9.7792969 16.646484 9.7792969 z "
        id="path987" />
     <path
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="M 3.8691406 7.3085938 L 3.8691406 10.888672 L 3.8691406 11.818359 C 3.8691406 17.453826 3.8939495 20.729323 3.9296875 20.933594 C 4.0785903 21.732652 4.6151511 22.436249 5.3417969 22.802734 L 5.7460938 23 L 12 23 L 18.253906 23 L 18.582031 22.84375 C 18.938213 22.672058 19.06752 22.31133 19.306641 22.029297 C 18.944841 21.658988 18.752983 21.23582 18.666016 21.019531 C 18.612086 20.885341 18.620081 20.912771 18.613281 20.900391 C 18.488422 20.913209 18.289256 20.973149 18.191406 21.011719 C 18.158716 21.025419 18.08089 21.062841 18.09375 21.056641 C 17.500275 21.343235 16.87199 21.532414 16.232422 21.625 C 15.592854 21.717586 14.942526 21.712835 14.304688 21.611328 C 13.666849 21.509822 13.041412 21.311308 12.453125 21.015625 C 12.116421 20.846392 11.827687 20.57466 11.519531 20.341797 C 11.399978 20.275532 11.29455 20.226651 11.210938 20.119141 C 11.087286 20.013345 10.939343 19.954736 10.822266 19.837891 C 10.202247 19.21908 9.7377437 18.502178 9.4277344 17.736328 C 9.117725 16.970479 8.9628906 16.154706 8.9628906 15.339844 C 8.9628906 14.524981 9.117725 13.711162 9.4277344 12.945312 C 9.7377437 12.179463 10.202247 11.46256 10.822266 10.84375 C 10.871085 10.795027 10.938247 10.779341 10.988281 10.732422 C 11.024231 10.203595 11.436955 9.7792969 11.970703 9.7792969 C 12.07686 9.7792969 12.146275 9.8621761 12.242188 9.8925781 C 12.478198 9.7576659 12.673531 9.5404889 12.921875 9.4375 C 13.68911 9.1193256 14.508396 8.9550781 15.330078 8.9550781 C 16.151761 8.9550781 16.971278 9.1195561 17.740234 9.4375 C 18.50919 9.7554439 19.227585 10.226854 19.845703 10.84375 C 19.938725 10.936588 19.984193 11.055295 20.070312 11.152344 L 20.070312 10.888672 L 20.070312 7.3085938 L 11.970703 7.3085938 L 3.8691406 7.3085938 z M 7.2929688 9.7792969 C 7.8503216 9.7792969 8.3007812 10.230764 8.3007812 10.792969 L 8.3007812 19.513672 C 8.3007812 20.075876 7.8503217 20.529297 7.2929688 20.529297 C 6.7356158 20.529297 6.2890625 20.075876 6.2890625 19.513672 L 6.2890625 10.792969 C 6.2890625 10.230764 6.7356158 9.7792969 7.2929688 9.7792969 z "
        id="path953" />
     <path
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 7.2929688,10.193359 c -0.3336729,0 -0.5898438,0.256741 -0.5898438,0.59961 v 8.720703 c 0,0.342867 0.2571389,0.601562 0.5898438,0.601562 0.3327046,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.2600773,-0.59961 -0.59375,-0.59961 z"
        id="path945" />
     <path
-       style="opacity:0.3;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.3;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 11.96875,10.193359 c -0.333673,0 -0.589844,0.256741 -0.589844,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.589844,0.601562 0.332705,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.260077,-0.59961 -0.59375,-0.59961 z"
        id="path943" />
     <path
-       style="opacity:0.3;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.3;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 16.650391,10.193359 c -0.333673,0 -0.589844,0.256741 -0.589844,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.589844,0.601562 0.332704,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.260078,-0.59961 -0.59375,-0.59961 z"
        id="path5310" />
     <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:0.9;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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;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 A 3 3 0 0 0 9 4 A 3 3 0 0 0 9 4.015625 C 8.9134335 4.0195703 8.8333282 4.0280782 8.7480469 4.0332031 A 2 2 0 0 0 7 3 A 2 2 0 0 0 5 5 L 5 7 L 7 7 L 12 7 L 16.5 7 L 19 7 L 19 4.5 A 2.5 2.5 0 0 0 16.5 2 A 2.5 2.5 0 0 0 14.722656 2.7460938 A 3 3 0 0 0 12 1 z "
        id="path911" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50748265;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c00000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.50748265;marker:none;enable-background:accumulate"
        d="m 15.330078,10 c -1.364856,0 -2.728928,0.545431 -3.769531,1.583984 -2.0811689,2.077113 -2.0811689,5.436558 0,7.513672 1.64763,1.644377 4.091786,1.976798 6.078125,1.017578 0.05225,-0.02526 0.118329,-0.04914 0.169922,-0.07617 0.309657,-0.122066 1.062171,-0.355788 1.466797,0.0059 0.404627,0.361628 0.297215,0.778637 0.783203,1.263672 L 21.767578,23 22.998047,21.697266 21.332031,20.039062 C 20.846044,19.554028 20.460818,19.659604 20.0625,19.191406 19.664182,18.723209 20.11283,17.714114 20.14258,17.650391 21.103668,15.667984 20.755056,13.228367 19.107424,11.583984 18.066815,10.545431 16.694935,10 15.330078,10 Z m -0.01953,1.623047 A 3.6885595,3.6885595 0 0 1 19,15.310547 3.6885595,3.6885595 0 0 1 15.310547,19 a 3.6885595,3.6885595 0 0 1 -3.6875,-3.689453 3.6885595,3.6885595 0 0 1 3.687501,-3.6875 z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       id="path3803" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-full.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-full.svg
index eae5920e3..07a4a1e3e 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-full.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-full.svg
@@ -2,211 +2,146 @@
 <!-- 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="trash-full.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -218,7 +153,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -251,39 +186,27 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 3.8700935,7.3079801 v 3.5809079 0.929731 c 0,5.635467 0.023659,8.910088 0.059397,9.114359 0.1489028,0.799058 0.6850835,1.502605 1.4117293,1.86909 l 0.4051695,0.197929 H 12 18.253611 l 0.327741,-0.156203 c 0.673041,-0.32443 1.167856,-0.877621 1.370364,-1.538496 0.119123,-0.38451 0.118793,-0.540172 0.118793,-9.335825 V 10.888888 7.3079801 h -8.100208 z m 3.4237883,2.4714365 c 0.557353,0 1.0065598,0.4520474 1.0065598,1.0142524 v 8.72064 c 0,0.562204 -0.4492068,1.014252 -1.0065598,1.014252 -0.557353,0 -1.0054992,-0.452048 -1.0054992,-1.014252 v -8.72064 c 0,-0.562205 0.4481462,-1.0142524 1.0054992,-1.0142524 z m 4.6764192,0 c 0.557353,0 1.00656,0.4520474 1.00656,1.0142524 v 8.72064 c 0,0.562204 -0.449207,1.014252 -1.00656,1.014252 -0.557353,0 -1.006559,-0.452048 -1.006559,-1.014252 v -8.72064 c 0,-0.562205 0.449206,-1.0142524 1.006559,-1.0142524 z m 4.67642,0 c 0.557353,0 1.005499,0.4520474 1.005499,1.0142524 v 8.72064 c 0,0.562204 -0.448146,1.014252 -1.005499,1.014252 -0.557353,0 -1.00656,-0.452048 -1.00656,-1.014252 v -8.72064 c 0,-0.562205 0.449207,-1.0142524 1.00656,-1.0142524 z"
-       id="path5310"
-       inkscape:connector-curvature="0" />
+       id="path5310" />
     <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:0.9;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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;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 A 3 3 0 0 0 9 4 A 3 3 0 0 0 9 4.015625 C 8.9134335 4.0195703 8.8333282 4.0280782 8.7480469 4.0332031 A 2 2 0 0 0 7 3 A 2 2 0 0 0 5 5 L 5 7 L 7 7 L 12 7 L 16.5 7 L 19 7 L 19 4.5 A 2.5 2.5 0 0 0 16.5 2 A 2.5 2.5 0 0 0 14.722656 2.7460938 A 3 3 0 0 0 12 1 z "
        id="path911" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-0.41421226"
-       inkscape:original="M 7.2929688 9.7792969 C 6.7356158 9.7792969 6.2890625 10.230764 6.2890625 10.792969 L 6.2890625 19.513672 C 6.2890625 20.075876 6.7356158 20.529297 7.2929688 20.529297 C 7.8503217 20.529297 8.3007813 20.075876 8.3007812 19.513672 L 8.3007812 10.792969 C 8.3007812 10.230764 7.8503217 9.7792969 7.2929688 9.7792969 z "
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        id="path5310-3"
        d="m 7.2929688,10.193359 c -0.3336729,0 -0.5898438,0.256741 -0.5898438,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.5898438,0.601562 0.3327046,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.2600773,-0.59961 -0.59375,-0.59961 z" />
     <path
        d="m 7.2929688,10.193359 c -0.3336729,0 -0.5898438,0.256741 -0.5898438,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.5898438,0.601562 0.3327046,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.2600773,-0.59961 -0.59375,-0.59961 z"
        id="path961"
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
-       inkscape:original="M 7.2929688 9.7792969 C 6.7356158 9.7792969 6.2890625 10.230764 6.2890625 10.792969 L 6.2890625 19.513672 C 6.2890625 20.075876 6.7356158 20.529297 7.2929688 20.529297 C 7.8503217 20.529297 8.3007813 20.075876 8.3007812 19.513672 L 8.3007812 10.792969 C 8.3007812 10.230764 7.8503217 9.7792969 7.2929688 9.7792969 z "
-       inkscape:radius="-0.41421226"
-       sodipodi:type="inkscape:offset"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        transform="translate(4.6753794)" />
     <path
        transform="translate(9.3576642)"
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-0.41421226"
-       inkscape:original="M 7.2929688 9.7792969 C 6.7356158 9.7792969 6.2890625 10.230764 6.2890625 10.792969 L 6.2890625 19.513672 C 6.2890625 20.075876 6.7356158 20.529297 7.2929688 20.529297 C 7.8503217 20.529297 8.3007813 20.075876 8.3007812 19.513672 L 8.3007812 10.792969 C 8.3007812 10.230764 7.8503217 9.7792969 7.2929688 9.7792969 z "
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        id="path963"
        d="m 7.2929688,10.193359 c -0.3336729,0 -0.5898438,0.256741 -0.5898438,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.5898438,0.601562 0.3327046,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.2600773,-0.59961 -0.59375,-0.59961 z" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-hide-deleted.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-hide-deleted.svg
index e70aa21e1..ff090598f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-hide-deleted.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-hide-deleted.svg
@@ -2,210 +2,146 @@
 <!-- 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="trash-hide-deleted.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-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -250,43 +186,33 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path992"
        d="m 15.330078,8.9550781 c -1.071711,-0.00497 -2.176967,0.2426418 -3.046161,0.8944621 0.166326,0.1317607 0.82167,0.5123878 0.692645,1.0120188 -0.0035,2.91868 0.0069,5.837703 -0.0052,8.756167 -0.0299,0.672987 -0.908157,1.203056 -1.45967,0.720165 1.090135,1.030324 2.660792,1.401259 4.127225,1.341366 0.959826,-0.0315 1.885572,-0.334942 2.751073,-0.725176 0.624233,-5.17e-4 0.664618,1.604054 1.288817,0.725566 0.508881,-0.44224 0.315227,-1.18549 0.375139,-1.780564 0.02641,-2.932414 0.01245,-5.865022 0.01634,-8.797521 -1.14888,-1.3666283 -2.963679,-2.1416091 -4.740234,-2.1464839 z m 1.316406,0.8242188 c 0.637154,-0.021514 1.096164,0.6184171 1.00586,1.2194431 -0.0034,2.872953 0.0069,5.746248 -0.0052,8.618986 -0.02631,0.75274 -1.066763,1.229108 -1.602256,0.658549 -0.262072,-0.304876 -0.453607,-0.695664 -0.40429,-1.105555 0,-2.792584 0,-5.585167 0,-8.377751 0.09568,-0.509403 0.422158,-1.0280592 1.005859,-1.0136721 z m -5.683593,1.0214841 c -1.0235686,0.876781 -1.7020826,2.118661 -1.9092443,3.447699 -0.3652262,1.980464 0.3135576,4.122926 1.7340103,5.544721 0.239702,0.16109 0.550524,0.459519 0.248292,0.03471 -0.140346,-0.452812 -0.0451,-0.942062 -0.07306,-1.411689 0,-2.538482 0,-5.076963 0,-7.615445 z"
-       style="opacity:0.1;fill:#2a7fff;stroke:none;stroke-width:1.34910131" />
+       style="opacity:0.1;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0" />
     <path
-       inkscape:connector-curvature="0"
        id="path5310"
        d="m 3.8691406,7.3085938 v 3.5800782 0.929687 c 0,5.635467 0.02481,8.910964 0.060547,9.115235 0.1489028,0.799058 0.6854635,1.502655 1.4121094,1.86914 L 5.7460938,23 H 12 18.253906 l 0.328125,-0.15625 c 0.363866,-0.175397 0.498579,-0.542042 0.740235,-0.832031 -0.187017,-0.162647 -0.330281,-0.396018 -0.445313,-0.632813 -0.138557,-0.285221 -0.286227,-0.50923 -0.595703,-0.398437 -0.93607,0.476785 -1.987378,0.716023 -3.035156,0.707031 -1.047779,-0.009 -2.092032,-0.26731 -3.011719,-0.787109 -0.272668,-0.145617 -0.478674,-0.377109 -0.722656,-0.5625 -0.122866,-0.06944 -0.224723,-0.127187 -0.308594,-0.240235 -0.172712,-0.15006 -0.386227,-0.251728 -0.541016,-0.419922 C 10.211954,19.188594 9.8412478,18.62688 9.5605469,18.023438 9.2798459,17.419995 9.0905187,16.774843 9.0058594,16.115234 8.9212,15.455626 8.940156,14.78264 9.078125,14.125 9.2058771,13.395272 9.4766729,12.704696 9.8554688,12.080078 10.149001,11.596056 10.553421,11.193322 10.962891,10.800781 v -0.0078 c 0,-0.562205 0.450459,-1.0136721 1.007812,-1.0136721 0.09945,0 0.163281,0.078627 0.253906,0.1054687 0.318026,-0.1848885 0.606818,-0.4207628 0.951172,-0.5488281 0.684915,-0.2547196 1.414308,-0.3909287 2.154297,-0.3808594 1.086665,-9.991e-4 2.170044,0.2894087 3.115234,0.8242188 0.584373,0.3170871 1.105958,0.7310011 1.552735,1.2148441 0.02938,0.03182 0.04354,0.07501 0.07227,0.107421 v -0.21289 -3.5800782 h -8.099609 z m 3.4238282,2.4707031 c 0.557353,0 1.0078124,0.4514671 1.0078124,1.0136721 v 8.720703 c 0,0.562205 -0.4504594,1.015625 -1.0078124,1.015625 -0.5573531,0 -1.0039063,-0.45342 -1.0039063,-1.015625 v -8.720703 c 0,-0.562205 0.4465532,-1.0136721 1.0039063,-1.0136721 z"
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131" />
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0" />
     <path
        id="path1994"
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#c00000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 18.58579,12.41421 -6.34316,6.343152 m 0,-6.343152 6.34316,6.343152"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#c00000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 18.58579,12.41421 -6.34316,6.343152 m 0,-6.343152 6.34316,6.343152" />
     <path
-       inkscape:connector-curvature="0"
-       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.9;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:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;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 A 3,3 0 0 0 9,4 3,3 0 0 0 9,4.015625 C 8.913434,4.019575 8.8333282,4.028078 8.7480469,4.033203 A 2,2 0 0 0 7,3 2,2 0 0 0 5,5 v 2 h 2 5 4.5 2.5 V 4.5 A 2.5,2.5 0 0 0 16.5,2 2.5,2.5 0 0 0 14.722656,2.7460938 3,3 0 0 0 12,1 Z"
        id="path911" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.1;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 11.96875,10.193359 c -0.333673,0 -0.589844,0.256741 -0.589844,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.589844,0.601562 0.332705,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.260077,-0.59961 -0.59375,-0.59961 z"
        id="path943" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.1;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 16.650391,10.193359 c -0.333673,0 -0.589844,0.256741 -0.589844,0.59961 v 8.720703 c 0,0.342867 0.257139,0.601562 0.589844,0.601562 0.332704,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.260078,-0.59961 -0.59375,-0.59961 z"
        id="path5310-3" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 7.2929688,10.193359 c -0.3336729,0 -0.5898438,0.256741 -0.5898438,0.59961 v 8.720703 c 0,0.342867 0.2571389,0.601562 0.5898438,0.601562 0.3327046,0 0.59375,-0.260613 0.59375,-0.601562 v -8.720703 c 0,-0.34095 -0.2600773,-0.59961 -0.59375,-0.59961 z"
        id="path945" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-remove-small.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-remove-small.svg
index a58bafd39..0afdaef37 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-remove-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-remove-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="trash-remove-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,19 +56,15 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910119"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910119;fill-opacity:1.0"
        d="M 1 5.59375 L 1 7.7421875 L 1 8.2988281 C 1 11.676611 1.0149784 13.637331 1.0371094 13.759766 C 1.1293214 14.238705 1.4621161 14.661195 1.9121094 14.880859 L 2.1621094 15 L 6.0351562 15 L 9.90625 15 L 10.109375 14.90625 C 10.526172 14.711793 10.833576 14.380491 10.958984 13.984375 C 11.032754 13.753908 11.033203 13.660607 11.033203 8.3886719 L 11.033203 7.7480469 A 1.0003308 1.0003308 0 0 1 10.021484 6.7480469 L 10.021484 6.2421875 C 9.2964848 6.3443115 8.6326186 6.5105659 8.1875 6.9042969 A 1.0003308 1.0003308 0 0 1 8.1582031 6.9296875 C 7.7898566 7.2300355 7.5020248 7.6606341 7.3339844 8.1425781 A 1.0003308 1.0003308 0 0 1 7.2304688 8.3515625 C 7.0739533 8.5957391 6.8705254 8.7623042 6.6386719 8.8671875 L 6.6386719 12.910156 C 6.6386719 13.247129 6.3607796 13.517578 6.015625 13.517578 C 5.6704705 13.517578 5.3925781 13.247129 5.3925781 12.910156 L 5.3925781 8.8457031 C 4.8312103 8.5611995 4.5267803 7.9099455 4.7089844 7.2304688 C 4.763373 6.6471069 4.9226055 6.1026091 5.1464844 5.59375 L 1 5.59375 z M 13.53125 6.1679688 L 11.814453 7.4101562 L 12.193359 9.1757812 L 13.445312 15 L 13.574219 14.972656 C 14.34764 14.806306 15.000454 13.95156 15 13.107422 C 15.000408 12.965991 14.735846 11.685006 14.101562 8.7539062 C 13.799832 7.3619862 13.7037 6.9443511 13.53125 6.1679688 z M 3.1191406 7.0761719 C 3.4642951 7.0761719 3.7441406 7.3466198 3.7441406 7.6835938 L 3.7441406 12.910156 C 3.7441406 13.247129 3.4642951 13.517578 3.1191406 13.517578 C 2.7739861 13.517578 2.4980469 13.247129 2.4980469 12.910156 L 2.4980469 7.6835938 C 2.4980469 7.3466198 2.7739861 7.0761719 3.1191406 7.0761719 z M 8.9121094 7.0761719 C 9.257264 7.0761719 9.5351562 7.3466198 9.5351562 7.6835938 L 9.5351562 12.910156 C 9.5351562 13.247129 9.257264 13.517578 8.9121094 13.517578 C 8.5669549 13.517578 8.2890625 13.247129 8.2890625 12.910156 L 8.2890625 7.6835938 C 8.2890625 7.3466198 8.5669549 7.0761719 8.9121094 7.0761719 z "
        transform="translate(0,8)"
        id="path5310-3" />
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 6.0366781,15.999519 c -0.2647998,0.0022 -0.4780166,-0.281895 -0.392583,-0.53518 0.08179,-1.581352 1.1497167,-2.945431 2.425082,-3.798061 0.8782095,-0.581057 1.9079903,-0.909916 2.9521969,-1.013601 V 9.0000001 L 15,11.873384 11.021412,14.748389 v -1.628738 c -1.2194142,0.04706 -2.5410349,0.190552 -3.495713,1.035016 -0.5287957,0.431178 -0.9145667,1.018543 -1.137694,1.658477 -0.074529,0.116271 -0.2156509,0.187791 -0.3513269,0.186375 z"
-       id="path8807"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
+       id="path8807" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-remove.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-remove.svg
index 31ca65a56..7d755261c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-remove.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-remove.svg
@@ -2,210 +2,146 @@
 <!-- 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="trash-remove.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="1.9357521"
-     inkscape:cy="22.123475"
-     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="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-smooth-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8803"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8801"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutS"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8663"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2)" />
     </marker>
     <marker
-       inkscape:stockid="ExperimentalArrow"
        orient="auto-start-reverse"
        refY="3.0"
        refX="5.0"
-       id="ExperimentalArrow"
-       inkscape:isstock="true">
+       id="ExperimentalArrow">
       <path
          id="path8768"
          d="m 10,3 -10,3 0,-6 z"
-         style="fill:context-stroke;stroke:#000000;stroke-opacity:1" />
+         style="fill:context-stroke;stroke:#000000;stroke-opacity:1.0" />
     </marker>
     <marker
-       inkscape:stockid="TriangleOutM"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="TriangleOutM"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8660"
          d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8542"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8791"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8789"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="marker8787"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8785"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow2Lstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8533"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
          transform="scale(1.1) translate(1,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Send"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8530"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) rotate(180) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Sstart"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8527"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.2) translate(6,0)" />
     </marker>
     <marker
-       inkscape:stockid="Arrow1Mend"
        orient="auto"
        refY="0.0"
        refX="0.0"
        id="Arrow1Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
+       style="overflow:visible">
       <path
          id="path8524"
          d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1.0;fill:#000000;fill-opacity:1.0"
          transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
   </defs>
@@ -217,7 +153,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -250,39 +186,30 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g17063"
        transform="translate(-22)">
       <path
          id="path5310"
          d="m 3.8691406,7.3085938 v 3.5800782 0.929687 c 0,5.635467 0.024809,8.910964 0.060547,9.115235 0.1489028,0.799058 0.6854636,1.502655 1.4121094,1.86914 L 5.7460938,23 H 12 18.253906 l 0.328125,-0.15625 c 0.673041,-0.32443 1.166633,-0.878188 1.369141,-1.539062 0.119123,-0.38451 0.119141,-0.540285 0.11914,-9.335938 V 10.888672 7.3085938 H 18.646484 L 20,9 h -5 v 7 h -2.023438 v 3.513672 c 0,0.562204 -0.448506,1.015625 -1.005859,1.015625 -0.557353,0 -1.007812,-0.453421 -1.007812,-1.015625 V 16 H 9 V 9 H 4 L 5.3535156,7.3085938 Z m 3.4238282,2.4707031 c 0.5573529,0 1.0078124,0.4514671 1.0078124,1.0136721 v 8.720703 c 0,0.562204 -0.4504594,1.015625 -1.0078124,1.015625 -0.557353,0 -1.0039063,-0.453421 -1.0039063,-1.015625 v -8.720703 c 0,-0.562205 0.4465533,-1.0136721 1.0039063,-1.0136721 z m 9.3535152,0 c 0.557353,0 1.00586,0.4514671 1.00586,1.0136721 v 8.720703 c 0,0.562204 -0.448507,1.015625 -1.00586,1.015625 -0.557353,0 -1.005859,-0.453421 -1.005859,-1.015625 v -8.720703 c 0,-0.562205 0.448506,-1.0136721 1.005859,-1.0136721 z"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="rect1539"
          d="M 14,15 V 8 h 4 L 12,1 6,8 h 4 v 7 z"
-         style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+         style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     </g>
     <path
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:2.03374696"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:2.03374696;fill-opacity:1.0"
        id="path10"
-       d="M 20.551716,6.2800579 C 20.245041,5.5113706 19.590094,4.8663289 18.801432,4.5424787 18.403538,4.3782733 17.622605,4.2903615 17.270188,4.3661609 L 17,4.4242737 l 1.997606,9.2876033 1.997608,9.287602 0.205577,-0.04422 c 1.233464,-0.265297 2.27384,-1.628329 2.273116,-2.974575 6.52e-4,-0.225556 -0.420075,-2.267378 -1.43164,-6.941943 -0.788636,-3.6380797 -1.46127,-6.6796912 -1.490551,-6.7586861 z"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="0.76597511"
-       inkscape:transform-center-y="-9.2818372" />
+       d="M 20.551716,6.2800579 C 20.245041,5.5113706 19.590094,4.8663289 18.801432,4.5424787 18.403538,4.3782733 17.622605,4.2903615 17.270188,4.3661609 L 17,4.4242737 l 1.997606,9.2876033 1.997608,9.287602 0.205577,-0.04422 c 1.233464,-0.265297 2.27384,-1.628329 2.273116,-2.974575 6.52e-4,-0.225556 -0.420075,-2.267378 -1.43164,-6.941943 -0.788636,-3.6380797 -1.46127,-6.6796912 -1.490551,-6.7586861 z" />
     <path
-       style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:1.34910131"
+       style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:1.34910131;fill-opacity:1.0"
        d="m 1.1464844,8 v 3.423828 0.888672 c 0,5.386943 0.023298,8.515676 0.058594,8.710938 0.1470606,0.763819 0.6768747,1.436786 1.3945312,1.787109 L 3,23 h 6.1757813 6.1757807 l 0.324219,-0.148438 c 0.664715,-0.310123 1.153513,-0.838972 1.353515,-1.470703 0.11765,-0.367553 0.117188,-0.518015 0.117188,-8.925781 V 11.423828 8 h -6 v 2 H 7.1464844 V 8 Z m 3.3808594,2.363281 c 0.5504579,0 0.9941406,0.431339 0.9941406,0.96875 v 8.335938 c 0,0.53741 -0.4436827,0.96875 -0.9941406,0.96875 -0.550458,0 -0.9921875,-0.43134 -0.9921875,-0.96875 v -8.335938 c 0,-0.537411 0.4417295,-0.96875 0.9921875,-0.96875 z m 4.6191406,0 c 0.550458,0 0.9941406,0.431339 0.9941406,0.96875 v 8.335938 c 0,0.53741 -0.4436826,0.96875 -0.9941406,0.96875 -0.5504579,0 -0.9941406,-0.43134 -0.9941406,-0.96875 v -8.335938 c 0,-0.537411 0.4436827,-0.96875 0.9941406,-0.96875 z m 4.6191406,0 c 0.550458,0 0.992187,0.431339 0.992187,0.96875 v 8.335938 c 0,0.53741 -0.441729,0.96875 -0.992187,0.96875 -0.550458,0 -0.994141,-0.43134 -0.994141,-0.96875 v -8.335938 c 0,-0.537411 0.443683,-0.96875 0.994141,-0.96875 z"
-       id="path5310-3"
-       inkscape:connector-curvature="0" />
+       id="path5310-3" />
     <path
-       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:1;fill:#008000;fill-opacity:1.0;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 10.146484,9 V 5 h 2 L 9.1464839,0.9999999 6.1464844,5 H 8.146484 v 4 z"
-       id="rect1539-6"
-       inkscape:connector-curvature="0" />
+       id="rect1539-6" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/trash-small.svg b/rtdata/icons/rawtherapee/scalable/apps/trash-small.svg
index 3d2e674c6..405ae1baa 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/trash-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/trash-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="trash-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,29 +56,24 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g5377"
        transform="matrix(0.03255975,0,0,0.03284318,7.0224524,16.223702)"
        style="stroke-width:62.19189453">
       <path
-         inkscape:connector-curvature="0"
          d="m -14.2123,-217.38426 c -9.196325,4.65637 -15.133193,12.80501 -16.413694,22.23415 l -0.814865,5.47123 h 61.464048 61.464047 l -0.814865,-4.77277 c -1.047682,-6.75174 -5.820459,-15.59883 -10.360417,-18.9747 -8.381461,-6.4025 -9.312734,-6.51891 -51.10363,-6.51891 -36.9017098,0.11641 -38.9970751,0.23281 -43.420624,2.561 z"
          id="path8"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:62.19189453" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:62.19189453;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          d="m -105.59351,-173.73082 c -15.94805,2.67741 -30.96484,12.45578 -40.39398,26.07566 -4.77278,6.86814 -9.66196,21.30288 -9.66196,28.28743 v 5.35482 H 30.023189 215.69583 v -4.07432 c 0,-24.44593 -21.76852,-49.70672 -47.49494,-55.17795 -4.30714,-0.93128 -45.05036,-1.2805 -138.526929,-1.16409 -72.755738,0.1164 -133.637741,0.46563 -135.267471,0.69845 z"
          id="path10"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:62.19189453" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:62.19189453;fill-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="path5310"
          transform="matrix(0.66335753,0,0,0.66335753,-301.65558,-296.97895)"
          d="M 260.46875,300.375 V 404.96875 432.125 c 0,164.60477 0.69708,260.25227 1.75,266.21875 4.38712,23.33947 20.1846,43.88918 41.59375,54.59375 l 11.9375,5.78125 H 500 684.25 l 9.65625,-4.5625 c 19.82979,-9.47619 34.40852,-25.63417 40.375,-44.9375 3.50971,-11.23103 3.5,-15.77772 3.5,-272.6875 V 404.96875 300.375 H 499.125 Z m 100.875,72.1875 c 16.42128,0 29.65625,13.20372 29.65625,29.625 v 254.71875 c 0,16.42128 -13.23497,29.625 -29.65625,29.625 -16.42128,0 -29.625,-13.20372 -29.625,-29.625 V 402.1875 c 0,-16.42128 13.20372,-29.625 29.625,-29.625 z m 137.78125,0 c 16.42128,0 29.65625,13.20372 29.65625,29.625 v 254.71875 c 0,16.42128 -13.23497,29.625 -29.65625,29.625 -16.42128,0 -29.65625,-13.20372 -29.65625,-29.625 V 402.1875 c 0,-16.42128 13.23497,-29.625 29.65625,-29.625 z m 137.78125,0 c 16.42128,0 29.625,13.20372 29.625,29.625 v 254.71875 c 0,16.42128 -13.20372,29.625 -29.625,29.625 -16.42128,0 -29.65625,-13.20372 -29.65625,-29.625 V 402.1875 c 0,-16.42128 13.23497,-29.625 29.65625,-29.625 z"
-         style="opacity:0.7;fill:#2a7fff;stroke:none;stroke-width:62.19189453" />
+         style="opacity:0.7;fill:#cccccc;stroke:none;stroke-width:62.19189453;fill-opacity:1.0" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/undo-all.svg b/rtdata/icons/rawtherapee/scalable/apps/undo-all.svg
index e648588ef..82d3abaee 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/undo-all.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/undo-all.svg
@@ -2,66 +2,16 @@
 <!-- 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="undo-all.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -72,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,21 +55,17 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="M 9.949033,8.4948032 7.969092,6.0502179 6.5454982,13.646832 l 7.8944748,0.719941 -2.021592,-2.59938 c 4.275719,-5.1547511 9.942843,-1.673533 9.942843,-1.673533 0,0 -6.425864,-8.1931439 -12.412191,-1.5990568 z"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path815" />
     <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:0.35;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:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       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.35;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="M 3.2089844 8.4277344 A 0.79229534 0.79229534 0 0 0 2.4375 9.0722656 L 1.0136719 16.669922 A 0.79229534 0.79229534 0 0 0 1.7207031 17.605469 L 9.6152344 18.324219 A 0.79229534 0.79229534 0 0 0 10.3125 17.048828 L 9.1230469 15.519531 L 6.9746094 15.324219 A 0.79229534 0.79229534 0 0 0 7.0390625 15.421875 L 7.9394531 16.580078 L 2.7304688 16.105469 L 3.6777344 11.048828 L 4.5800781 12.162109 A 0.79229534 0.79229534 0 0 0 4.6503906 12.238281 L 5.03125 10.205078 L 3.8320312 8.7207031 A 0.79229534 0.79229534 0 0 0 3.2089844 8.4277344 z "
        id="path829" />
     <path
-       style="opacity:0.35;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:none;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.35;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.58443224;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="M 3.6777344 11.048828 L 2.7304688 16.105469 L 7.9394531 16.580078 L 7.0390625 15.421875 A 0.79229534 0.79229534 0 0 1 6.9746094 15.324219 L 5.1347656 15.15625 C 4.5913076 15.107137 4.2081598 14.600804 4.3085938 14.064453 L 4.6503906 12.238281 A 0.79229534 0.79229534 0 0 1 4.5800781 12.162109 L 3.6777344 11.048828 z "
        id="path880" />
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/undo-small.svg b/rtdata/icons/rawtherapee/scalable/apps/undo-small.svg
index f06c73392..5d290f41b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/undo-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/undo-small.svg
@@ -2,58 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="undo-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -98,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26899993;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.26899993;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
        d="M 5.5087882,14.688218 3.914969,12.740942 2.769,18.792154 9.1239192,19.365635 7.4965714,17.295055 C 11.134634,13 15.500393,15.961974 15.500393,15.961974 c 0,0 -5.365759,-6.961974 -9.9916048,-1.273756 z"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path815" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/undo.svg b/rtdata/icons/rawtherapee/scalable/apps/undo.svg
index bc4282693..2552d5b73 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/undo.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/undo.svg
@@ -2,66 +2,16 @@
 <!-- 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="undo.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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"
-     inkscape:snap-text-baseline="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -105,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.53333285;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="M 6.4858245,9.375818 3.9865811,6.2900625 2.1896046,15.87913 12.154656,16.787898 9.6028372,13.506748 C 15,7 22.153507,11.394278 22.153507,11.394278 c 0,0 -8.111251,-10.3420561 -15.6676825,-2.01846 z"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path815" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/warning-highlights.svg b/rtdata/icons/rawtherapee/scalable/apps/warning-highlights.svg
index c7aaf80ce..346385d6a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/warning-highlights.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/warning-highlights.svg
@@ -2,59 +2,16 @@
 <!-- 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="warning-highlights.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,37 +55,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#ffffff;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"
+       style="opacity:0.7;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path851"
-       sodipodi:sides="3"
-       sodipodi:cx="12"
-       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 12,3 22.392305,21 1.6076952,21 Z"
-       inkscape:transform-center-y="-3" />
+       d="M 12,3 22.392305,21 1.6076952,21 Z" />
     <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
        id="path4562-5"
        d="m 13.207467,10.82925 c 0,2.185129 -0.540947,5.087874 -1.207468,5.087874 -0.666523,0 -1.207467,-2.902745 -1.207467,-5.087874 0,-2.1851257 0.540944,-2.8292503 1.207467,-2.8292503 0.666521,0 1.207468,0.6441246 1.207468,2.8292503 z"
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
     <ellipse
        ry="1.2399021"
        rx="1.2388306"
        cy="17.753935"
        cx="12"
        id="path4565-0"
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/warning-shadows.svg b/rtdata/icons/rawtherapee/scalable/apps/warning-shadows.svg
index f9baa36c1..137cdebd2 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/warning-shadows.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/warning-shadows.svg
@@ -2,59 +2,16 @@
 <!-- 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="warning-shadows.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,37 +55,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       sodipodi:type="star"
-       style="opacity:0.7;fill:#000000;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"
+       style="opacity:0.7;fill:#000000;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path851"
-       sodipodi:sides="3"
-       sodipodi:cx="12"
-       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 12,3 22.392305,21 1.6076952,21 Z"
-       inkscape:transform-center-y="-3" />
+       d="M 12,3 22.392305,21 1.6076952,21 Z" />
     <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
        id="path4562-5"
        d="m 13.207467,10.82925 c 0,2.185129 -0.540947,5.087874 -1.207468,5.087874 -0.666523,0 -1.207467,-2.902745 -1.207467,-5.087874 0,-2.1851257 0.540944,-2.8292503 1.207467,-2.8292503 0.666521,0 1.207468,0.6441246 1.207468,2.8292503 z"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
     <ellipse
        ry="1.2399021"
        rx="1.2388306"
        cy="17.753935"
        cx="12"
        id="path4565-0"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/warning.svg b/rtdata/icons/rawtherapee/scalable/apps/warning.svg
index c24ba0653..74a7d1d23 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/warning.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/warning.svg
@@ -2,59 +2,16 @@
 <!-- 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="warning.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="7.684729"
-     inkscape:cy="12.059113"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     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:bbox-paths="false"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,37 +55,21 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path851"
-       sodipodi:sides="3"
-       sodipodi:cx="12"
-       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 12,3 22.392305,21 1.6076952,21 Z"
-       inkscape:transform-center-y="-3" />
+       d="M 12,3 22.392305,21 1.6076952,21 Z" />
     <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssc"
        id="path4562-5"
        d="m 13.207467,10.82925 c 0,2.185129 -0.540947,5.087874 -1.207468,5.087874 -0.666523,0 -1.207467,-2.902745 -1.207467,-5.087874 0,-2.1851257 0.540944,-2.8292503 1.207467,-2.8292503 0.666521,0 1.207468,0.6441246 1.207468,2.8292503 z"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
     <ellipse
        ry="1.2399021"
        rx="1.2388306"
        cy="17.753935"
        cx="12"
        id="path4565-0"
-       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wavelets.svg b/rtdata/icons/rawtherapee/scalable/apps/wavelets.svg
index 1d6de039c..9d92638ce 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wavelets.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wavelets.svg
@@ -2,62 +2,16 @@
 <!-- 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="wavelets.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="20"
-     inkscape:cx="-8.0000014"
-     inkscape:cy="11.999999"
-     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-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -68,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,35 +55,26 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g923">
       <path
-         sodipodi:nodetypes="sccsccscscsccscsc"
-         inkscape:connector-curvature="0"
          id="path4416"
          d="m 11.999952,1.0000001 c -2.5167905,0 -3.4837781,9.3785689 -4.9842818,15.8813439 h 0.01495 c 1.4886221,-1.048684 2.4610714,-2.703062 4.9693358,-2.703062 2.508271,0 3.135879,1.654378 4.641512,2.703062 h 0.01509 C 15.136512,10.378569 14.516742,1.0000001 11.999952,1.0000001 Z M 7.0127286,16.894094 c -0.6883344,0.480027 -1.1112441,0.830044 -2.5182028,0.830044 -2.0461976,0 -2.364468,-0.100754 -3.49452624,-0.421421 C 2.5125301,18.538999 2.4483282,23 4.4945258,23 5.9014276,23 6.3244042,19.872186 7.0127286,16.894094 Z m 9.6468104,0 C 17.357036,19.872182 17.866243,23 19.505425,23 c 2.046198,0 1.982043,-4.461001 3.494573,-5.697283 -1.130058,0.320667 -1.448375,0.421421 -3.494573,0.421421 -1.639249,0 -2.148384,-0.350018 -2.845886,-0.830044 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
       <path
          d="m 28.601562,-165.38477 c -5.71372,17.6912 -11.582078,38.69752 -17.070312,61.99219 -9.9499606,42.232344 -19.354294,91.619437 -28.919922,141.832033 14.6498617,-3.761883 30.392331,-6.201172 47.410156,-6.201172 13.916269,0 26.98446,1.702792 39.283204,4.433594 -8.744182,-50.203884 -17.087085,-99.49047 -25.888672,-141.626955 -4.714851,-22.57175 -9.805473,-43.0864 -14.814454,-60.42969 z"
          id="path4538"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:55.48081207;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
-         inkscape:original="M 29.369141 -211.95898 C 28.511023 -210.35855 27.655323 -208.79917 26.775391 -206.95508 C 16.592619 -185.61482 5.5468073 -149.50561 -4.4316406 -107.15234 C -16.347735 -56.574795 -27.327311 3.0416675 -38.744141 62.666016 C -18.928904 54.333834 4.0764978 48.636719 30.021484 48.636719 C 52.377577 48.636719 72.521783 53.077965 90.007812 59.900391 C 79.520151 0.72326823 69.928107 -58.235748 59.46875 -108.30859 C 50.603806 -150.74839 40.649858 -186.92485 31.242188 -208.09961 C 30.608391 -209.52615 29.995039 -210.68315 29.369141 -211.95898 z "
-         inkscape:radius="-16.399292"
-         sodipodi:type="inkscape:offset"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:55.48081207;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
          transform="matrix(0.03604851,0,0,0.03604851,10.917708,10.749123)" />
       <path
          id="path4534"
          d="m 18.972083,19.377388 c 0.10902,0.413652 0.218708,0.80105 0.332464,1.114124 0.0694,0.190995 0.140201,0.349137 0.206785,0.485599 0.108408,-0.23346 0.232639,-0.540042 0.353657,-0.898397 0.07214,-0.21363 0.136585,-0.445854 0.201856,-0.684639 -0.178845,0.0031 -0.358618,0.006 -0.561427,0.006 -0.185833,0 -0.36025,-0.01082 -0.533335,-0.02267 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
       <path
          id="path4527"
          d="m 4.7362357,19.38802 c -0.081242,0.0033 -0.1578296,0.01205 -0.2417085,0.01205 -0.2027832,0 -0.3825321,-0.0029 -0.5613571,-0.006 0.065267,0.238797 0.1296512,0.471071 0.201788,0.68471 0.079263,0.234716 0.1597674,0.443304 0.2371309,0.630708 0.018111,-0.05191 0.036364,-0.09853 0.054147,-0.154332 0.1050195,-0.329692 0.2073152,-0.735206 0.3100025,-1.167141 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
     </g>
     <g
        id="g913"
@@ -140,17 +85,13 @@
          id="g823"
          style="display:inline;stroke-width:39.90919495">
         <path
-           sodipodi:nodetypes="caszsac"
-           inkscape:connector-curvature="0"
            id="path4441"
            d="m -276.9561,831.2087 c 0,0 17.01565,4.94163 23.45569,10.61372 42.86209,37.75088 37.21507,145.93865 89.79144,145.93865 115.075198,0 98.500733,-554.11144 192.85003,-554.11144 94.3493,0 58.775799,554.11144 192.85003,554.11144 52.57637,0 46.92935,-108.18777 89.79144,-145.93865 6.44004,-5.67209 23.45569,-10.61372 23.45569,-10.61372"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:52.94812775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:52.94812775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate" />
         <path
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:52.94812775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:52.94812775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-mid:none;enable-background:accumulate"
            d="m -276.9561,831.2087 c 0,0 16.18567,6.22083 23.45569,10.61372 32.92929,19.89743 37.21507,70.37796 89.79144,70.37796 115.075198,0 98.500733,-302.24258 192.85003,-302.24258 94.3493,0 58.775799,302.24258 192.85003,302.24258 52.57637,0 56.86215,-50.48053 89.79144,-70.37796 7.27002,-4.39289 23.45569,-10.61372 23.45569,-10.61372"
-           id="path4443"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="caszsac" />
+           id="path4443" />
       </g>
     </g>
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-auto-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-auto-small.svg
index 23e55f560..b0de28748 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-auto-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-auto-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-auto-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="51.375"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,16 +56,14 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        aria-label="AWB"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text831"
        transform="matrix(0.64285714,0,0,0.64285714,0.35714286,6.7857143)" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
        d="M 2 4 C 1.446 4 1 4.446 1 5 L 1 11 C 1 11.554 1.446 12 2 12 L 14 12 C 14.554 12 15 11.554 15 11 L 15 5 C 15 4.446 14.554 4 14 4 L 2 4 z M 2.7167969 6.0917969 L 4.0019531 6.0917969 L 5.4375 9.9082031 L 4.203125 9.9082031 L 4.015625 9.2792969 L 2.671875 9.2792969 L 2.4863281 9.9082031 L 1.28125 9.9082031 L 2.7167969 6.0917969 z M 5.4609375 6.0917969 L 6.5800781 6.0917969 L 6.984375 8.2246094 L 7.5722656 6.0917969 L 8.6894531 6.0917969 L 9.28125 8.2246094 L 9.6855469 6.0917969 L 10.798828 6.0917969 L 9.9589844 9.9082031 L 8.8027344 9.9082031 L 8.1328125 7.5058594 L 7.4667969 9.9082031 L 6.3105469 9.9082031 L 5.4609375 6.0917969 z M 11.189453 6.0917969 L 13.398438 6.0917969 C 13.766493 6.0917969 14.04796 6.1829427 14.244141 6.3652344 C 14.442057 6.547526 14.541016 6.7719184 14.541016 7.0410156 C 14.541016 7.2667101 14.470703 7.4615885 14.330078 7.6230469 C 14.236328 7.7306858 14.100477 7.8144531 13.919922 7.8769531 C 14.194227 7.9429253 14.394965 8.0572917 14.523438 8.21875 C 14.653646 8.3784722 14.71875 8.5792101 14.71875 8.8222656 C 14.71875 9.0201823 14.672092 9.1994358 14.580078 9.3574219 C 14.488064 9.515408 14.362847 9.640408 14.203125 9.7324219 C 14.104167 9.7897135 13.955512 9.8313802 13.755859 9.8574219 C 13.490234 9.8921441 13.313368 9.9082031 13.226562 9.9082031 L 11.189453 9.9082031 L 11.189453 6.0917969 z M 12.380859 6.8652344 L 12.380859 7.5878906 L 12.892578 7.5878906 C 13.076606 7.5878906 13.20421 7.5566406 13.275391 7.4941406 C 13.348307 7.4299045 13.384766 7.3385417 13.384766 7.21875 C 13.384766 7.1076389 13.348307 7.0214844 13.275391 6.9589844 C 13.20421 6.8964844 13.07921 6.8652344 12.900391 6.8652344 L 12.380859 6.8652344 z M 3.3457031 7.0800781 L 2.9277344 8.453125 L 3.7675781 8.453125 L 3.3457031 7.0800781 z M 12.380859 8.3144531 L 12.380859 9.0878906 L 12.982422 9.0878906 C 13.185547 9.0878906 13.328776 9.0536024 13.412109 8.9824219 C 13.495443 8.9095052 13.537109 8.8109809 13.537109 8.6894531 C 13.537109 8.5766059 13.495443 8.4876302 13.412109 8.4199219 C 13.330512 8.3504774 13.185113 8.3144531 12.978516 8.3144531 L 12.380859 8.3144531 z "
        transform="translate(0,8)"
        id="rect890" />
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-auto.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-auto.svg
index 5914ee63e..7011cfe03 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-auto.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-auto.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-auto.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,16 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:4;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:4;stroke-opacity:1;paint-order:normal"
        d="M 3 5 C 1.892 5 1 5.892 1 7 L 1 17 C 1 18.108 1.892 19 3 19 L 21 19 C 22.108 19 23 18.108 23 17 L 23 7 C 23 5.892 22.108 5 21 5 L 3 5 z M 4.0742188 9.1367188 L 6.0039062 9.1367188 L 8.15625 14.863281 L 6.3046875 14.863281 L 6.0234375 13.917969 L 4.0078125 13.917969 L 3.7304688 14.863281 L 1.921875 14.863281 L 4.0742188 9.1367188 z M 8.1914062 9.1367188 L 9.8710938 9.1367188 L 10.476562 12.335938 L 11.359375 9.1367188 L 13.035156 9.1367188 L 13.921875 12.335938 L 14.527344 9.1367188 L 16.199219 9.1367188 L 14.9375 14.863281 L 13.203125 14.863281 L 12.199219 11.257812 L 11.199219 14.863281 L 9.4648438 14.863281 L 8.1914062 9.1367188 z M 16.785156 9.1367188 L 20.097656 9.1367188 C 20.64974 9.1367188 21.072917 9.2734375 21.367188 9.546875 C 21.664062 9.8203125 21.8125 10.158854 21.8125 10.5625 C 21.8125 10.901042 21.707031 11.191406 21.496094 11.433594 C 21.355468 11.595052 21.14974 11.722656 20.878906 11.816406 C 21.290365 11.915365 21.592448 12.085938 21.785156 12.328125 C 21.980469 12.567708 22.078125 12.869792 22.078125 13.234375 C 22.078125 13.53125 22.009114 13.798178 21.871094 14.035156 C 21.733072 14.272136 21.54427 14.459636 21.304688 14.597656 C 21.15625 14.683594 20.932292 14.746094 20.632812 14.785156 C 20.234375 14.837243 19.970052 14.863281 19.839844 14.863281 L 16.785156 14.863281 L 16.785156 9.1367188 z M 18.570312 10.296875 L 18.570312 11.382812 L 19.339844 11.382812 C 19.615885 11.382812 19.807292 11.335936 19.914062 11.242188 C 20.023438 11.145831 20.078125 11.007812 20.078125 10.828125 C 20.078125 10.661458 20.023438 10.53125 19.914062 10.4375 C 19.807292 10.34375 19.619792 10.296875 19.351562 10.296875 L 18.570312 10.296875 z M 5.0195312 10.621094 L 4.390625 12.679688 L 5.6523438 12.679688 L 5.0195312 10.621094 z M 18.570312 12.472656 L 18.570312 13.632812 L 19.472656 13.632812 C 19.777344 13.632812 19.992188 13.579428 20.117188 13.472656 C 20.242188 13.363282 20.304688 13.217448 20.304688 13.035156 C 20.304688 12.865886 20.242188 12.730469 20.117188 12.628906 C 19.994792 12.52474 19.778646 12.472656 19.46875 12.472656 L 18.570312 12.472656 z "
        id="rect827" />
     <g
        aria-label="AWB"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1.0;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="text831" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-camera-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-camera-small.svg
index 2521d513e..19a241f64 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-camera-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-camera-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-camera-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="50.75"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,13 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       inkscape:connector-curvature="0"
        id="path4271"
        d="m 9.6144101,10.675972 c -0.373151,-0.0024 -0.7061651,0.02093 -1.1455214,0.06238 -0.5009429,0.04726 -0.6657853,0.179934 -1.0487833,0.982707 -0.3767705,0.789716 -0.5482419,0.983192 -1.2665752,1.13442 -0.718334,0.151228 -2.202317,0.160426 -3.3176245,0.434527 -1.1153075,0.274101 -1.5405489,0.52033 -1.7201323,1.805768 -0.17958342,1.28544 -0.103948,2.561272 -0.075593,3.83726 0.028355,1.275986 -3.383e-4,1.691861 0.028017,1.890347 0.028355,0.198488 0.1230192,0.510056 0.8886116,0.500605 0,-1e-6 10.170303,0 11.455742,0 C 14.69799,21.323982 15,20.795046 15,20.038905 c -10e-7,-0.75614 0,-3.100507 0,-4.46156 -10e-7,-1.361053 -0.823385,-1.885659 -1.360671,-2.173689 -0.91682,-0.491492 -0.842894,-0.01524 -1.587976,-1.607007 -0.20794,-0.444233 -0.357503,-0.961014 -1.049313,-1.030282 -0.601109,-0.06019 -1.0144784,-0.08799 -1.3876299,-0.09039 z M 3.6816993,13.24877 c 0.2639224,-0.0024 0.4623266,0.058 0.4731155,0.154886 0.01328,0.119246 -0.2630725,0.24888 -0.6169009,0.289156 -0.353828,0.04027 -0.6517265,-0.02401 -0.6650048,-0.143257 -0.013278,-0.119246 0.2630724,-0.24888 0.6169003,-0.289155 0.066343,-0.0076 0.1309846,-0.01109 0.1918899,-0.01163 z m 5.8925358,0.823063 c 1.6090169,0 2.9148149,1.305797 2.9148149,2.914815 0,1.609018 -1.305797,2.914816 -2.9148149,2.914816 -1.6090181,0 -2.9148147,-1.305798 -2.9148147,-2.914816 0,-1.609018 1.3057966,-2.914815 2.9148147,-2.914815 z m -5.2074437,0.727382 c 0.1039813,0 0.1876604,0.08368 0.1876604,0.18766 v 5.463297 c 0,0.103982 -0.083679,0.187661 -0.1876604,0.187661 -0.1039808,0 -0.1876603,-0.08368 -0.1876603,-0.187661 v -5.463297 c 4e-7,-0.103981 0.083679,-0.18766 0.1876603,-0.18766 z"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:37.76315689;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:37.76315689;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-camera.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-camera.svg
index f83342b6b..1f4d0d87d 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-camera.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-camera.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-camera.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,13 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path4271"
        d="M 14.53693,3.633674 C 13.95055,3.629895 13.427242,3.666561 12.736825,3.731695 11.949629,3.805959 11.690591,4.014448 11.088737,5.2759475 10.496669,6.5169298 10.227214,6.8209637 9.098404,7.058608 7.9695935,7.2962526 5.6376202,7.3107054 3.8849941,7.7414355 2.1323681,8.1721656 1.4641316,8.5590964 1.1819291,10.579072 c -0.28220248,2.019976 -0.1633468,4.024856 -0.1187887,6.029979 0.044558,2.005122 -5.316e-4,2.658639 0.044027,2.970546 0.044558,0.311909 0.193316,0.801517 1.3963897,0.786665 0,-10e-7 15.9819039,0 18.0018799,0 C 22.525413,20.366261 23,19.535075 23,18.346854 c -1e-6,-1.18822 0,-4.872225 0,-7.011023 -1e-6,-2.1387977 -1.293891,-2.9631794 -2.138197,-3.4157972 C 19.421085,7.1476903 19.537255,7.8960858 18.366411,5.3947365 18.039649,4.6966566 17.804621,3.8845726 16.717491,3.775722 15.772891,3.681142 15.123311,3.637452 14.53693,3.633674 Z M 5.2140983,7.6766417 c 0.4147353,-0.00366 0.7265133,0.09114 0.7434673,0.2433921 C 5.9784339,8.1074208 5.544166,8.3111314 4.9881498,8.3744211 4.4321345,8.4377104 3.9640082,8.3366911 3.9431423,8.1493042 3.9222764,7.9619173 4.3565418,7.7582064 4.9125571,7.6949168 5.0168108,7.6830504 5.11839,7.6774867 5.2140983,7.6766417 Z m 9.2596997,1.2933842 c 2.528455,2e-7 4.580424,2.0519671 4.580424,4.5804241 0,2.528457 -2.051968,4.580425 -4.580424,4.580425 -2.528457,0 -4.5804237,-2.051968 -4.5804237,-4.580425 0,-2.528457 2.0519667,-4.5804241 4.5804237,-4.5804241 z M 6.2906717,10.113055 c 0.1633992,0 0.2948948,0.131496 0.2948948,0.294895 v 8.585181 c 0,0.163399 -0.1314956,0.294895 -0.2948948,0.294895 -0.1633984,0 -0.2948948,-0.131496 -0.2948948,-0.294895 V 10.40795 c 7e-7,-0.163399 0.1314964,-0.294895 0.2948948,-0.294895 z"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:37.76315689;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:37.76315689;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy-small.svg
index 0197eab4e..bc9e70be3 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-cloudy-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.375"
-     inkscape:cx="1.5140497"
-     inkscape:cy="8.0817833"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999988"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999988"
        d="m 4.234999,20.828442 c 2.9591897,0 4.2572646,0 6.370973,0 1.668415,0 3.794433,0.200792 3.822545,-0.857241 C 14.44965,19.17586 15,19.300302 15,18.11082 c 0,-1.877187 -1.544082,-2.537376 -2.596343,-1.934583 -0.05606,0.622867 -0.400494,1.443532 -1.362383,1.72971 1.530775,-1.683435 1.443142,-6.375249 -3.1639197,-6.738386 C 5.7934937,11.003307 4.2722545,12.67642 4.1337274,14.151413 5.1680093,14.268396 6.1440045,14.78186 6.1960967,16.165091 4.8644518,14.493569 2.8894279,14.89617 2.2068023,15.331428 1.1690386,15.993129 1,16.84977 1,18.022166 c 0,1.567185 1.0747693,2.806276 3.234999,2.806276 z"
-       id="path10598"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssssccsccsss" />
+       id="path10598" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy.svg
index 5762fa37b..2d4fed852 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-cloudy.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-cloudy.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999988"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.99999988"
        d="m 6.0835699,19.587551 c 4.6501551,0 6.6899871,0 10.0115281,0 2.621795,0 5.962681,0.31553 6.006857,-1.347094 C 22.135164,16.990636 23,17.186187 23,15.317002 c 0,-2.949865 -2.426415,-3.987305 -4.079967,-3.04006 -0.08809,0.978792 -0.629349,2.268408 -2.140889,2.718116 C 19.184648,12.34966 19.04694,4.9768107 11.807271,4.4061668 8.5326329,4.1480538 6.1421142,6.7772313 5.9244288,9.0950773 c 1.6253,0.18383 3.1590068,0.9907007 3.2408659,3.1643507 C 7.0727099,9.6327503 3.9691009,10.265409 2.8964036,10.949385 1.2656321,11.989201 1,13.335352 1,15.177688 c 0,2.462719 1.6889231,4.409863 5.0835699,4.409863 z"
-       id="path10598"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ssssccsccsss" />
+       id="path10598" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-custom-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-custom-small.svg
index f176458a8..f7f66a447 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-custom-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-custom-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-custom-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.375"
-     inkscape:cx="1.5140497"
-     inkscape:cy="8.0817833"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,29 +56,25 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g943"
        transform="matrix(0.64285714,0,0,0.64285714,0.28571432,6.3571429)"
        style="stroke-width:1.55555558">
       <path
-         inkscape:connector-curvature="0"
          id="path931"
          d="m 1,22 h 9 L 1,13 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.11111116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:3.11111116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.11111116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:3.11111116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 23,22 h -9 l 9,-9 z"
-         id="path936"
-         inkscape:connector-curvature="0" />
+         id="path936" />
       <circle
          r="4"
          cy="12"
          cx="12"
          id="path938"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.11111116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:3.11111116;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-custom.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-custom.svg
index f1d2ec8f7..199b55ad1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-custom.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-custom.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-custom.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,28 +55,24 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g943"
        transform="translate(0,-3)">
       <path
-         inkscape:connector-curvature="0"
          id="path931"
          d="m 1,22 h 9 L 1,13 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 23,22 h -9 l 9,-9 z"
-         id="path936"
-         inkscape:connector-curvature="0" />
+         id="path936" />
       <circle
          r="4"
          cy="12"
          cx="12"
          id="path938"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-flash-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-flash-small.svg
index 634912538..13fb88b4b 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-flash-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-flash-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-flash-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="3.3949506"
-     inkscape:cy="13.214697"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,14 +56,10 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.63636363px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.63636363px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 6.1311799,9 4.181818,15.363636 H 8.636363 L 7.3636362,17.909091 H 4.8181816 L 7.9999998,23 11.818182,17.909091 H 9.272727 l 2.545455,-4.454546 H 7.4039072 L 11.222089,9 Z"
-       id="path3360"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path3360" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-flash.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-flash.svg
index fb4b0ca66..cafc33867 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-flash.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-flash.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-flash.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,14 +55,10 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9.063283,1 6,11 h 7 l -2,4 H 7 l 5,8 6,-8 h -4 l 4,-7 h -6.936717 l 6,-7 z"
-       id="path3360"
-       sodipodi:nodetypes="cccccccccccc" />
+       id="path3360" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent-small.svg
index 67c86ec71..2b1598da1 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-fluorescent-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="3.3949506"
-     inkscape:cy="13.214697"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,76 +56,54 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g74"
        transform="matrix(0.63636364,0,0,0.63636364,0.36363636,8.3636364)">
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 12,22.218966 c 0,-1.397862 0,-4.130048 0,-4.130048"
-         id="path10544"
-         inkscape:connector-curvature="0" />
+         id="path10544" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path10560"
          d="M 17.036906,21.579977 15.560045,18.00325"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 6.9630942,21.579977 8.4399555,18.00325"
-         id="path7762"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7762" />
       <path
-         inkscape:connector-curvature="0"
          id="path7786"
          d="M 12,1.7810339 C 12,3.178896 12,5.911082 12,5.911082"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 17.036906,2.4200231 15.560045,5.99675"
-         id="path7792"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7792" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7798"
          d="M 6.9630945,2.4200231 8.4399558,5.99675"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path10566"
          d="M 21.510247,19.944776 19.240549,17.29159"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 2.4897532,19.944776 4.7594511,17.29159"
-         id="path7764"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7764" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 21.510247,4.055223 19.240549,6.708411"
-         id="path7794"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7794" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7800"
          d="M 2.4897535,4.055223 4.7594514,6.708411"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         sodipodi:nodetypes="ccccccccccccccc"
          id="rect7802"
          d="m 1,8 v 8 H 23 V 8 Z m 1,1 h 2 v 6 H 2 Z m 18,0 h 2 v 6 h -2 z"
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.54013252;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.54013252;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent.svg
index 8746978e1..e2274b902 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-fluorescent.svg
@@ -2,59 +2,16 @@
 <!-- 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="wb-fluorescent.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,72 +55,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path10544"
        d="m 12,22.218966 c 0,-1.397862 0,-4.130048 0,-4.130048"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 17.036906,21.579977 15.560045,18.00325"
-       id="path10560"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path10560" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7762"
        d="M 6.9630942,21.579977 8.4399555,18.00325"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 12,1.7810339 c 0,1.3978625 0,4.1300483 0,4.1300483"
-       id="path7786"
-       inkscape:connector-curvature="0" />
+       id="path7786" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7792"
        d="M 17.036906,2.4200231 15.560045,5.9967498"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 6.9630945,2.4200231 8.4399558,5.9967498"
-       id="path7798"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path7798" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 21.510247,19.944776 19.240549,17.29159"
-       id="path10566"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path10566" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7764"
        d="M 2.4897532,19.944776 4.7594511,17.29159"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7794"
        d="M 21.510247,4.0552233 19.240549,6.7084106"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 2.4897535,4.0552233 4.7594514,6.7084106"
-       id="path7800"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path7800" />
     <path
-       inkscape:connector-curvature="0"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.54013252;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.54013252;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 1,8 v 8 H 23 V 8 Z m 1,1 h 2 v 6 H 2 Z m 18,0 h 2 v 6 h -2 z"
-       id="rect7802"
-       sodipodi:nodetypes="ccccccccccccccc" />
+       id="rect7802" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-lamp-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-lamp-small.svg
index 32c172d7f..c553fafae 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-lamp-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-lamp-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-lamp-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="11.598077"
-     inkscape:cy="8.2047335"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,76 +56,54 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g132"
        transform="matrix(0.63636364,0,0,0.63636364,0.36363636,8.3636364)">
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 12,22.218966 c 0,-1.397862 0,-4.130048 0,-4.130048"
-         id="path10544"
-         inkscape:connector-curvature="0" />
+         id="path10544" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path10560"
          d="M 17.036906,21.579977 15.560045,18.00325"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 6.9630942,21.579977 8.4399555,18.00325"
-         id="path7762"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7762" />
       <path
-         inkscape:connector-curvature="0"
          id="path7786"
          d="M 12,1.7810339 C 12,3.178896 12,5.911082 12,5.911082"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 17.036906,2.4200231 15.560045,5.99675"
-         id="path7792"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7792" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7798"
          d="M 6.9630945,2.4200231 8.4399558,5.99675"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path10566"
          d="M 21.510247,19.944776 19.240549,17.29159"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 2.4897532,19.944776 4.7594511,17.29159"
-         id="path7764"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7764" />
       <path
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="M 21.510247,4.055223 19.240549,6.708411"
-         id="path7794"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         id="path7794" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path7800"
          d="M 2.4897535,4.055223 4.7594514,6.708411"
-         style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccc"
-         inkscape:connector-curvature="0"
          id="rect3191"
          d="M 12,9 C 10.671182,9.000966 9.5013251,9.875974 9.125,11.150391 L 5.6015625,11.5 V 11 H 3 V 10 H 2 v 1.388672 H 1 v 1.222656 H 2 V 14 H 3 V 13 H 5.6015625 V 12.5 L 9.125,12.851562 C 9.502037,14.125205 10.671722,14.99929 12,15 c 1.328278,-7.1e-4 2.497963,-0.874795 2.875,-2.148438 L 18.398438,12.5 V 13 H 21 v 1 h 1 v -1.388672 h 1 V 11.388672 H 22 V 10 h -1 v 1 H 18.398438 L 18.398,11.5 14.875,11.150391 C 14.498675,9.875974 13.328818,9.000966 12,9 Z"
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02588202" />
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02588202" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-lamp.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-lamp.svg
index 39f2ccb94..59fd8777a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-lamp.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-lamp.svg
@@ -2,59 +2,16 @@
 <!-- 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="wb-lamp.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -65,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -98,72 +55,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
        id="path10544"
        d="m 12,22.218966 c 0,-1.397862 0,-4.130048 0,-4.130048"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 17.036906,21.579977 15.560045,18.00325"
-       id="path10560"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path10560" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7762"
        d="M 6.9630942,21.579977 8.4399555,18.00325"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="m 12,1.7810339 c 0,1.3978625 0,4.1300483 0,4.1300483"
-       id="path7786"
-       inkscape:connector-curvature="0" />
+       id="path7786" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7792"
        d="M 17.036906,2.4200231 15.560045,5.9967498"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 6.9630945,2.4200231 8.4399558,5.9967498"
-       id="path7798"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path7798" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 21.510247,19.944776 19.240549,17.29159"
-       id="path10566"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path10566" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7764"
        d="M 2.4897532,19.944776 4.7594511,17.29159"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
        id="path7794"
        d="M 21.510247,4.0552233 19.240549,6.7084106"
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
     <path
-       style="display:inline;opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;opacity:0.7;fill:none;stroke:#cccccc;stroke-width:1.54013252;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
        d="M 2.4897535,4.0552233 4.7594514,6.7084106"
-       id="path7800"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path7800" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.02588202"
+       style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none;stroke-width:0.02588202"
        d="M 12,9 C 10.671182,9.0009657 9.5013251,9.8759741 9.125,11.150391 L 5.6015625,11.5 V 11 H 3 V 10 H 2 v 1.388672 H 1 v 1.222656 H 2 V 14 H 3 V 13 H 5.6015625 V 12.5 L 9.125,12.851562 C 9.502037,14.125205 10.671722,14.99929 12,15 c 1.328278,-7.1e-4 2.497963,-0.874795 2.875,-2.148438 L 18.398438,12.5 V 13 H 21 v 1 h 1 v -1.388672 h 1 V 11.388672 H 22 V 10 h -1 v 1 H 18.398438 L 18.398,11.5 14.875,11.150391 C 14.498675,9.8759741 13.328818,9.0009657 12,9 Z"
-       id="rect3191"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccc" />
+       id="rect3191" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-led-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-led-small.svg
index 7e20c4576..c4aadfc8f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-led-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-led-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-led-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="11.598077"
-     inkscape:cy="8.2047335"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g181"
@@ -108,15 +65,15 @@
          cy="12"
          cx="12"
          id="path821"
-         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <circle
          r="1"
          cy="12"
          cx="12"
          id="path827"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <circle
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
          id="circle829"
          cx="9"
          cy="7"
@@ -126,15 +83,15 @@
          cy="7"
          cx="15"
          id="circle831"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <circle
          r="1"
          cy="17"
          cx="9"
          id="circle833"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <circle
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
          id="circle835"
          cx="15"
          cy="17"
@@ -144,9 +101,9 @@
          cy="12"
          cx="6"
          id="circle837"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <circle
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
          id="circle839"
          cx="18"
          cy="12"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-led.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-led.svg
index 952f5f77f..8d4343690 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-led.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-led.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-led.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,17 +55,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <circle
-       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path821"
        cx="12"
        cy="12"
        r="10" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path827"
        cx="12"
        cy="12"
@@ -116,15 +73,15 @@
        cy="7"
        cx="9"
        id="circle829"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle831"
        cx="15"
        cy="7"
        r="1" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle833"
        cx="9"
        cy="17"
@@ -134,9 +91,9 @@
        cy="17"
        cx="15"
        id="circle835"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="circle837"
        cx="6"
        cy="12"
@@ -146,6 +103,6 @@
        cy="12"
        cx="18"
        id="circle839"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-shade-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-shade-small.svg
index 78ed1e6c6..e5c3514fb 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-shade-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-shade-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-shade-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="11.598077"
-     inkscape:cy="8.2047335"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,36 +56,26 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g218"
        transform="matrix(0.63607161,0,0,0.63607161,0.36392839,8.3639284)">
       <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
          id="path916"
          d="m 1,1 h 4 l 8,6 H 9 V 21 H 1 V 14 H 6 V 7 H 1 Z"
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path926"
          d="m 12,14 8,8"
-         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" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path928"
          d="M 12,9 22,19"
-         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" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path930"
          d="m 12,19 3,3"
-         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" />
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-shade.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-shade.svg
index 3ac24bd80..d9d775895 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-shade.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-shade.svg
@@ -2,64 +2,23 @@
 <!-- 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="wb-shade.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815">
     <mask
        maskUnits="userSpaceOnUse"
        id="mask11344">
       <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         style="fill:#ffffff;fill-opacity:1.0;stroke:none"
          id="rect11346"
          width="1000"
          height="1000"
@@ -70,7 +29,7 @@
        maskUnits="userSpaceOnUse"
        id="mask11331">
       <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         style="fill:#ffffff;fill-opacity:1.0;stroke:none"
          id="rect11333"
          width="775.88971"
          height="577.44464"
@@ -81,7 +40,7 @@
        maskUnits="userSpaceOnUse"
        id="mask11344-3">
       <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         style="fill:#ffffff;fill-opacity:1.0;stroke:none"
          id="rect11346-6"
          width="1000"
          height="1000"
@@ -92,7 +51,7 @@
        maskUnits="userSpaceOnUse"
        id="mask11331-7">
       <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         style="fill:#ffffff;fill-opacity:1.0;stroke:none"
          id="rect11333-5"
          width="775.88971"
          height="577.44464"
@@ -108,7 +67,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -141,32 +100,22 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 1,1 h 4 l 8,6 H 9 V 21 H 1 V 14 H 6 V 7 H 1 Z"
-       id="path916"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc" />
+       id="path916" />
     <path
-       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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="m 12,14 8,8"
-       id="path926"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path926" />
     <path
-       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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="M 12,9 22,19"
-       id="path928"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path928" />
     <path
-       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"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="m 12,19 3,3"
-       id="path930"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path930" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-sun-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-sun-small.svg
index 94abad681..3758cc387 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-sun-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-sun-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-sun-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="11.598077"
-     inkscape:cy="8.2047335"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g343"
@@ -107,72 +64,60 @@
          id="g945"
          transform="matrix(0.03575568,0,0,0.03575568,10.926502,10.759286)">
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="m 30.023192,-162.18636 c 0,-28.37834 0,-83.84507 0,-83.84507"
-           id="path10542"
-           inkscape:connector-curvature="0" />
+           id="path10542" />
         <path
-           inkscape:connector-curvature="0"
            id="path10544"
            d="m 30.023192,315.43105 c 0,-28.37833 0,-83.84507 0,-83.84507"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           inkscape:connector-curvature="0"
            id="path10558"
            d="m -68.419893,-135.80861 c -14.18917,-24.57637 -41.922537,-72.61196 -41.922537,-72.61196"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="M 170.38881,277.82019 C 156.19965,253.24384 128.46628,205.20823 128.46628,205.20823"
-           id="path10560"
-           inkscape:connector-curvature="0" />
+           id="path10560" />
         <path
-           inkscape:connector-curvature="0"
            id="path10564"
            d="m -140.48523,-63.743275 c -24.57637,-14.18917 -72.61196,-41.922535 -72.61196,-41.922535"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="M 273.14358,175.06543 C 248.56722,160.87627 200.53162,133.1429 200.53162,133.1429"
-           id="path10566"
-           inkscape:connector-curvature="0" />
+           id="path10566" />
         <path
-           inkscape:connector-curvature="0"
            id="path10570"
            d="m -166.86298,34.69981 c -28.37834,0 -83.84507,0 -83.84507,0"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="m 310.75443,34.69981 c -28.37833,0 -83.84507,0 -83.84507,0"
-           id="path10572"
-           inkscape:connector-curvature="0" />
+           id="path10572" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="m 128.46628,-135.80861 c 14.18917,-24.57637 41.92253,-72.61196 41.92253,-72.61196"
-           id="path10576"
-           inkscape:connector-curvature="0" />
+           id="path10576" />
         <path
-           inkscape:connector-curvature="0"
            id="path10578"
            d="m -110.34243,277.82019 c 14.189167,-24.57635 41.922537,-72.61196 41.922537,-72.61196"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="m 200.53162,-63.743275 c 24.57636,-14.18917 72.61196,-41.922535 72.61196,-41.922535"
-           id="path10582"
-           inkscape:connector-curvature="0" />
+           id="path10582" />
         <path
-           inkscape:connector-curvature="0"
            id="path10584"
            d="m -213.09719,175.06543 c 24.57635,-14.18916 72.61196,-41.92253 72.61196,-41.92253"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       </g>
       <circle
          r="4"
          cy="11.999999"
          cx="12"
          id="path1023"
-         style="opacity:0.7;fill:#2a7fff;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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-sun.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-sun.svg
index b9c71a3dc..0ea859e7c 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-sun.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-sun.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-sun.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,75 +55,61 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        transform="matrix(0.03575568,0,0,0.03575568,10.926502,10.759286)"
        id="g945">
       <path
-         inkscape:connector-curvature="0"
          id="path10542"
          d="m 30.023192,-162.18636 c 0,-28.37834 0,-83.84507 0,-83.84507"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 30.023192,315.43105 c 0,-28.37833 0,-83.84507 0,-83.84507"
-         id="path10544"
-         inkscape:connector-curvature="0" />
+         id="path10544" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -68.419893,-135.80861 c -14.18917,-24.57637 -41.922537,-72.61196 -41.922537,-72.61196"
-         id="path10558"
-         inkscape:connector-curvature="0" />
+         id="path10558" />
       <path
-         inkscape:connector-curvature="0"
          id="path10560"
          d="M 170.38881,277.82019 C 156.19965,253.24384 128.46628,205.20823 128.46628,205.20823"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -140.48523,-63.743275 c -24.57637,-14.18917 -72.61196,-41.922535 -72.61196,-41.922535"
-         id="path10564"
-         inkscape:connector-curvature="0" />
+         id="path10564" />
       <path
-         inkscape:connector-curvature="0"
          id="path10566"
          d="M 273.14358,175.06543 C 248.56722,160.87627 200.53162,133.1429 200.53162,133.1429"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -166.86298,34.69981 c -28.37834,0 -83.84507,0 -83.84507,0"
-         id="path10570"
-         inkscape:connector-curvature="0" />
+         id="path10570" />
       <path
-         inkscape:connector-curvature="0"
          id="path10572"
          d="m 310.75443,34.69981 c -28.37833,0 -83.84507,0 -83.84507,0"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         inkscape:connector-curvature="0"
          id="path10576"
          d="m 128.46628,-135.80861 c 14.18917,-24.57637 41.92253,-72.61196 41.92253,-72.61196"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -110.34243,277.82019 c 14.189167,-24.57635 41.922537,-72.61196 41.922537,-72.61196"
-         id="path10578"
-         inkscape:connector-curvature="0" />
+         id="path10578" />
       <path
-         inkscape:connector-curvature="0"
          id="path10582"
          d="m 200.53162,-63.743275 c 24.57636,-14.18917 72.61196,-41.922535 72.61196,-41.922535"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -213.09719,175.06543 c 24.57635,-14.18916 72.61196,-41.92253 72.61196,-41.92253"
-         id="path10584"
-         inkscape:connector-curvature="0" />
+         id="path10584" />
     </g>
     <circle
-       style="opacity:0.7;fill:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        id="path1023"
        cx="12"
        cy="12"
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten-small.svg
index dc4b62beb..395f02079 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-tungsten-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="11.598077"
-     inkscape:cy="8.2047335"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g276"
@@ -107,57 +64,46 @@
          id="g945"
          transform="matrix(0.03575568,0,0,0.03575568,10.926502,10.759286)">
         <path
-           inkscape:connector-curvature="0"
            id="path10544"
            d="m 30.023192,315.43105 c 0,-28.37833 0,-83.84507 0,-83.84507"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="M 170.38881,277.82019 C 156.19965,253.24384 128.46628,205.20823 128.46628,205.20823"
-           id="path10560"
-           inkscape:connector-curvature="0" />
+           id="path10560" />
         <path
-           inkscape:connector-curvature="0"
            id="path10564"
            d="m -140.48523,-63.743275 c -24.57637,-14.18917 -72.61196,-41.922535 -72.61196,-41.922535"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="M 273.14358,175.06543 C 248.56722,160.87627 200.53162,133.1429 200.53162,133.1429"
-           id="path10566"
-           inkscape:connector-curvature="0" />
+           id="path10566" />
         <path
-           inkscape:connector-curvature="0"
            id="path10570"
            d="m -166.86298,34.69981 c -28.37834,0 -83.84507,0 -83.84507,0"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.93516922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="m 310.75443,34.69981 c -28.37833,0 -83.84507,0 -83.84507,0"
-           id="path10572"
-           inkscape:connector-curvature="0" />
+           id="path10572" />
         <path
-           inkscape:connector-curvature="0"
            id="path10578"
            d="m -110.34243,277.82019 c 14.189167,-24.57635 41.922537,-72.61196 41.922537,-72.61196"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
            d="m 200.53162,-63.743275 c 24.57636,-14.18917 72.61196,-41.922535 72.61196,-41.922535"
-           id="path10582"
-           inkscape:connector-curvature="0" />
+           id="path10582" />
         <path
-           inkscape:connector-curvature="0"
            id="path10584"
            d="m -213.09719,175.06543 c 24.57635,-14.18916 72.61196,-41.92253 72.61196,-41.92253"
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       </g>
       <path
-         sodipodi:nodetypes="ccccccccscccc"
-         inkscape:connector-curvature="0"
          id="path1023"
          d="m 10,3 v 1 h 4 V 3 Z m 0,4 V 8.541016 C 8.7639776,9.254632 8.0018265,10.572766 8,12 c 0,2.209139 1.790861,4 4,4 2.209139,0 4,-1.790861 4,-4 C 15.9982,10.572766 15.236022,9.254632 14,8.541016 V 7 Z"
-         style="opacity:0.7;fill:#2a7fff;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" />
+         style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten.svg
index 0dabc0935..28030eea7 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-tungsten.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-tungsten.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,63 +55,50 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        transform="matrix(0.03575568,0,0,0.03575568,10.926502,10.759286)"
        id="g945">
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m 30.023192,315.43105 c 0,-28.37833 0,-83.84507 0,-83.84507"
-         id="path10544"
-         inkscape:connector-curvature="0" />
+         id="path10544" />
       <path
-         inkscape:connector-curvature="0"
          id="path10560"
          d="M 170.38881,277.82019 C 156.19965,253.24384 128.46628,205.20823 128.46628,205.20823"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -140.48523,-63.743275 c -24.57637,-14.18917 -72.61196,-41.922535 -72.61196,-41.922535"
-         id="path10564"
-         inkscape:connector-curvature="0" />
+         id="path10564" />
       <path
-         inkscape:connector-curvature="0"
          id="path10566"
          d="M 273.14358,175.06543 C 248.56722,160.87627 200.53162,133.1429 200.53162,133.1429"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -166.86298,34.69981 c -28.37834,0 -83.84507,0 -83.84507,0"
-         id="path10570"
-         inkscape:connector-curvature="0" />
+         id="path10570" />
       <path
-         inkscape:connector-curvature="0"
          id="path10572"
          d="m 310.75443,34.69981 c -28.37833,0 -83.84507,0 -83.84507,0"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:55.9351689;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -110.34243,277.82019 c 14.189167,-24.57635 41.922537,-72.61196 41.922537,-72.61196"
-         id="path10578"
-         inkscape:connector-curvature="0" />
+         id="path10578" />
       <path
-         inkscape:connector-curvature="0"
          id="path10582"
          d="m 200.53162,-63.743275 c 24.57636,-14.18917 72.61196,-41.922535 72.61196,-41.922535"
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0" />
       <path
-         style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;stroke:#cccccc;stroke-width:41.95137668;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
          d="m -213.09719,175.06543 c 24.57635,-14.18916 72.61196,-41.92253 72.61196,-41.92253"
-         id="path10584"
-         inkscape:connector-curvature="0" />
+         id="path10584" />
     </g>
     <path
-       style="opacity:0.7;fill:#2a7fff;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"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1.0;paint-order:normal"
        d="m 10,3 v 1 h 4 V 3 Z m 0,4 V 8.5410156 C 8.7639776,9.2546319 8.0018265,10.572766 8,12 c 0,2.209139 1.790861,4 4,4 2.209139,0 4,-1.790861 4,-4 -0.0018,-1.427234 -0.763978,-2.7453681 -2,-3.4589844 V 7 Z"
-       id="path1023"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccscccc" />
+       id="path1023" />
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-water-small.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-water-small.svg
index 2cb62298a..a4d45eeab 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-water-small.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-water-small.svg
@@ -2,57 +2,16 @@
 <!-- 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="16"
    height="16"
    viewBox="0 0 16 16"
    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="wb-water-small.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.163805"
-     inkscape:cx="11.598077"
-     inkscape:cy="8.2047335"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="7"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -97,8 +56,6 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <g
        id="g374"
@@ -107,11 +64,9 @@
          transform="matrix(0.022,0,0,0.022,11.802,13.76)"
          id="g828">
         <path
-           sodipodi:nodetypes="cacccccccccccccccccccc"
-           inkscape:connector-curvature="0"
            id="path5961"
            d="m -228.84059,-340.40844 c -45.70045,-41.85642 -115.36787,-52.34359 -172.90544,-38.93823 -37.24291,8.67702 -86.90968,33.43278 -89.25397,72.07394 V 420 H 509 v -727.27273 c -38.36253,20.26983 -87.69493,28.18525 -109.75649,-10.88902 -30.40673,-48.15938 -90.34247,-73.05976 -145.71555,-58.59697 -86.57799,23.94708 -161.715859,76.70817 -246.633022,105.61153 -47.216669,14.92128 -99.322041,41.56555 -149.120768,23.35408 -36.62409,-22.34376 -51.42502,-67.77862 -86.61476,-92.61533 z m -133.69066,235.37719 C -218.27273,-80 -240.2885,-2.1271869 -163.98581,19.947758 -107.14114,32.48171 -73.206336,-25.382144 -26.826583,-45.918179 64.271334,-90.419775 173.31273,-86.649194 268.16107,-55.884604 332.16168,-33.887094 388.05703,10.0792 424.78125,66.89936 362.18129,157.36748 255.22399,211.33184 145.95649,214.40551 104.16432,220.09232 67.090733,194.31122 27.690365,184.57376 -37.529519,164.53697 -100.50546,134.13125 -168.26512,124.01648 c -61.03239,59.63332 -133.74765,95.15403 -190.79945,111.07682 19.30049,-54.53325 44.33067,-110.12793 45.98134,-168.474212 -7.51111,-59.6368813 -32.86106,-114.464659 -49.44802,-171.650338 z"
-           style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none" />
       </g>
     </g>
   </g>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/wb-water.svg b/rtdata/icons/rawtherapee/scalable/apps/wb-water.svg
index 55a98f099..c716f542f 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/wb-water.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/wb-water.svg
@@ -2,57 +2,16 @@
 <!-- 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="wb-water.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -63,7 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -96,18 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <g
        id="g828"
        transform="matrix(0.022,0,0,0.022,11.802,13.76)">
       <path
-         style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none"
+         style="display:inline;opacity:0.7;fill:#cccccc;fill-opacity:1.0;stroke:none"
          d="m -228.84059,-340.40844 c -45.70045,-41.85642 -115.36787,-52.34359 -172.90544,-38.93823 -37.24291,8.67702 -86.90968,33.43278 -89.25397,72.07394 V 420 H 509 v -727.27273 c -38.36253,20.26983 -87.69493,28.18525 -109.75649,-10.88902 -30.40673,-48.15938 -90.34247,-73.05976 -145.71555,-58.59697 -86.57799,23.94708 -161.715859,76.70817 -246.633022,105.61153 -47.216669,14.92128 -99.322041,41.56555 -149.120768,23.35408 -36.62409,-22.34376 -51.42502,-67.77862 -86.61476,-92.61533 z m -133.69066,235.37719 C -218.27273,-80 -240.2885,-2.1271869 -163.98581,19.947758 -107.14114,32.48171 -73.206336,-25.382144 -26.826583,-45.918179 64.271334,-90.419775 173.31273,-86.649194 268.16107,-55.884604 332.16168,-33.887094 388.05703,10.0792 424.78125,66.89936 362.18129,157.36748 255.22399,211.33184 145.95649,214.40551 104.16432,220.09232 67.090733,194.31122 27.690365,184.57376 -37.529519,164.53697 -100.50546,134.13125 -168.26512,124.01648 c -61.03239,59.63332 -133.74765,95.15403 -190.79945,111.07682 19.30049,-54.53325 44.33067,-110.12793 45.98134,-168.474212 -7.51111,-59.6368813 -32.86106,-114.464659 -49.44802,-171.650338 z"
-         id="path5961"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cacccccccccccccccccccc" />
+         id="path5961" />
     </g>
   </g>
 </svg>
diff --git a/rtdata/icons/rawtherapee/scalable/apps/window-add.svg b/rtdata/icons/rawtherapee/scalable/apps/window-add.svg
index da0651444..11982690a 100644
--- a/rtdata/icons/rawtherapee/scalable/apps/window-add.svg
+++ b/rtdata/icons/rawtherapee/scalable/apps/window-add.svg
@@ -2,58 +2,16 @@
 <!-- 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="window-add.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,20 +55,14 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
+     id="layer1">
     <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:0.7;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:2;stroke-linecap:round;stroke-linejoin:round;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"
+       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.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;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 1,1 v 5 3 c -0.0191252,1.352323 2.0191252,1.352323 2,0 V 6 h 18 v 14 h -5 c -1.352323,-0.01912 -1.352323,2.019125 0,2 h 6 c 0.552262,-5.5e-5 0.999945,-0.447738 1,-1 V 6 1 Z M 3.5,2 C 4.3284271,2 5,2.6715729 5,3.5 5,4.3284271 4.3284271,5 3.5,5 2.6715729,5 2,4.3284271 2,3.5 2,2.6715729 2.6715729,2 3.5,2 Z m 4,0 C 8.3284271,2 9,2.6715729 9,3.5 9,4.3284271 8.3284271,5 7.5,5 6.6715729,5 6,4.3284271 6,3.5 6,2.6715729 6.6715729,2 7.5,2 Z m 4,0 C 12.328427,2 13,2.6715729 13,3.5 13,4.3284271 12.328427,5 11.5,5 10.671573,5 10,4.3284271 10,3.5 10,2.6715729 10.671573,2 11.5,2 Z m 9,0 C 21.328427,2 22,2.6715729 22,3.5 22,4.3284271 21.328427,5 20.5,5 19.671573,5 19,4.3284271 19,3.5 19,2.6715729 19.671573,2 20.5,2 Z"
-       id="path850"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccssssssssssssssssssss" />
+       id="path850" />
     <path
        id="path4979-3"
-       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 3,17 h 8 M 7,13 v 8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1.0"
+       d="m 3,17 h 8 M 7,13 v 8" />
   </g>
 </svg>
diff --git a/rtdata/images/ornament1.svg b/rtdata/images/ornament1.svg
index af3d729e5..592caac39 100644
--- a/rtdata/images/ornament1.svg
+++ b/rtdata/images/ornament1.svg
@@ -2,57 +2,16 @@
 <!-- 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="128"
    height="48"
    viewBox="0 0 128 48"
    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="ornament1.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.664062"
-     inkscape:cx="64"
-     inkscape:cy="24"
-     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:grid
-       type="xygrid"
-       id="grid1374"
-       originx="1"
-       originy="1"
-       empspacing="11"
-       dotted="false" />
-  </sodipodi:namedview>
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs815" />
   <metadata
@@ -97,33 +56,26 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      transform="translate(0,24)">
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0"
        d="m 25.835228,-22.591734 c -0.06989,0.0027 -0.137644,0.0058 -0.2068,0.01299 -0.276642,0.02888 -0.54982,0.09115 -0.799645,0.194908 -0.249827,0.103757 -0.482435,0.245945 -0.682458,0.422297 -0.12583,0.109462 -0.226927,0.215575 -0.310208,0.324847 -0.08327,0.109269 -0.14704,0.220433 -0.193029,0.344336 -0.09193,0.247803 -0.115421,0.540281 -0.08961,0.935554 0.02257,0.340542 0.04378,0.607708 0.07584,0.825107 0.03206,0.2174 0.07459,0.387632 0.14476,0.545741 0.07017,0.158108 0.166407,0.29861 0.303314,0.46128 0.136907,0.16267 0.319197,0.347143 0.55148,0.578225 0.477473,0.486488 0.943696,0.997509 1.034027,1.143456 0.07742,0.139865 0.117678,0.272824 0.130966,0.402808 0.01336,0.129984 -0.0021,0.255614 -0.05515,0.383317 -0.05324,0.127704 -0.139762,0.256791 -0.261954,0.389815 -0.122191,0.133024 -0.282081,0.269855 -0.475651,0.415802 -0.180662,0.133784 -0.564895,0.260305 -0.937517,0.337839 -0.186304,0.03877 -0.370061,0.0633 -0.523908,0.07147 -0.153856,0.0082 -0.276928,9.55e-4 -0.344674,-0.03248 -0.109687,-0.05777 -0.210968,-0.153185 -0.303316,-0.279367 -0.09235,-0.126184 -0.175573,-0.28272 -0.248167,-0.474274 -0.145175,-0.38311 -0.251697,-0.893923 -0.303314,-1.520277 -0.04516,-0.462164 -0.08875,-0.789075 -0.151646,-1.046002 -0.06292,-0.256927 -0.13891,-0.440854 -0.255059,-0.617206 -0.08065,-0.124663 -0.209701,-0.264653 -0.365356,-0.402808 -0.155664,-0.138155 -0.344125,-0.275866 -0.537695,-0.402809 -0.19357,-0.126943 -0.391571,-0.246813 -0.585948,-0.337839 -0.194378,-0.09103 -0.379614,-0.151508 -0.537694,-0.181913 -0.219378,-0.04561 -0.464238,-0.04618 -0.710033,0 -0.245792,0.04618 -0.492782,0.139014 -0.730711,0.259876 -0.23793,0.120862 -0.465989,0.269844 -0.661777,0.448287 -0.195788,0.178442 -0.363177,0.385292 -0.482546,0.604212 -0.07098,0.130744 -0.121613,0.314171 -0.151659,0.52625 -0.03004,0.212078 -0.03645,0.451924 -0.02757,0.695169 0.0089,0.243244 0.03695,0.490419 0.08272,0.71466 0.04577,0.22424 0.10547,0.423156 0.186124,0.578224 0.122595,0.225001 0.275316,0.424749 0.454972,0.591219 0.179658,0.16647 0.386153,0.299845 0.627309,0.409305 0.241158,0.109459 0.513237,0.192914 0.820328,0.246883 0.307092,0.05397 0.649673,0.07796 1.027134,0.07796 0.529091,0 1.147301,0.07162 1.39249,0.168919 0.125807,0.05169 0.251029,0.132566 0.365357,0.227393 0.114315,0.09483 0.220686,0.203983 0.310206,0.324846 0.08951,0.120861 0.162285,0.253524 0.213709,0.383317 0.05142,0.129794 0.08272,0.261696 0.08272,0.383318 0,0.133784 -0.02729,0.222155 -0.12408,0.311852 -0.09679,0.0897 -0.267578,0.177652 -0.551481,0.305354 -0.374234,0.170271 -0.923345,0.340334 -1.220152,0.376821 -0.1355,0.01825 -0.243616,0.02941 -0.337781,0.02599 -0.09417,-0.0034 -0.179764,-0.01785 -0.27574,-0.06497 -0.19197,-0.09425 -0.431159,-0.300303 -0.889274,-0.701656 -0.258093,-0.231082 -0.555053,-0.470026 -0.834116,-0.669182 -0.279063,-0.199156 -0.534936,-0.356238 -0.696244,-0.435292 -0.264545,-0.121623 -0.430362,-0.188138 -0.599735,-0.207902 -0.169373,-0.01977 -0.343409,0.0037 -0.627311,0.05847 -0.187117,0.03953 -0.381173,0.104794 -0.565267,0.188411 -0.184091,0.08362 -0.361792,0.183316 -0.523907,0.298858 -0.162114,0.115541 -0.306214,0.248014 -0.427398,0.383318 -0.121183,0.135305 -0.214443,0.279392 -0.27574,0.422298 -0.103236,0.231083 -0.162897,0.504376 -0.179232,0.79912 -0.01633,0.294744 0.0084,0.609728 0.06894,0.916064 0.06049,0.306336 0.155402,0.604727 0.282633,0.870586 0.127233,0.265858 0.284868,0.49587 0.46876,0.6691809 0.112915,0.1033785 0.249806,0.1961321 0.399823,0.2793673 0.150017,0.083236 0.312001,0.1616028 0.48944,0.2208941 0.354878,0.1185802 0.758506,0.1819125 1.165002,0.1819125 0.125821,0 0.273186,-0.02726 0.434292,-0.08446 0.161108,-0.0572 0.333928,-0.1461991 0.517013,-0.2533795 0.366169,-0.2143577 0.763194,-0.5191273 1.137428,-0.8900743 0.161309,-0.16115 0.321806,-0.298706 0.475653,-0.409305 0.153849,-0.110601 0.304149,-0.191048 0.454972,-0.25338 0.150823,-0.06233 0.302736,-0.107098 0.454971,-0.123441 0.152235,-0.01635 0.303785,-0.0079 0.461865,0.01949 0.335521,0.05777 0.611235,0.141605 0.820328,0.246883 0.209103,0.105278 0.349163,0.232394 0.427399,0.376821 0.07823,0.144426 0.09154,0.305559 0.03447,0.480771 -0.05707,0.1752111 -0.182343,0.3675946 -0.379144,0.5652306 -0.148398,0.1489862 -0.275011,0.2644026 -0.399823,0.3573297 -0.124817,0.092928 -0.251345,0.1584917 -0.386037,0.2079011 -0.269384,0.098819 -0.586334,0.1234414 -1.096068,0.1234414 -0.403268,0 -0.781468,0.036489 -1.123642,0.1039517 -0.342181,0.067458 -0.651934,0.1688697 -0.923738,0.2988524 -0.271804,0.1299827 -0.504086,0.2867101 -0.696245,0.4742743 -0.192158,0.1875639 -0.34484,0.4029901 -0.448077,0.6431938 -0.0613,0.1459473 -0.09352,0.345967 -0.103402,0.5717278 -0.0099,0.2257603 0.0067,0.4817847 0.04136,0.7341508 0.03468,0.2523658 0.08616,0.5018925 0.158549,0.7276535 0.07239,0.2257627 0.165611,0.4257812 0.268847,0.5717278 0.132274,0.1869956 0.27713,0.3528061 0.441186,0.4937649 0.164054,0.140959 0.343986,0.2560052 0.5308,0.3508332 0.186815,0.094828 0.385398,0.1657958 0.58595,0.2143976 0.200552,0.048602 0.401363,0.075682 0.606628,0.077963 0.205266,0.00229 0.412568,-0.020841 0.613523,-0.06497 0.200955,-0.044134 0.398326,-0.1107574 0.585948,-0.2014045 0.187621,-0.090647 0.365534,-0.2070834 0.530801,-0.3443362 0.165262,-0.1372521 0.321084,-0.2968182 0.454972,-0.4807711 0.116135,-0.1581077 0.193766,-0.3250284 0.25506,-0.5652308 0.0613,-0.2402042 0.106048,-0.5505219 0.144759,-1.0005238 0.06453,-0.7236516 0.132025,-1.1961846 0.248165,-1.5397672 0.05808,-0.1717913 0.128202,-0.3140506 0.213708,-0.4352927 0.08548,-0.1212426 0.187617,-0.2245064 0.310209,-0.3248454 0.122583,-0.097298 0.269959,-0.1693956 0.434291,-0.2208941 0.164335,-0.051498 0.347716,-0.07914 0.530801,-0.08446 0.18308,-0.00531 0.365736,0.010744 0.544586,0.051975 0.178843,0.041238 0.351596,0.1067313 0.503228,0.194908 0.100015,0.054729 0.192867,0.1329443 0.275739,0.2273906 0.08288,0.094446 0.153212,0.2024641 0.213709,0.3248457 0.120971,0.2447637 0.193028,0.5327981 0.193028,0.81861 0,0.060812 -0.10637,0.2170625 -0.275741,0.4222992 -0.169378,0.2052386 -0.403241,0.4588374 -0.654883,0.7081629 -0.296806,0.2858119 -0.528965,0.5251124 -0.710033,0.7341505 -0.181076,0.2090379 -0.307878,0.39275 -0.399823,0.5782249 -0.09195,0.1854749 -0.149781,0.3696021 -0.179235,0.5847216 -0.02943,0.215118 -0.03404,0.455667 -0.02756,0.7536413 0.0129,0.407434 0.06542,0.757529 0.16544,1.0460022 0.100014,0.2884728 0.248056,0.5207525 0.448078,0.7016659 0.200029,0.1809128 0.45224,0.3050594 0.76518,0.3898143 0.312936,0.084756 0.691775,0.1299379 1.130534,0.1299379 0.425853,0 0.794332,-0.03865 1.116749,-0.1169448 0.322417,-0.078292 0.598531,-0.1992208 0.82033,-0.3573298 0.221791,-0.1581077 0.393004,-0.3582718 0.517013,-0.5977156 0.124011,-0.2394439 0.19844,-0.5158024 0.22748,-0.8381011 0.01934,-0.2128395 0.01474,-0.41691 -0.01382,-0.6172062 -0.02842,-0.2002952 -0.0803,-0.3981429 -0.158554,-0.5912184 -0.07823,-0.1930757 -0.180155,-0.3870497 -0.310209,-0.5782248 -0.130046,-0.1911732 -0.291753,-0.3771304 -0.475646,-0.5717256 -0.425853,-0.4500019 -0.662533,-0.7351641 -0.799645,-0.98753 -0.06856,-0.1261835 -0.111852,-0.2399598 -0.137874,-0.3703237 -0.026,-0.1303642 -0.03814,-0.2780157 -0.04136,-0.4482868 -0.0064,-0.1945964 0.01151,-0.3656343 0.04827,-0.5197527 0.03668,-0.1541165 0.09007,-0.2914835 0.172349,-0.4093048 0.08226,-0.1178224 0.193742,-0.2131512 0.323991,-0.2988579 0.130252,-0.085706 0.281202,-0.1566269 0.461869,-0.2143976 0.248413,-0.079055 0.4921,-0.1159576 0.716923,-0.1104483 0.224831,0.00551 0.434106,0.05358 0.620415,0.1364344 0.186304,0.082854 0.349669,0.1978547 0.482548,0.350833 0.132877,0.1529773 0.231897,0.3428546 0.296419,0.558734 0.06453,0.2432455 0.130966,0.7680905 0.130966,1.1694435 0,0.4500019 0.03903,0.8027706 0.130966,1.1174681 0.09195,0.3146975 0.23515,0.5912705 0.448078,0.8770822 0.193558,0.2675688 0.405738,0.4671144 0.66867,0.6237032 0.262933,0.1565895 0.578395,0.2652818 0.971987,0.3443362 0.193581,0.042569 0.379927,0.06687 0.558373,0.06497 0.178452,-0.00187 0.348444,-0.030835 0.517014,-0.077963 0.168571,-0.047128 0.332404,-0.1147834 0.496333,-0.207901 0.16392,-0.093118 0.324904,-0.2109674 0.489439,-0.350833 0.191969,-0.1626698 0.36043,-0.3351698 0.496333,-0.5132557 0.135894,-0.1780859 0.24334,-0.3578914 0.323994,-0.5457402 0.08065,-0.1878481 0.132347,-0.3797694 0.158554,-0.5717279 0.02621,-0.1919589 0.02743,-0.3878102 0,-0.5782248 -0.02743,-0.1904158 -0.08518,-0.3755168 -0.16544,-0.558734 -0.08026,-0.1832163 -0.18483,-0.3623804 -0.317101,-0.5327465 C 34.705876,-7.6892691 34.54599,-7.8543103 34.3625,-8.0061716 34.179006,-8.1580321 33.969088,-8.2942707 33.735192,-8.421974 33.373861,-8.6226506 33.07893,-8.7421284 32.756313,-8.7922977 c -0.322615,-0.05017 -0.672862,-0.033991 -1.137429,0.038982 -0.238736,0.036486 -0.436854,0.054445 -0.60663,0.051975 -0.169769,-0.00247 -0.306416,-0.022062 -0.427396,-0.071467 -0.120994,-0.049409 -0.224763,-0.1295589 -0.317104,-0.2338896 -0.09235,-0.1043282 -0.178083,-0.2355774 -0.261952,-0.4028084 -0.116135,-0.2280413 -0.170967,-0.4436574 -0.179234,-0.6431933 -0.0083,-0.199539 0.03134,-0.386111 0.12408,-0.545741 0.09276,-0.159629 0.233587,-0.294489 0.420503,-0.402808 0.186926,-0.108319 0.422024,-0.188279 0.696246,-0.233889 0.170989,-0.02737 0.322775,-0.03298 0.468758,-0.0195 0.14598,0.01349 0.285888,0.04432 0.434291,0.110448 0.296809,0.132263 0.625049,0.385604 1.096069,0.799119 0.580709,0.5047324 0.930238,0.78892 1.227044,0.9485491 0.148398,0.079815 0.282219,0.1276095 0.427398,0.1559265 0.145175,0.028314 0.302322,0.038982 0.489439,0.038982 0.232283,-0.00304 0.456148,-0.032163 0.668672,-0.077963 0.212511,-0.045797 0.414229,-0.1090123 0.599736,-0.194908 0.185498,-0.085896 0.351999,-0.1885187 0.503226,-0.3118514 0.151231,-0.1233316 0.28324,-0.2706872 0.392929,-0.4287962 0.161317,-0.237163 0.253309,-0.388333 0.303316,-0.604212 0.05,-0.215879 0.06204,-0.494129 0.06204,-0.974536 0,-0.504732 -0.0088,-0.77538 -0.06204,-0.974537 -0.05324,-0.199156 -0.150655,-0.32682 -0.337784,-0.54574 -0.12583,-0.148986 -0.29442,-0.30272 -0.482546,-0.448286 -0.188123,-0.145566 -0.396123,-0.282707 -0.606628,-0.402809 -0.210507,-0.120101 -0.427451,-0.219767 -0.620415,-0.292361 -0.19296,-0.07259 -0.360834,-0.1204 -0.496334,-0.123441 -0.161317,0 -0.303268,0.01603 -0.441186,0.04548 -0.13792,0.02946 -0.275329,0.07418 -0.420503,0.14943 -0.290356,0.150507 -0.627255,0.412839 -1.130537,0.844598 -0.445211,0.377029 -0.733261,0.595117 -1.047811,0.747144 -0.314555,0.152028 -0.651468,0.234877 -1.206366,0.344336 -0.112911,0.02129 -0.224555,0.02656 -0.323994,0.01299 -0.09944,-0.01356 -0.185683,-0.0481 -0.268847,-0.09096 -0.166361,-0.08571 -0.301352,-0.220303 -0.386039,-0.389814 -0.08468,-0.169511 -0.122559,-0.369377 -0.103399,-0.578225 0.01911,-0.208848 0.0961,-0.426483 0.241274,-0.6302 0.109686,-0.158108 0.21129,-0.283929 0.323994,-0.383317 0.112703,-0.09939 0.239323,-0.17688 0.399823,-0.23389 0.160489,-0.05701 0.353575,-0.09247 0.606629,-0.123441 0.253053,-0.03097 0.560936,-0.05668 0.951304,-0.07796 0.683948,-0.03041 1.058568,-0.05116 1.316663,-0.110448 0.258092,-0.05929 0.401917,-0.154575 0.634201,-0.324845 0.154846,-0.115541 0.297948,-0.256708 0.427398,-0.409305 0.129446,-0.152598 0.24261,-0.314717 0.337782,-0.487269 0.09518,-0.172551 0.175457,-0.350847 0.227479,-0.526249 0.05202,-0.175402 0.07583,-0.352106 0.07583,-0.513256 0,-0.16267 -0.02439,-0.328031 -0.06893,-0.493765 -0.04456,-0.165734 -0.10386,-0.33176 -0.18612,-0.493765 -0.164542,-0.324009 -0.401343,-0.634741 -0.675565,-0.90307 -0.274224,-0.268329 -0.587767,-0.491392 -0.916837,-0.649691 -0.164542,-0.07915 -0.335267,-0.140462 -0.503228,-0.181913 -0.167973,-0.04145 -0.331799,-0.06151 -0.496334,-0.05847 -0.183886,0.003 -0.371219,0.02202 -0.551478,0.06497 -0.18027,0.04295 -0.354535,0.107836 -0.523908,0.18841 -0.169378,0.08058 -0.33132,0.17644 -0.482546,0.292361 -0.151231,0.115921 -0.294683,0.253821 -0.420504,0.402808 -0.18711,0.21892 -0.286604,0.348663 -0.344676,0.578225 -0.05808,0.229562 -0.07026,0.555252 -0.08961,1.169443 -0.02581,0.620273 -0.05062,0.949835 -0.110308,1.182437 -0.05969,0.232603 -0.157564,0.366218 -0.344674,0.591219 -0.177438,0.209798 -0.388095,0.385779 -0.613523,0.519753 -0.22543,0.133974 -0.46235,0.229958 -0.696245,0.279367 -0.233896,0.04941 -0.465825,0.05039 -0.668671,0.0065 -0.202839,-0.0439 -0.377845,-0.13342 -0.510118,-0.279367 -0.09034,-0.100339 -0.171474,-0.231065 -0.234382,-0.37682 -0.06292,-0.145757 -0.108834,-0.307389 -0.137874,-0.467778 -0.02904,-0.160389 -0.03887,-0.317044 -0.02757,-0.46128 0.01129,-0.144236 0.04532,-0.273026 0.1034,-0.370324 0.07742,-0.158109 0.511662,-0.647144 0.937515,-1.084984 0.27745,-0.27973 0.508046,-0.554117 0.682458,-0.825107 0.174421,-0.270989 0.293575,-0.539568 0.365358,-0.805616 0.07178,-0.266048 0.09248,-0.527715 0.06204,-0.792623 -0.03044,-0.264908 -0.108996,-0.531551 -0.241271,-0.79912 -0.141951,-0.285812 -0.270349,-0.479834 -0.468759,-0.656186 -0.198417,-0.176354 -0.470744,-0.332902 -0.90305,-0.54574 -0.261318,-0.127705 -0.53296,-0.218105 -0.813434,-0.266374 -0.210347,-0.0362 -0.424504,-0.04705 -0.634203,-0.03898 z m 0.255062,9.102167 c 0.907528,-0.03466 1.796602,0.546728 1.985331,1.416326 0.07471,0.352058 -0.07434,0.541856 -0.268849,1.046002 -0.07358,0.1907 -0.407907,0.403207 -0.592841,0.552237 -0.36242,0.292057 -1.120684,0.311852 -1.55104,0.311852 -0.812993,0 -1.472233,-1.097042 -1.227044,-2.033532 0.103239,-0.377029 0.678707,-1.029163 1.027132,-1.162947 0.203254,-0.07753 0.417879,-0.121938 0.627311,-0.129938 z"
-       id="path4462"
-       inkscape:connector-curvature="0" />
+       id="path4462" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0"
        d="m 63.573009,-22.251167 c -0.31204,0.0031 -0.569418,0.0336 -0.80654,0.09745 -0.316164,0.08514 -0.594662,0.230614 -0.923732,0.467777 -0.287131,0.197635 -0.526379,0.389591 -0.716925,0.591218 -0.190541,0.201627 -0.330688,0.415225 -0.441184,0.656187 -0.110492,0.240964 -0.187386,0.50946 -0.234379,0.825108 -0.04698,0.315647 -0.06895,0.678797 -0.06895,1.104474 0,0.522975 0.02049,0.881565 0.06895,1.208425 0.04838,0.326859 0.126014,0.623911 0.255059,1.007021 0.180662,0.522975 0.307561,0.948548 0.268847,0.948548 -0.03871,0 -0.332268,-0.220531 -0.654885,-0.500262 -0.33552,-0.27973 -1.005515,-0.71996 -1.49589,-0.987529 -0.367784,-0.200676 -0.625738,-0.321818 -0.854795,-0.396311 -0.229046,-0.07449 -0.431701,-0.103951 -0.696245,-0.103951 -0.374237,0 -0.69175,0.05683 -0.97888,0.175417 -0.287129,0.118581 -0.540671,0.303327 -0.78586,0.558734 -0.151622,0.152027 -0.273816,0.282207 -0.365356,0.415802 -0.09154,0.133594 -0.153142,0.268822 -0.199914,0.435292 -0.09357,0.332941 -0.117632,0.780461 -0.12408,1.552761 0,0.675003 0.01244,1.065558 0.06893,1.422823 0.05647,0.357265 0.158439,0.687113 0.358461,1.234413 0.225822,0.620272 0.554486,1.311673 0.951304,2.014041 0.396821,0.7023677 0.861195,1.415754 1.358023,2.0725135 0.438759,0.5837862 0.962237,1.1915069 1.399381,1.6567113 0.218568,0.2326033 0.41509,0.427266 0.572163,0.5652311 0.15708,0.137965 0.269148,0.2208941 0.323996,0.2208941 0.08387,0 0.150863,-0.019121 0.193006,-0.058471 0.04214,-0.039336 0.06123,-0.1001626 0.06204,-0.175416 0.0014,-0.1505068 -0.07996,-0.369544 -0.241274,-0.6431938 -0.248416,-0.401353 -0.439321,-0.8474793 -0.579056,-1.2993815 -0.139739,-0.4519022 -0.228447,-0.9103336 -0.255059,-1.3253692 -0.0266,-0.4150356 0.0055,-0.7877338 0.09651,-1.0784867 0.04546,-0.1453765 0.110424,-0.2724083 0.18612,-0.3703238 0.0757,-0.097914 0.162377,-0.168374 0.268847,-0.207901 0.193581,-0.06993 0.375654,-0.101788 0.551478,-0.09096 0.175826,0.01082 0.343244,0.06478 0.523908,0.16892 0.180662,0.1041389 0.370969,0.2577893 0.579056,0.4677772 0.208089,0.2099876 0.438151,0.4772371 0.696243,0.8056165 0.267771,0.3405419 0.476526,0.5863038 0.634203,0.7341507 0.157679,0.1478469 0.263872,0.1995972 0.317101,0.1494274 0.05324,-0.05017 0.05246,-0.2012774 0.0069,-0.4547835 -0.04557,-0.2535058 -0.137022,-0.6098254 -0.275742,-1.0719894 -0.109687,-0.3679069 -0.196828,-0.7403689 -0.261954,-1.1044749 -0.06513,-0.364106 -0.105541,-0.721078 -0.12408,-1.052499 -0.01865,-0.33142 -0.01635,-0.639718 0.01382,-0.909567 0.03005,-0.269849 0.08479,-0.502782 0.165439,-0.682175 0.06775,-0.152027 0.151393,-0.287647 0.248167,-0.402808 0.09679,-0.115163 0.205073,-0.20833 0.330887,-0.285864 0.12583,-0.07753 0.265648,-0.13627 0.420503,-0.175416 0.154847,-0.03915 0.326231,-0.05847 0.510121,-0.05847 0.203254,0 0.380219,0.007 0.537696,0.03248 0.157472,0.02547 0.297101,0.06719 0.420501,0.123441 0.123412,0.05625 0.229875,0.128539 0.330889,0.220894 0.101028,0.09236 0.1992,0.204055 0.289529,0.337839 0.106463,0.161149 0.17829,0.394582 0.22748,0.669182 0.04919,0.274599 0.0754,0.59038 0.06895,0.92256 -0.0064,0.332181 -0.0429,0.679627 -0.1034,1.013518 -0.0605,0.333891 -0.149043,0.655824 -0.261954,0.9355547 -0.193581,0.4743264 -0.310803,0.9639593 -0.344676,1.3318662 -0.01704,0.1839542 -0.01336,0.3334701 0.01382,0.4417897 0.02722,0.1083194 0.07745,0.175416 0.151646,0.175416 0.05808,0 0.179257,-0.1037025 0.330889,-0.2663732 0.151622,-0.1626698 0.335909,-0.3873715 0.510121,-0.6366968 0.400044,-0.5533807 0.696148,-0.9031091 0.971986,-1.1174681 0.137921,-0.1071805 0.269001,-0.1815935 0.406717,-0.2273905 0.137713,-0.0458 0.283101,-0.06497 0.441183,-0.06497 0.193581,0 0.358416,0.02878 0.496334,0.08446 0.13792,0.05568 0.243779,0.137077 0.330888,0.2533792 0.08712,0.1163016 0.151876,0.2664235 0.193029,0.4482867 0.04113,0.1818626 0.06204,0.397325 0.06204,0.6496908 -0.0064,0.3527041 -0.03125,0.5876712 -0.110286,0.8445978 -0.07903,0.2569271 -0.215804,0.5362809 -0.448078,0.9680394 -0.167766,0.3162172 -0.296512,0.6077322 -0.386039,0.8640887 -0.08951,0.2563565 -0.135087,0.4756192 -0.14476,0.6496908 -0.0097,0.1740723 0.01773,0.3009618 0.08961,0.3703237 0.07178,0.069363 0.182919,0.083757 0.337781,0.025989 0.103239,-0.036486 0.592788,-0.5401791 1.096069,-1.1239648 0.609746,-0.7145301 1.152384,-1.417263 1.619975,-2.1049984 0.467593,-0.6877348 0.860207,-1.3606667 1.178791,-2.0075439 0.318582,-0.646878 0.5611,-1.266158 0.723818,-1.858116 0.08136,-0.295979 0.145013,-0.584476 0.18612,-0.864088 0.04111,-0.279613 0.06204,-0.550626 0.06204,-0.812114 0,-0.377028 -0.02386,-0.708476 -0.08272,-1.00702 -0.05892,-0.298548 -0.153631,-0.563136 -0.282678,-0.805621 -0.129047,-0.242484 -0.292723,-0.46683 -0.503228,-0.675678 -0.210503,-0.208848 -0.468814,-0.406576 -0.772073,-0.604212 -0.238736,-0.158109 -0.416287,-0.254081 -0.606628,-0.311852 -0.190334,-0.05777 -0.391222,-0.07796 -0.668673,-0.07796 -0.251639,0 -0.50072,0.03224 -0.7445,0.09096 -0.243775,0.05872 -0.483388,0.146615 -0.71003,0.259876 -0.226628,0.113261 -0.440873,0.252182 -0.641095,0.415802 -0.200214,0.16362 -0.386949,0.355433 -0.551481,0.565231 -0.283903,0.364866 -0.555893,0.656188 -0.620416,0.656188 -0.06453,0 0.03903,-0.36944 0.2068,-0.831604 0.114523,-0.294934 0.209149,-0.584774 0.275742,-0.870586 0.0666,-0.285812 0.104528,-0.564451 0.12408,-0.838101 0.01957,-0.27365 0.01957,-0.540673 -0.0069,-0.79912 -0.02655,-0.258447 -0.07986,-0.50694 -0.151646,-0.747144 -0.07178,-0.240204 -0.159659,-0.476249 -0.275741,-0.695169 -0.116089,-0.21892 -0.254118,-0.422611 -0.413611,-0.617206 -0.159499,-0.194596 -0.342599,-0.37851 -0.544586,-0.54574 -0.201987,-0.167229 -0.425096,-0.317958 -0.668671,-0.454783 -0.341975,-0.188514 -0.579979,-0.303849 -0.820329,-0.376822 -0.240349,-0.07297 -0.485687,-0.105198 -0.834115,-0.123441 -0.117747,-0.0046 -0.226881,-0.0075 -0.330887,-0.0065 z m 17.468158,5.522371 c -0.04373,-0.003 -0.08541,-5.46e-4 -0.130988,0.0065 -0.09115,0.01406 -0.18718,0.04881 -0.303312,0.09745 -0.174214,0.06689 -0.722662,0.559033 -1.613082,1.442313 -0.890421,0.883281 -2.125241,2.157961 -3.667348,3.787697 -0.94204,0.991221 -1.416436,1.4867397 -1.640657,1.780153 -0.112105,0.1467052 -0.162493,0.24256 -0.179235,0.3248452 -0.01681,0.082286 0.0051,0.1491681 0.02757,0.2403861 0.05808,0.2371628 0.15358,0.4036527 0.282636,0.4872679 0.06453,0.041809 0.136263,0.064399 0.213709,0.06497 0.07742,5.849e-4 0.161064,-0.022411 0.248166,-0.06497 0.348426,-0.1763534 2.430405,-1.4942502 4.453209,-2.8001672 2.022803,-1.305917 3.986379,-2.601414 4.115426,-2.735198 0.138726,-0.142906 0.228885,-0.29595 0.261954,-0.46128 0.03307,-0.16533 0.009,-0.33884 -0.06204,-0.519753 -0.07098,-0.180913 -0.191946,-0.36908 -0.365356,-0.558734 -0.173408,-0.189655 -0.394447,-0.380173 -0.66867,-0.571728 -0.400045,-0.279731 -0.640546,-0.435995 -0.834117,-0.493765 -0.04838,-0.01444 -0.09414,-0.02297 -0.137875,-0.02599 z m -34.398623,0.06497 c -0.116135,0.01292 -0.237117,0.04675 -0.365354,0.10395 -0.128248,0.0572 -0.265208,0.137007 -0.413611,0.240386 -0.180662,0.121622 -0.328913,0.233961 -0.448078,0.350833 -0.119175,0.11687 -0.205142,0.239924 -0.268849,0.363826 -0.06372,0.123903 -0.102871,0.253596 -0.117195,0.396312 -0.01428,0.142716 -0.0083,0.294465 0.02073,0.467777 0.05163,0.304055 0.128501,0.623027 0.193028,0.708163 0.09034,0.139864 2.279655,1.548863 4.466995,2.917111 2.187339,1.368249 4.377545,2.6949696 4.480783,2.6767262 0.116135,-0.024331 0.266364,-0.1252611 0.330889,-0.2468826 0.03871,-0.057771 0.06027,-0.1082521 0.03448,-0.1949081 -0.02582,-0.086656 -0.09932,-0.2039249 -0.241275,-0.3833173 -0.283979,-0.3587841 -0.851395,-0.9726642 -1.909577,-2.0855062 -1.522749,-1.599331 -2.7228,-2.8382 -3.577733,-3.703237 -0.854935,-0.865038 -1.360835,-1.350681 -1.502785,-1.435817 -0.116142,-0.06993 -0.232565,-0.119973 -0.344677,-0.149429 -0.112109,-0.02945 -0.221639,-0.03891 -0.337781,-0.02599 z m 32.103083,8.2835567 c -0.151461,0.00648 -0.302978,0.020168 -0.461863,0.038982 -0.317779,0.037603 -0.649082,0.1021344 -0.992667,0.1884115 -0.343587,0.086275 -0.700713,0.1968226 -1.068494,0.3313421 -0.367784,0.1345199 -0.747066,0.2919363 -1.137431,0.4742744 -0.780732,0.3646763 -1.606492,0.8239637 -2.467875,1.3773445 -0.929137,0.5959482 -1.6205,1.0914159 -2.081843,1.4942886 -0.230669,0.201437 -0.408971,0.3790076 -0.523906,0.5327465 -0.114937,0.1537377 -0.172348,0.2833938 -0.172348,0.3898143 0,0.1125 0.02142,0.2073078 0.05515,0.2728703 0.03367,0.065561 0.0815,0.1044379 0.151645,0.1234413 0.07017,0.018996 0.159361,0.014185 0.268847,-0.012988 0.10948,-0.027175 0.241302,-0.076455 0.392929,-0.1494275 0.487152,-0.2402016 0.998864,-0.4291661 1.495895,-0.565231 0.497029,-0.1360654 0.980056,-0.219518 1.413168,-0.2468827 0.433112,-0.027365 0.814459,-0.00146 1.109856,0.08446 0.147708,0.042948 0.272819,0.1032987 0.372251,0.175416 0.09944,0.07212 0.17175,0.158018 0.213686,0.2598762 0.05808,0.142906 0.08712,0.2683813 0.07583,0.3898144 -0.01128,0.121432 -0.06266,0.2407551 -0.172349,0.3768208 -0.109686,0.1360654 -0.272996,0.2874709 -0.510118,0.474274 -0.237124,0.1868036 -0.55082,0.4085256 -0.944412,0.6821754 -0.27745,0.1945964 -0.467022,0.3469869 -0.592843,0.4807711 -0.12583,0.1337844 -0.186557,0.24786985 -0.193028,0.35732996 -0.0129,0.0851353 0.0014,0.17197328 0.02757,0.24038616 0.02582,0.0684129 0.06556,0.11819128 0.117195,0.13643438 0.09034,0.0364862 0.760327,-0.0977644 1.495892,-0.29236081 0.37746,-0.10033706 0.764241,-0.18166321 1.144324,-0.24038619 0.380081,-0.05872 0.75373,-0.094484 1.102961,-0.1104483 0.349232,-0.015955 0.673288,-0.00843 0.958197,0.01947 0.284912,0.027936 0.529808,0.076455 0.716928,0.14942995 0.154846,0.060812 0.292628,0.13693546 0.413608,0.22739063 0.120971,0.0904552 0.226329,0.19631155 0.310209,0.31185162 0.08387,0.11554131 0.149458,0.24075511 0.193029,0.37682078 0.04355,0.13606543 0.06204,0.28326519 0.06204,0.43529271 0,0.22499993 -0.01175,0.36647746 -0.08272,0.50026188 -0.07098,0.13378443 -0.201135,0.25977253 -0.420504,0.44828673 -0.12583,0.1064173 -0.268747,0.2009184 -0.434291,0.2858638 -0.165532,0.084946 -0.35021,0.1608449 -0.544586,0.2208941 -0.388753,0.1201033 -0.822754,0.1884115 -1.261513,0.1884115 -0.367784,0 -1.033409,-0.090425 -1.654442,-0.2014045 C 74.498567,1.73487 73.919801,1.5983957 73.713326,1.4950163 73.552008,1.4159613 73.438303,1.3726793 73.34797,1.3650784 c -0.09034,-0.0076 -0.156505,0.023658 -0.22748,0.08446 -0.08387,0.063851 -0.139786,0.1236083 -0.158554,0.1884115 -0.01865,0.064803 -0.0022,0.1345821 0.05515,0.2143976 0.114523,0.1596284 0.391552,0.365126 0.875477,0.6691813 0.412948,0.2614877 0.743201,0.4947546 0.985772,0.708163 0.242571,0.2134079 0.399031,0.4026336 0.475653,0.5782248 0.03832,0.087795 0.05748,0.1731126 0.05515,0.2533795 -0.0022,0.080267 -0.02651,0.1598727 -0.06893,0.2338896 -0.08488,0.1480364 -0.247476,0.2850591 -0.489436,0.4158019 -0.225822,0.1216215 -0.405146,0.1893863 -0.634205,0.2273906 -0.229046,0.038007 -0.512986,0.045062 -0.958197,0.038982 C 72.71639,4.9712749 72.256109,4.9217707 71.838323,4.8214311 71.420534,4.7210916 71.047995,4.5664926 70.680212,4.3536541 70.409214,4.1955464 70.201746,4.1182463 70.059796,4.1197644 c -0.07098,8.382e-4 -0.129146,0.023732 -0.16544,0.064968 -0.03629,0.041238 -0.05515,0.099819 -0.05515,0.1819125 0,0.072972 0.04242,0.1643625 0.12408,0.2728703 0.08166,0.1085088 0.20779,0.2324662 0.386036,0.3898146 0.356493,0.3146977 0.918603,0.7419987 1.750954,1.3318659 0.553286,0.3922324 1.106068,0.7455558 1.654442,1.0589942 0.548372,0.3134358 1.095659,0.5857262 1.626868,0.8186112 0.531208,0.2328875 1.049244,0.4276485 1.55104,0.5782251 0.501793,0.1505717 0.980613,0.2583301 1.440745,0.3248459 0.460132,0.066511 0.896654,0.090767 1.302873,0.071472 0.406217,-0.019195 0.783582,-0.081518 1.123641,-0.188414 0.340059,-0.1068959 0.648297,-0.258552 0.909945,-0.4547838 0.261645,-0.1962417 0.477003,-0.4338259 0.647988,-0.721156 0.161318,-0.2645275 0.267465,-0.5486766 0.310209,-0.8381033 0.04274,-0.2894209 0.02595,-0.5871956 -0.04825,-0.896571 C 82.545578,5.8049438 82.4095,5.483662 82.219958,5.159274 82.03043,4.8348861 81.78561,4.5062049 81.482351,4.1717441 81.108117,3.7703911 80.81368,3.4091111 80.81368,3.3726246 c 0,-0.036486 0.407543,0.05712 0.92373,0.2273906 0.345199,0.1064198 0.677751,0.1929462 0.999562,0.2533792 0.321806,0.060433 0.637484,0.096765 0.937517,0.1104483 0.30003,0.013686 0.588709,0.00125 0.868582,-0.032485 0.279868,-0.033826 0.552116,-0.086823 0.813432,-0.1689195 0.406498,-0.1277042 0.76652,-0.2967349 1.082284,-0.5002616 0.315759,-0.2035261 0.581879,-0.4448087 0.799645,-0.71466 0.217762,-0.2698513 0.383821,-0.5699045 0.496333,-0.8965732 0.11252,-0.3266707 0.172349,-0.67851009 0.172349,-1.05249894 0,-0.36182694 -0.04516,-0.69863082 -0.14476,-1.01351754 C 87.662731,-0.72995956 87.509001,-1.027283 87.307369,-1.298652 87.105732,-1.570021 86.855164,-1.8145252 86.549082,-2.0457963 86.243,-2.2770677 85.87975,-2.4943949 85.4668,-2.6889904 85.115146,-2.85318 84.776637,-2.9689769 84.446561,-3.0463203 c -0.330078,-0.077343 -0.648122,-0.113832 -0.965092,-0.1039503 -0.316972,0.00987 -0.632079,0.064935 -0.944412,0.1624229 -0.312329,0.097488 -0.621352,0.2368263 -0.937517,0.4222992 -0.361328,0.2189197 -0.698891,0.3548351 -0.737605,0.3183484 -0.05161,-0.036486 0.195286,-0.3684526 0.530801,-0.7211568 0.222598,-0.234124 0.411861,-0.4582783 0.572161,-0.6756783 0.160304,-0.2173991 0.2905,-0.4268999 0.392929,-0.6366971 0.102432,-0.2097956 0.178497,-0.4188808 0.227479,-0.6301999 0.04901,-0.2113189 0.06895,-0.4212345 0.06895,-0.6431938 0,-0.2888526 -0.02957,-0.5483568 -0.09651,-0.7796289 -0.06694,-0.2312726 -0.168699,-0.4378856 -0.317102,-0.6302005 -0.148403,-0.1923149 -0.341567,-0.3672617 -0.58595,-0.5392435 -0.244381,-0.1719812 -0.541279,-0.3429845 -0.896155,-0.5132557 -0.230672,-0.11098 -0.476287,-0.1923545 -0.737607,-0.2533792 -0.261317,-0.061024 -0.536867,-0.098951 -0.827223,-0.1104483 -0.145174,-0.00576 -0.296605,-0.00648 -0.448076,0 z M 48.338349,-8.269822 c -0.143793,-2.144e-4 -0.274206,0.00606 -0.399824,0.012988 -0.251236,0.013885 -0.47026,0.044588 -0.66867,0.090956 -0.198418,0.046368 -0.381339,0.1095807 -0.558374,0.194908 -0.177046,0.085325 -0.350576,0.1941028 -0.537695,0.3248454 -0.161318,0.1185827 -0.296424,0.2388206 -0.406716,0.3703235 -0.110286,0.1315034 -0.191348,0.2706872 -0.25506,0.428796 -0.06372,0.1581077 -0.10941,0.3343503 -0.130965,0.5327464 -0.02165,0.1983956 -0.02303,0.4168155 -0.0069,0.6691816 0.01612,0.2614874 0.04631,0.5043637 0.09651,0.7276535 0.0502,0.2232898 0.119336,0.4307003 0.213709,0.636697 0.09435,0.2059965 0.216748,0.4075983 0.365356,0.6172062 0.148606,0.2096088 0.324766,0.4285611 0.537693,0.6626846 0.361331,0.401353 0.632437,0.7423106 0.606629,0.7666351 -0.02582,0.024331 -0.486903,-0.1384112 -1.054707,-0.35733 -0.490376,-0.1885137 -0.975975,-0.3179804 -1.440743,-0.3898143 -0.464768,-0.071833 -0.910679,-0.083069 -1.337343,-0.038982 -0.426659,0.044087 -0.830315,0.1461069 -1.206364,0.3053546 -0.376048,0.1592495 -0.727981,0.376041 -1.040919,0.6496908 -0.196805,0.1702706 -0.349229,0.3197768 -0.475653,0.4742743 -0.126429,0.154498 -0.226259,0.3131968 -0.296422,0.4872681 -0.07017,0.17407231 -0.116733,0.36872282 -0.14476,0.5977154 -0.02803,0.22899357 -0.03447,0.49285644 -0.03447,0.81211349 0,0.32837959 0.01819,0.61810016 0.06204,0.88357941 0.04376,0.2654791 0.11245,0.507973 0.2068,0.7276538 0.09435,0.21968 0.213524,0.419725 0.365354,0.6107092 0.15183,0.1909817 0.335331,0.3728436 0.551483,0.552237 0.30003,0.2493255 0.629482,0.4460683 0.985772,0.5977154 0.35629,0.1516486 0.738632,0.2586417 1.144323,0.3118516 0.405687,0.053211 0.833956,0.052486 1.282194,0.00648 0.448233,-0.045987 0.915457,-0.139917 1.39938,-0.2858638 0.535543,-0.1641904 0.875063,-0.2484009 1.020242,-0.2468827 0.07259,8.381e-4 0.09962,0.022212 0.07583,0.06497 -0.02379,0.042756 -0.09433,0.1097727 -0.213708,0.194908 -0.141951,0.1216215 -0.493298,0.3641386 -0.751393,0.558734 -0.177438,0.1277043 -0.324881,0.265864 -0.448078,0.4158022 -0.123205,0.1499385 -0.223013,0.3105707 -0.29642,0.4937649 -0.07339,0.1831938 -0.123642,0.3897375 -0.151668,0.6172062 -0.02803,0.2274679 -0.03358,0.477368 -0.02073,0.7601383 0.01612,0.3679057 0.07047,0.6910068 0.16544,0.9745377 0.09497,0.2835284 0.230524,0.5243508 0.413608,0.734149 0.18308,0.2098032 0.415772,0.3860393 0.696246,0.532747 0.280474,0.1467076 0.61242,0.2695681 0.999559,0.3638275 0.361331,0.085133 0.606091,0.1273128 0.875475,0.1364369 0.269385,0.00922 0.561242,-0.017201 1.006454,-0.077953 0.638781,-0.085133 1.195321,-0.2004797 1.764739,-0.3768205 0.569418,-0.1763484 1.149726,-0.4122672 1.833674,-0.7406481 0.461339,-0.2219685 1.003032,-0.5265845 1.557933,-0.8640869 0.5549,-0.3375018 1.120799,-0.7067093 1.633762,-1.0654944 0.51296,-0.3587853 0.974246,-0.708215 1.309768,-0.994027 0.33552,-0.2858119 0.549578,-0.5116193 0.572161,-0.6302 0.0129,-0.060812 -0.0067,-0.1226211 -0.05515,-0.1819125 -0.04838,-0.059291 -0.124241,-0.1133575 -0.22748,-0.1559264 -0.129054,-0.060812 -0.2504,-0.08542 -0.434291,-0.051975 -0.183886,0.033445 -0.43407,0.1212575 -0.834114,0.2793672 -0.483926,0.1885137 -0.927481,0.3323296 -1.385596,0.4417897 -0.458114,0.1094612 -0.925883,0.1856544 -1.461425,0.2403862 -0.183886,0.021289 -0.349704,0.017076 -0.489439,-0.00648 -0.139739,-0.023558 -0.257205,-0.063046 -0.351568,-0.1299378 -0.09437,-0.066892 -0.165924,-0.157674 -0.213709,-0.2663733 -0.04779,-0.1086982 -0.06893,-0.2408249 -0.06893,-0.3898143 0,-0.1459473 0.01451,-0.2733942 0.06204,-0.4028083 0.04758,-0.1294119 0.124679,-0.258313 0.234377,-0.3898144 0.219374,-0.2630073 0.575638,-0.5459501 1.130537,-0.929058 0.5549,-0.3770282 1.020239,-0.7448055 1.020239,-0.8056165 0,-0.042569 -0.04219,-0.090827 -0.117194,-0.1364344 -0.07501,-0.045608 -0.183518,-0.086955 -0.296422,-0.1234413 -0.225822,-0.072972 -0.486242,-0.1144494 -0.641098,-0.077963 -0.167765,0.036486 -0.74709,0.1650729 -1.289086,0.2988578 -0.296806,0.079055 -0.671235,0.1462589 -1.061599,0.194908 -0.390365,0.048649 -0.797664,0.07838 -1.171898,0.08446 -0.567804,0.012165 -0.881087,0.020467 -1.089177,-0.012988 C 49.253829,2.0073401 49.148458,1.9341854 49.000055,1.8004009 48.793577,1.6179674 48.654925,1.393574 48.572656,1.1507104 48.490396,0.90784629 48.468243,0.64445881 48.503726,0.39057206 c 0.03549,-0.25388676 0.122053,-0.49916002 0.268846,-0.71465973 0.146787,-0.21549945 0.348096,-0.39854648 0.599736,-0.5262497 0.167766,-0.0851353 0.412823,-0.14637609 0.710032,-0.18191253 0.297207,-0.035536 0.651286,-0.045408 1.027135,-0.032485 0.375846,0.012938 0.775114,0.050205 1.178788,0.11044834 0.403674,0.0602411 0.811892,0.14046292 1.192579,0.24688268 0.600067,0.16419042 1.012365,0.25269116 1.275298,0.26637299 0.131472,0.006831 0.221539,-0.002266 0.282634,-0.0324851 0.0611,-0.0302165 0.08961,-0.0760387 0.08961,-0.1429309 0,-0.060812 -0.465339,-0.41559401 -1.020239,-0.79262271 -0.600065,-0.3952718 -0.956917,-0.6628653 -1.165002,-0.90307 -0.104044,-0.1201033 -0.166269,-0.2295918 -0.206799,-0.3508332 -0.04053,-0.1212426 -0.05515,-0.2538222 -0.05515,-0.4028081 0,-0.1398646 0.0205,-0.2677765 0.06893,-0.3833175 0.04838,-0.1155414 0.120142,-0.2171772 0.213708,-0.3053549 0.09357,-0.088177 0.209172,-0.1631259 0.344674,-0.2208941 0.135503,-0.057768 0.294547,-0.099115 0.468761,-0.1234413 0.177438,-0.027365 0.402233,-0.02798 0.654883,-0.00648 0.252648,0.021464 0.529166,0.068365 0.820327,0.1299379 0.582322,0.1231422 1.207193,0.3146578 1.723377,0.54574 0.406498,0.1885137 0.719311,0.2936082 0.930625,0.3118516 0.105657,0.00912 0.187432,-0.00553 0.241274,-0.038982 0.05384,-0.033447 0.08272,-0.086409 0.08272,-0.162423 0,-0.097298 -0.170207,-0.2863319 -0.517013,-0.5782248 -0.34671,-0.2919168 -0.87609,-0.6846421 -1.592299,-1.1954548 -0.825898,-0.577705 -1.522569,-1.0240947 -2.24039,-1.4163261 -0.717821,-0.3922312 -1.454696,-0.7335266 -2.364475,-1.1044741 -0.683946,-0.2736497 -1.07619,-0.4201031 -1.440745,-0.5067589 -0.364555,-0.086656 -0.7006,-0.112111 -1.268404,-0.1364343 -0.167766,-0.00608 -0.324961,-0.012789 -0.468761,-0.012988 z m 15.289807,5.4509055 c -0.07208,0.00214 -0.142526,0.00501 -0.213708,0.012988 -0.284709,0.031924 -0.564969,0.108085 -0.841007,0.2338896 -0.276039,0.1258021 -0.541998,0.3008327 -0.806543,0.5197524 -0.18711,0.1550664 -0.347614,0.2986936 -0.475651,0.4417897 -0.128041,0.1430955 -0.223472,0.2825044 -0.303314,0.435293 -0.07984,0.1527879 -0.143585,0.31611747 -0.18612,0.50026188 -0.04256,0.18414366 -0.0666,0.39303691 -0.08272,0.63019999 -0.02582,0.3891906 -0.0041,0.75363709 0.06893,1.09797723 0.07319,0.3443405 0.198394,0.6661919 0.365356,0.9550454 0.16696,0.2888536 0.378732,0.543915 0.634201,0.7666351 0.255476,0.222719 0.550518,0.4127875 0.889265,0.5587341 0.251639,0.1109793 0.508271,0.1879478 0.765179,0.2338896 0.256909,0.045942 0.519526,0.059351 0.772075,0.045478 0.252547,-0.013886 0.499046,-0.054981 0.737603,-0.1234414 0.238561,-0.06846 0.467515,-0.1615429 0.682458,-0.2793668 0.214952,-0.1178223 0.41804,-0.2603421 0.599735,-0.4222991 0.181699,-0.1619568 0.343723,-0.3448744 0.482549,-0.5457403 0.138818,-0.2008661 0.251455,-0.42164 0.337781,-0.6561875 0.08631,-0.2345478 0.141237,-0.4841373 0.16544,-0.74714435 0.0355,-0.3496593 0.0256,-0.67891017 -0.04135,-0.98752673 -0.06694,-0.30861656 -0.187474,-0.59347845 -0.358462,-0.86408862 -0.170989,-0.2706104 -0.392028,-0.524495 -0.668672,-0.7601384 -0.276642,-0.2356434 -0.608749,-0.4524715 -0.992665,-0.6561875 -0.293579,-0.1581087 -0.584921,-0.2686311 -0.875477,-0.3313424 -0.217916,-0.047033 -0.438655,-0.064869 -0.654883,-0.058471 z m -3.832792,8.7383406 c -0.05043,0.00414 -0.105772,0.016553 -0.16544,0.038982 -0.119359,0.044847 -0.258313,0.1280757 -0.406716,0.2403862 -0.148399,0.1123105 -0.311559,0.2524438 -0.482546,0.4287959 -0.458115,0.4804074 -1.07652,1.2771359 -1.64755,2.0920053 -0.57103,0.8148669 -1.093475,1.6490705 -1.35802,2.2024515 -0.161318,0.331417 -0.287678,0.622387 -0.392931,0.903069 -0.105243,0.280684 -0.188492,0.551112 -0.248167,0.831604 -0.05969,0.280492 -0.09949,0.572225 -0.12408,0.903071 -0.0246,0.330846 -0.03447,0.698702 -0.03447,1.130462 0,0.668922 0.0078,1.068587 0.04825,1.351358 0.04032,0.28277 0.111783,0.450261 0.23438,0.669181 0.12583,0.221969 0.269265,0.416752 0.427398,0.584722 0.15814,0.167972 0.331306,0.308375 0.517013,0.422298 0.185706,0.113926 0.384298,0.200031 0.592841,0.259876 0.20855,0.05983 0.428244,0.09825 0.654883,0.103954 0.226651,0.0057 0.463144,-0.01645 0.70314,-0.06497 0.239994,-0.04849 0.482095,-0.12467 0.73071,-0.227403 0.248618,-0.102708 0.505792,-0.232813 0.758288,-0.389813 0.252494,-0.156979 0.499751,-0.340918 0.751392,-0.552237 0.400043,-0.328381 0.753157,-0.583059 0.778968,-0.558736 0.02582,0.02443 -0.115767,0.37178 -0.296424,0.773134 -0.148399,0.316218 -0.234241,0.547313 -0.282632,0.831604 -0.04838,0.284291 -0.06248,0.622559 -0.06895,1.17594 0,0.38311 0.02165,0.717633 0.06204,1.013516 0.04032,0.295886 0.102686,0.557741 0.193029,0.792626 0.09034,0.234881 0.208435,0.443084 0.358461,0.643192 0.150011,0.200106 0.332103,0.386668 0.551483,0.578223 0.190335,0.164183 0.370412,0.307139 0.551479,0.422301 0.181076,0.115148 0.362752,0.207909 0.551483,0.279365 0.188722,0.07145 0.386407,0.122851 0.599735,0.155932 0.213317,0.03308 0.441375,0.04547 0.696246,0.04547 0.295194,0.003 0.577533,-0.02615 0.847902,-0.08446 0.270366,-0.05831 0.524928,-0.146708 0.765177,-0.259876 0.24025,-0.113178 0.463833,-0.254294 0.668671,-0.415802 0.204842,-0.161516 0.394244,-0.342404 0.558375,-0.54574 0.164128,-0.203347 0.309263,-0.424024 0.427399,-0.662685 0.118138,-0.238646 0.208895,-0.492663 0.275739,-0.760138 0.06685,-0.267474 0.106923,-0.548322 0.117194,-0.8381 0.01036,-0.289779 -0.01036,-0.590999 -0.06204,-0.896575 -0.07742,-0.437839 -0.257875,-1.104266 -0.399826,-1.481293 -0.154846,-0.364867 -0.2464,-0.696833 -0.220594,-0.721156 0.02582,-0.02443 0.386698,0.230344 0.799648,0.558733 0.374234,0.301016 0.73156,0.548297 1.068494,0.734151 0.336931,0.185846 0.652957,0.308824 0.965092,0.383317 0.312134,0.07449 0.617005,0.09805 0.916837,0.06496 0.299829,-0.03306 0.596124,-0.116568 0.896157,-0.253379 0.250027,-0.115546 0.469465,-0.257138 0.661775,-0.422298 0.192315,-0.165156 0.361842,-0.353819 0.496333,-0.56523 0.134489,-0.211424 0.240528,-0.447377 0.317102,-0.701666 0.07657,-0.25429 0.119313,-0.531314 0.137874,-0.825108 0.01865,-0.293794 0.01198,-0.60563 -0.02757,-0.935556 -0.03956,-0.329924 -0.109018,-0.676822 -0.206799,-1.039503 -0.0978,-0.362683 -0.223036,-0.7384 -0.379146,-1.130464 C 72.516327,11.80987 72.328609,11.39859 72.114069,10.980514 71.859201,10.490986 71.513055,9.9342552 71.13519,9.3692799 70.757326,8.8043071 70.347939,8.2340942 69.949506,7.7255633 69.551075,7.21703 69.170004,6.7723787 68.853439,6.4521696 68.695161,6.292065 68.551546,6.1636446 68.432933,6.075349 68.314311,5.9870527 68.216438,5.9389147 68.150302,5.9389147 c -0.08387,0 -0.14172,0.011442 -0.179235,0.045478 -0.03751,0.034016 -0.05264,0.091041 -0.04136,0.175416 0.02257,0.1687499 0.146856,0.4543156 0.379142,0.9225618 0.245189,0.4986489 0.436223,0.9724037 0.56527,1.4163259 0.129054,0.4439196 0.193029,0.8565508 0.193029,1.2214178 0,0.2371504 -0.01082,0.3801588 -0.06893,0.5002618 -0.05808,0.120109 -0.164012,0.217058 -0.344676,0.350832 -0.232284,0.1581 -0.593172,0.363152 -0.799645,0.448287 -0.129054,0.0517 -0.239457,0.0785 -0.351569,0.07147 -0.112105,-0.007 -0.222091,-0.04405 -0.344676,-0.12993 -0.245189,-0.171787 -0.541003,-0.522352 -0.992667,-1.130462 -0.400043,-0.5351377 -0.79027,-0.9745377 -0.854795,-0.9745377 -0.06775,0 -0.114108,0.026475 -0.14476,0.077953 -0.03065,0.051503 -0.04092,0.1251938 -0.03447,0.2338846 0.0129,0.2174066 0.100636,0.559097 0.261954,1.0395061 0.116135,0.340541 0.206385,0.691089 0.275742,1.058995 0.06936,0.367906 0.111621,0.754264 0.130965,1.143454 l 0.08272,1.175943 -0.413611,0.487266 c -0.193558,0.231092 -0.429064,0.416243 -0.73071,0.565232 -0.301647,0.148976 -0.672422,0.260033 -1.130537,0.357328 -0.14195,0.02443 -0.24716,0.02805 -0.358463,-0.01296 -0.111299,-0.04106 -0.223842,-0.126515 -0.372249,-0.266374 -0.190334,-0.17939 -0.337947,-0.407955 -0.441184,-0.682175 -0.103239,-0.27422 -0.163091,-0.590939 -0.179234,-0.955045 -0.01612,-0.364105 0.01175,-0.772368 0.08272,-1.221418 0.07098,-0.44905 0.179695,-0.939246 0.337781,-1.468301 0.193558,-0.6324362 0.328241,-1.2418974 0.289527,-1.3513585 -0.04516,-0.1033809 -0.110516,-0.1654045 -0.18612,-0.188414 -0.0756,-0.022935 -0.163183,-0.00499 -0.268847,0.051977 -0.211313,0.1140256 -0.484365,0.386852 -0.813434,0.8186113 -0.25164,0.3222982 -0.453249,0.5497812 -0.654883,0.7276532 -0.201642,0.177869 -0.402802,0.306341 -0.647991,0.415802 -0.348425,0.158099 -0.564123,0.230021 -0.723817,0.220897 -0.07984,-0.0045 -0.145704,-0.03046 -0.2068,-0.07795 -0.0611,-0.04752 -0.117931,-0.116693 -0.179234,-0.207908 -0.112911,-0.173307 -0.187318,-0.389876 -0.220594,-0.643193 -0.03328,-0.2533174 -0.0237,-0.5406151 0.02073,-0.8575934 0.04435,-0.3169783 0.128202,-0.6622137 0.248166,-1.0265098 0.119981,-0.3642962 0.275189,-0.7481841 0.468759,-1.1434572 0.219373,-0.4500008 0.36271,-0.8975599 0.323996,-1.0070198 -0.04194,-0.1003395 -0.109134,-0.1623755 -0.193028,-0.1884115 -0.04194,-0.013013 -0.08744,-0.017126 -0.137875,-0.012988 z m -5.893953,3.3004284 c -0.07742,0 -2.079715,1.2569045 -4.115425,2.5597805 -2.035709,1.302876 -4.101088,2.649805 -4.294658,2.826155 -0.167766,0.152018 -0.273257,0.270129 -0.337781,0.396313 -0.06453,0.126191 -0.08961,0.265851 -0.08961,0.448285 0,0.297974 0.06441,0.55781 0.199914,0.805618 0.135502,0.247795 0.34429,0.477913 0.641096,0.721156 0.258094,0.218927 0.493148,0.367297 0.72382,0.441791 0.230669,0.07449 0.457506,0.08072 0.696243,0.02598 0.132278,-0.03041 0.649678,-0.498502 1.358023,-1.182437 0.708342,-0.683934 1.60334,-1.58686 2.481664,-2.501309 0.878321,-0.914446 1.742947,-1.837839 2.385152,-2.559783 0.64221,-0.721939 1.061604,-1.244936 1.061604,-1.3513558 0,-0.066885 -0.03155,-0.148328 -0.0896,-0.2274031 C 54.463773,9.543589 54.384691,9.4694749 54.294372,9.4147306 54.126606,9.305267 53.940155,9.219835 53.901441,9.219835 Z m 19.956717,0 c -0.07742,0 -0.168249,0.071197 -0.234382,0.1624129 -0.06614,0.091216 -0.108972,0.200729 -0.0896,0.2858643 0.0129,0.085133 0.02165,0.2055652 0.03447,0.2663723 0.0129,0.109464 2.4285,2.689564 5.280428,5.632819 0.445212,0.456082 0.885955,0.888061 1.240834,1.214921 0.354878,0.32686 0.627034,0.548235 0.723817,0.584721 0.135502,0.05475 0.242762,0.08404 0.365354,0.07795 0.122606,-0.006 0.26008,-0.04355 0.434294,-0.110436 0.290353,-0.115546 0.627653,-0.364152 0.909942,-0.630202 0.141144,-0.133022 0.267969,-0.271493 0.365356,-0.402807 0.09739,-0.131326 0.167213,-0.253953 0.193029,-0.357331 0.04516,-0.164183 0.06165,-0.297708 0.02756,-0.435292 -0.03408,-0.137583 -0.117286,-0.2776 -0.282634,-0.44179 C 82.661252,14.902876 82.416938,14.71335 82.068313,14.469344 81.719687,14.225338 81.266653,13.923811 80.682717,13.546783 79.443869,12.744077 77.41409,11.446202 76.188147,10.655658 74.962206,9.8651144 73.922664,9.2198425 73.858142,9.2198425 Z"
        id="path4350" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0"
        d="m 6.8309388,-22.998687 c -0.03619,0.0014 -0.071265,0.003 -0.1070731,0.0067 -0.143233,0.01496 -0.2846719,0.04719 -0.4140198,0.100913 -0.1293466,0.05372 -0.2497824,0.12734 -0.3533442,0.218648 -0.065144,0.05667 -0.1174959,0.111615 -0.1606107,0.168189 -0.043117,0.05658 -0.076134,0.11413 -0.099936,0.178283 -0.047605,0.128302 -0.059762,0.279733 -0.046399,0.484385 0.011699,0.176319 0.022661,0.314643 0.03926,0.427202 0.016604,0.11256 0.038622,0.200696 0.074952,0.282559 0.03633,0.08186 0.086156,0.154605 0.1570412,0.23883 0.070885,0.08422 0.1652648,0.179734 0.2855308,0.299378 0.2472126,0.251881 0.4886,0.516463 0.5353702,0.592027 0.040089,0.07242 0.060923,0.141256 0.067813,0.208555 0.00689,0.0673 -0.00103,0.132346 -0.028554,0.198464 -0.027561,0.06612 -0.072364,0.132954 -0.1356266,0.201828 -0.063265,0.06887 -0.1460495,0.139718 -0.2462702,0.215282 -0.093539,0.06927 -0.2924762,0.134774 -0.4854025,0.174918 -0.096463,0.02007 -0.1915984,0.03277 -0.2712543,0.037 -0.079655,0.0042 -0.1433804,4.87e-4 -0.1784558,-0.01682 -0.056792,-0.02991 -0.1092285,-0.07931 -0.1570412,-0.144643 -0.047815,-0.06533 -0.090907,-0.146379 -0.1284876,-0.245556 -0.075166,-0.198357 -0.1303161,-0.462831 -0.1570412,-0.787128 -0.023386,-0.239287 -0.04595,-0.408547 -0.078522,-0.541571 -0.032572,-0.133024 -0.071926,-0.228253 -0.1320571,-0.31956 -0.041758,-0.06455 -0.1085699,-0.137025 -0.1891643,-0.208554 -0.080594,-0.07153 -0.1781702,-0.142831 -0.2783926,-0.208557 -0.1002219,-0.06573 -0.2027375,-0.127786 -0.3033764,-0.174915 -0.1006387,-0.04713 -0.196545,-0.07844 -0.2783926,-0.09419 -0.1135833,-0.02361 -0.240361,-0.02391 -0.367621,0 -0.1272602,0.02391 -0.2551398,0.07197 -0.3783282,0.134552 -0.1231887,0.06258 -0.2412672,0.13971 -0.3426369,0.232103 -0.1013688,0.09239 -0.1880358,0.199485 -0.2498395,0.312832 -0.036747,0.06769 -0.062966,0.162664 -0.078522,0.272468 -0.015545,0.109803 -0.018861,0.233985 -0.014278,0.359925 0.00458,0.125941 0.019137,0.253916 0.042829,0.370018 0.023699,0.116101 0.054609,0.21909 0.096367,0.299377 0.063472,0.116495 0.1425445,0.219915 0.2355629,0.306105 0.093018,0.08619 0.1999326,0.155246 0.3247913,0.211919 0.1248583,0.05667 0.2657297,0.09988 0.4247272,0.127824 0.1589963,0.02794 0.33637,0.04037 0.5318009,0.04037 0.2739383,0 0.5940184,0.03708 0.7209653,0.08746 0.065144,0.02676 0.1299707,0.06864 0.1891643,0.117733 0.059194,0.0491 0.114258,0.105613 0.1606107,0.16819 0.046353,0.06258 0.084021,0.131262 0.1106425,0.198463 0.026621,0.0672 0.042829,0.135494 0.042829,0.198464 0,0.06927 -0.01414,0.115021 -0.064244,0.161462 -0.050111,0.04644 -0.1385398,0.09198 -0.2855307,0.158098 -0.1937608,0.08816 -0.4780642,0.176209 -0.631737,0.1951 -0.070155,0.0094 -0.1261341,0.01523 -0.1748886,0.01346 -0.048752,-0.0018 -0.093071,-0.0092 -0.1427637,-0.03365 -0.099386,-0.0488 -0.223228,-0.155488 -0.4604184,-0.363289 -0.1336283,-0.119644 -0.2873798,-0.243357 -0.4318652,-0.346471 -0.1444858,-0.103114 -0.276965,-0.184443 -0.3604827,-0.225374 -0.1369691,-0.06297 -0.222821,-0.09741 -0.3105149,-0.107641 -0.087694,-0.01023 -0.1777995,0.0019 -0.3247911,0.03027 -0.09688,0.02046 -0.1973533,0.05426 -0.2926692,0.09755 -0.095314,0.04329 -0.1873196,0.09491 -0.2712543,0.154734 -0.083936,0.05982 -0.1585427,0.12841 -0.2212873,0.198464 -0.062742,0.07005 -0.1110294,0.144657 -0.1427655,0.218647 -0.053452,0.119643 -0.084341,0.261142 -0.092797,0.413746 -0.008452,0.152604 0.00438,0.315689 0.035693,0.474295 0.031319,0.158606 0.080461,0.313099 0.1463351,0.450748 0.065874,0.137649 0.1474911,0.256738 0.2427012,0.346471 0.058461,0.05352 0.1293374,0.101547 0.2070093,0.144643 0.077672,0.0431 0.1615388,0.08367 0.2534086,0.114369 0.1837386,0.0614 0.3927192,0.09419 0.6031839,0.09419 0.065144,0 0.1414413,-0.01411 0.2248544,-0.04373 0.083413,-0.02961 0.172892,-0.07569 0.2676851,-0.131187 0.1895857,-0.110985 0.3951461,-0.268781 0.5889076,-0.46084 0.083517,-0.08344 0.1666143,-0.154655 0.24627,-0.211919 0.079655,-0.05726 0.1574741,-0.09892 0.2355629,-0.131188 0.078089,-0.03227 0.1567418,-0.05545 0.2355632,-0.06391 0.078821,-0.0085 0.1572853,-0.0041 0.2391319,0.01009 0.1737165,0.02991 0.3164675,0.07332 0.424727,0.127825 0.108259,0.05451 0.1807794,0.120323 0.2212873,0.1951 0.040506,0.07478 0.047391,0.158204 0.017847,0.24892 -0.029544,0.09072 -0.094412,0.190323 -0.1963032,0.29265 -0.076836,0.07714 -0.1423879,0.136895 -0.2070094,0.185009 -0.064621,0.04811 -0.1301342,0.08206 -0.1998704,0.107641 -0.1394747,0.05116 -0.3035761,0.06391 -0.5674922,0.06391 -0.2087941,0 -0.4046075,0.01889 -0.5817691,0.05382 -0.1771616,0.03493 -0.3375364,0.08744 -0.4782641,0.154735 -0.1407275,0.0673 -0.260992,0.148445 -0.3604825,0.245557 -0.099492,0.09711 -0.1785433,0.208649 -0.2319939,0.333015 -0.031736,0.07557 -0.048421,0.179126 -0.053538,0.296014 -0.00511,0.116887 0.00345,0.249445 0.021417,0.380108 0.017963,0.130664 0.044612,0.259857 0.082091,0.376745 0.037477,0.11689 0.085746,0.220451 0.139196,0.296014 0.068484,0.09682 0.1434841,0.182665 0.228424,0.255648 0.08494,0.07298 0.1780989,0.132548 0.2748236,0.181646 0.096724,0.0491 0.1995411,0.08584 0.3033764,0.111004 0.1038352,0.02516 0.2078062,0.03918 0.314084,0.04036 0.1062762,0.0012 0.2136072,-0.01079 0.317653,-0.03364 0.1040448,-0.02286 0.2062333,-0.05734 0.3033763,-0.104278 0.097143,-0.04693 0.1892563,-0.107217 0.2748236,-0.17828 0.085566,-0.07106 0.1662435,-0.153678 0.2355627,-0.24892 0.060133,-0.08186 0.1003209,-0.168283 0.1320594,-0.29265 0.031736,-0.124366 0.054908,-0.285034 0.074952,-0.518024 0.033408,-0.374672 0.068357,-0.619328 0.1284876,-0.797218 0.030067,-0.08895 0.066379,-0.162601 0.1106425,-0.225374 0.044264,-0.06277 0.097138,-0.11624 0.1606107,-0.16819 0.063472,-0.05038 0.1397718,-0.0877 0.2248545,-0.114369 0.085083,-0.02666 0.180031,-0.04097 0.2748233,-0.04373 0.094792,-0.0028 0.1893623,0.0056 0.2819617,0.02691 0.092599,0.02135 0.1820391,0.05526 0.260547,0.100914 0.05178,0.02834 0.099858,0.06883 0.1427655,0.117733 0.042908,0.0489 0.079323,0.104826 0.1106425,0.16819 0.062639,0.126727 0.099936,0.275858 0.099936,0.423838 0,0.03148 -0.055071,0.112385 -0.1427656,0.218645 -0.087694,0.106263 -0.2087802,0.237564 -0.3390678,0.366653 -0.1536721,0.147979 -0.273872,0.271879 -0.3676207,0.380109 -0.093749,0.108229 -0.159404,0.203346 -0.2070094,0.299377 -0.047605,0.09603 -0.077557,0.191363 -0.092797,0.302742 -0.015245,0.111378 -0.017617,0.235923 -0.014278,0.3902 0.00668,0.210949 0.033878,0.392212 0.085661,0.54157 0.051781,0.149358 0.1284323,0.269621 0.2319935,0.36329 0.1035611,0.09367 0.2341489,0.157945 0.3961743,0.201828 0.1620223,0.04388 0.3581696,0.06728 0.585338,0.06728 0.2204859,0 0.4112682,-0.02002 0.5781998,-0.06055 0.1669322,-0.04054 0.30989,-0.103146 0.4247272,-0.185008 0.1148361,-0.08186 0.2034814,-0.185495 0.2676851,-0.309469 0.064205,-0.123972 0.1027482,-0.267058 0.1177815,-0.433929 0.010018,-0.110199 0.00758,-0.215856 -0.00714,-0.319561 -0.014715,-0.103705 -0.041583,-0.206138 -0.082089,-0.306105 -0.040508,-0.09997 -0.093274,-0.200395 -0.1606107,-0.299377 -0.067341,-0.09898 -0.1510659,-0.195264 -0.2462755,-0.296016 -0.2204869,-0.23299 -0.3430298,-0.380633 -0.4140195,-0.511296 -0.035494,-0.06533 -0.057915,-0.124239 -0.071383,-0.191737 -0.013472,-0.0675 -0.019736,-0.143943 -0.021417,-0.232103 -0.00334,-0.100753 0.00599,-0.189309 0.024984,-0.269103 0.018999,-0.0798 0.046634,-0.150917 0.089228,-0.211919 0.042594,-0.061 0.1003095,-0.11036 0.1677497,-0.154734 0.06744,-0.04438 0.1455912,-0.0811 0.2391319,-0.111006 0.1286189,-0.04093 0.2547873,-0.06004 0.37119,-0.05718 0.1164044,0.0029 0.2247601,0.02774 0.3212223,0.07064 0.096464,0.0429 0.1810419,0.10244 0.2498395,0.181644 0.068799,0.0792 0.1200659,0.177514 0.1534717,0.289287 0.033408,0.125939 0.067813,0.397681 0.067813,0.605482 0,0.23299 0.020219,0.415637 0.067813,0.578573 0.047605,0.162936 0.1217516,0.306132 0.2319939,0.454112 0.1002219,0.138533 0.2100722,0.241849 0.3462061,0.322924 0.1361332,0.08107 0.2994648,0.137349 0.503248,0.17828 0.100222,0.02204 0.196708,0.03462 0.289098,0.03364 0.09239,-9.75e-4 0.180409,-0.01595 0.267687,-0.04036 0.08727,-0.02441 0.172102,-0.05943 0.256976,-0.107642 0.08488,-0.04821 0.16822,-0.109229 0.253409,-0.181645 0.09939,-0.08422 0.186615,-0.173534 0.256979,-0.26574 0.07036,-0.0922 0.125989,-0.185298 0.167747,-0.282559 0.04176,-0.09726 0.06852,-0.196625 0.08209,-0.296013 0.01356,-0.09939 0.01421,-0.200789 0,-0.299378 -0.0142,-0.09858 -0.0441,-0.194421 -0.08565,-0.289282 -0.04155,-0.09486 -0.09569,-0.187624 -0.16418,-0.275831 -0.06849,-0.08821 -0.15127,-0.173658 -0.24627,-0.252285 -0.095,-0.07863 -0.203691,-0.149164 -0.324792,-0.215282 -0.187081,-0.103901 -0.339782,-0.165761 -0.506818,-0.191737 -0.167036,-0.02598 -0.348375,-0.0176 -0.5889062,0.02018 -0.1236055,0.01889 -0.2261809,0.02819 -0.314084,0.02691 -0.087901,-0.0013 -0.1586486,-0.01142 -0.2212873,-0.037 -0.062639,-0.02558 -0.1163675,-0.06708 -0.1641801,-0.121097 -0.047815,-0.05402 -0.092199,-0.121971 -0.1356266,-0.208555 -0.060133,-0.118069 -0.088516,-0.229705 -0.092797,-0.333016 -0.00428,-0.10331 0.016212,-0.19991 0.064244,-0.282558 0.048022,-0.08265 0.1209411,-0.152472 0.2177178,-0.208555 0.096777,-0.05608 0.2185031,-0.09748 0.3604829,-0.121097 0.08853,-0.01417 0.1671187,-0.01708 0.2427013,-0.01009 0.075583,0.007 0.1480184,0.02294 0.2248542,0.05718 0.153672,0.06848 0.323621,0.199648 0.567492,0.413747 0.300664,0.261326 0.481633,0.408465 0.635306,0.491113 0.07684,0.04132 0.146121,0.06607 0.221285,0.08073 0.07517,0.01466 0.156528,0.02018 0.253409,0.02018 0.120266,-0.0016 0.236172,-0.01665 0.346207,-0.04037 0.110034,-0.02371 0.214471,-0.05644 0.310514,-0.100914 0.09605,-0.04447 0.182249,-0.09761 0.260548,-0.161462 0.0783,-0.06386 0.146648,-0.140149 0.20344,-0.22201 0.08352,-0.122792 0.131152,-0.201061 0.157041,-0.312833 0.02589,-0.111772 0.03212,-0.255837 0.03212,-0.504569 0,-0.261326 -0.0046,-0.401455 -0.03212,-0.504569 -0.02756,-0.103114 -0.07801,-0.169212 -0.174886,-0.282558 -0.06515,-0.07714 -0.152438,-0.156735 -0.24984,-0.232102 -0.0974,-0.07537 -0.205093,-0.146372 -0.314083,-0.208555 -0.108992,-0.06218 -0.221315,-0.113785 -0.321223,-0.151371 -0.09991,-0.03758 -0.186824,-0.06234 -0.256978,-0.06391 -0.08352,0 -0.157016,0.0083 -0.228424,0.02355 -0.07141,0.01525 -0.142552,0.0384 -0.217716,0.07737 -0.150332,0.07793 -0.324763,0.213749 -0.585337,0.437293 -0.230509,0.195208 -0.379649,0.308124 -0.542509,0.386836 -0.1628602,0.07871 -0.337298,0.121608 -0.6245991,0.178281 -0.058463,0.01102 -0.116268,0.01375 -0.1677494,0.0067 -0.051481,-0.007 -0.096132,-0.02491 -0.139196,-0.04709 -0.086128,-0.04437 -0.1560234,-0.114062 -0.1998704,-0.201827 -0.043847,-0.08776 -0.063456,-0.191246 -0.053538,-0.299378 0.00993,-0.108131 0.049754,-0.220813 0.1249204,-0.326287 0.056792,-0.08186 0.1093921,-0.147006 0.1677497,-0.198464 0.058358,-0.05146 0.1239094,-0.09158 0.2070093,-0.121097 0.0831,-0.02952 0.1830662,-0.04787 0.314084,-0.06391 0.1310185,-0.01604 0.2904271,-0.02934 0.4925405,-0.04036 0.354114,-0.01574 0.548074,-0.02649 0.681704,-0.05718 0.13363,-0.0307 0.208096,-0.08003 0.328361,-0.16819 0.08018,-0.05982 0.154262,-0.132911 0.221285,-0.211919 0.06702,-0.07901 0.125612,-0.162945 0.174887,-0.252284 0.04927,-0.08934 0.09085,-0.181653 0.117781,-0.272467 0.02693,-0.09081 0.03926,-0.182305 0.03926,-0.26574 0,-0.08422 -0.01262,-0.16984 -0.03569,-0.255648 -0.02307,-0.08581 -0.05377,-0.171769 -0.09637,-0.255648 -0.08519,-0.167758 -0.207795,-0.328639 -0.349776,-0.467567 -0.141978,-0.138929 -0.304319,-0.25442 -0.474695,-0.33638 -0.08519,-0.04098 -0.173583,-0.07272 -0.260546,-0.09418 -0.08696,-0.02146 -0.171791,-0.03185 -0.256978,-0.03027 -0.09521,0.0016 -0.1922,0.01139 -0.2855301,0.03364 -0.093332,0.02224 -0.1835613,0.05583 -0.2712541,0.09755 -0.087694,0.04172 -0.1715425,0.09135 -0.2498395,0.151372 -0.078298,0.06002 -0.1525736,0.131416 -0.2177178,0.208554 -0.09688,0.113348 -0.1483916,0.180522 -0.1784558,0.299378 -0.030067,0.118857 -0.036376,0.287484 -0.046399,0.605483 -0.013357,0.321148 -0.026205,0.49178 -0.057107,0.61221 -0.0309,0.12043 -0.081575,0.18961 -0.1784557,0.306105 -0.091869,0.108623 -0.2009367,0.199738 -0.3176531,0.269103 -0.1167152,0.06937 -0.239382,0.119062 -0.3604824,0.144644 -0.1210999,0.02558 -0.2411822,0.02609 -0.3462064,0.0034 -0.1050234,-0.02273 -0.1956307,-0.06908 -0.2641158,-0.144643 -0.046769,-0.05195 -0.088779,-0.119634 -0.1213509,-0.1951 -0.032572,-0.07547 -0.05635,-0.159151 -0.071383,-0.242193 -0.015038,-0.08304 -0.020127,-0.16415 -0.014278,-0.238829 0.00585,-0.07468 0.023471,-0.14136 0.053538,-0.191736 0.040089,-0.08186 0.2649156,-0.33506 0.4854024,-0.561753 0.1436499,-0.144833 0.2630413,-0.286896 0.3533444,-0.427202 0.090303,-0.140306 0.1519979,-0.279362 0.1891643,-0.417111 0.037166,-0.137746 0.047886,-0.273225 0.032123,-0.410381 -0.015752,-0.137158 -0.056435,-0.275213 -0.1249204,-0.413747 -0.073494,-0.147979 -0.1399744,-0.248436 -0.2427012,-0.339743 -0.1027275,-0.09131 -0.243729,-0.17236 -0.4675566,-0.282559 -0.1352973,-0.06612 -0.2759414,-0.112924 -0.421158,-0.137916 -0.108913,-0.01875 -0.2197881,-0.02435 -0.3283603,-0.02019 z m 0.1320571,4.712674 c 0.4698751,-0.01795 0.9301951,0.28307 1.0279108,0.733307 0.038679,0.182279 -0.038481,0.280548 -0.1391961,0.54157 -0.038097,0.09874 -0.211196,0.208762 -0.3069457,0.285923 -0.1876443,0.151213 -0.5802385,0.161462 -0.8030554,0.161462 -0.4209295,0 -0.762253,-0.567997 -0.635306,-1.052867 0.05345,-0.195208 0.3514028,-0.532852 0.5318011,-0.602119 0.105233,-0.04014 0.2163591,-0.06313 0.3247913,-0.06728 z"
-       id="path4462-1"
-       inkscape:connector-curvature="0" />
+       id="path4462-1" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0"
        d="m 102.16475,-22.591734 c 0.0699,0.0027 0.13765,0.0058 0.2068,0.01299 0.27664,0.02888 0.54982,0.09115 0.79965,0.194908 0.24983,0.103757 0.48244,0.245945 0.68246,0.422297 0.12581,0.109462 0.22693,0.215575 0.3102,0.324847 0.0833,0.109269 0.14704,0.220433 0.19303,0.344336 0.092,0.247803 0.11542,0.540281 0.0896,0.935554 -0.0226,0.340542 -0.0438,0.607708 -0.0758,0.825107 -0.032,0.2174 -0.0746,0.387632 -0.14476,0.545741 -0.0702,0.158108 -0.1664,0.29861 -0.30331,0.46128 -0.13691,0.16267 -0.3192,0.347143 -0.55148,0.578225 -0.47747,0.486488 -0.9437,0.997509 -1.03403,1.143456 -0.0774,0.139865 -0.11768,0.272824 -0.13096,0.402808 -0.0134,0.129984 0.002,0.255614 0.0551,0.383317 0.0532,0.127704 0.13976,0.256791 0.26195,0.389815 0.12219,0.133024 0.28209,0.269855 0.47566,0.415802 0.18066,0.133784 0.56489,0.260305 0.93751,0.337839 0.18631,0.03877 0.37006,0.0633 0.52391,0.07147 0.15386,0.0082 0.27693,9.55e-4 0.34467,-0.03248 0.10969,-0.05777 0.21097,-0.153185 0.30332,-0.279367 0.0923,-0.126184 0.17557,-0.28272 0.24817,-0.474274 0.14517,-0.38311 0.25169,-0.893923 0.30331,-1.520277 0.0452,-0.462164 0.0888,-0.789075 0.15165,-1.046002 0.0629,-0.256927 0.13891,-0.440854 0.25506,-0.617206 0.0806,-0.124663 0.2097,-0.264653 0.36535,-0.402808 0.15565,-0.138155 0.34413,-0.275866 0.5377,-0.402809 0.19355,-0.126943 0.39157,-0.246813 0.58594,-0.337839 0.19439,-0.09103 0.37962,-0.151508 0.5377,-0.181913 0.21937,-0.04561 0.46424,-0.04618 0.71003,0 0.24579,0.04618 0.49278,0.139014 0.73071,0.259876 0.23793,0.120862 0.46599,0.269844 0.66178,0.448287 0.19579,0.178442 0.36318,0.385292 0.48254,0.604212 0.071,0.130744 0.12162,0.314171 0.15167,0.52625 0.0301,0.212078 0.0365,0.451924 0.0276,0.695169 -0.009,0.243244 -0.037,0.490419 -0.0827,0.71466 -0.0458,0.22424 -0.10547,0.423156 -0.18612,0.578224 -0.12261,0.225001 -0.27532,0.424749 -0.45497,0.591219 -0.17965,0.16647 -0.38616,0.299845 -0.62731,0.409305 -0.24116,0.109459 -0.51324,0.192914 -0.82033,0.246883 -0.30709,0.05397 -0.64967,0.07796 -1.02713,0.07796 -0.52909,0 -1.1473,0.07162 -1.39249,0.168919 -0.12581,0.05169 -0.25103,0.132566 -0.36536,0.227393 -0.11431,0.09483 -0.22069,0.203983 -0.31021,0.324846 -0.0895,0.120861 -0.16228,0.253524 -0.21371,0.383317 -0.0514,0.129794 -0.0827,0.261696 -0.0827,0.383318 0,0.133784 0.0273,0.222155 0.12408,0.311852 0.0968,0.0897 0.26758,0.177652 0.55148,0.305354 0.37424,0.170271 0.92335,0.340334 1.22016,0.376821 0.1355,0.01825 0.24361,0.02941 0.33778,0.02599 0.0942,-0.0034 0.17976,-0.01785 0.27574,-0.06497 0.19194,-0.09426 0.43115,-0.300313 0.88926,-0.701666 0.25809,-0.231082 0.55505,-0.470025 0.83412,-0.669181 0.27906,-0.199156 0.53493,-0.356239 0.69624,-0.435293 0.26455,-0.121622 0.43036,-0.188137 0.59974,-0.207901 0.16937,-0.01977 0.3434,0.0037 0.62731,0.05847 0.18711,0.03953 0.38117,0.104794 0.56526,0.188411 0.1841,0.08362 0.3618,0.183316 0.52391,0.298858 0.16212,0.115541 0.30621,0.248014 0.4274,0.383318 0.12118,0.135305 0.21444,0.279393 0.27574,0.422299 0.10324,0.231082 0.1629,0.504376 0.17923,0.799119 0.0163,0.294744 -0.009,0.609729 -0.0689,0.916064 -0.0605,0.306336 -0.1554,0.604728 -0.28264,0.870586 -0.12723,0.265858 -0.28487,0.49587 -0.46876,0.6691812 -0.11291,0.1033784 -0.2498,0.1961321 -0.39982,0.2793673 -0.15001,0.083236 -0.312,0.1616028 -0.48944,0.2208941 -0.35488,0.1185802 -0.75851,0.1819125 -1.165,0.1819125 -0.12583,0 -0.27319,-0.02726 -0.43429,-0.08446 -0.16111,-0.0572 -0.33393,-0.1461991 -0.51702,-0.2533795 -0.36617,-0.2143577 -0.76319,-0.5191286 -1.13743,-0.8900756 -0.16132,-0.161149 -0.3218,-0.298706 -0.47565,-0.409305 -0.15385,-0.110601 -0.30415,-0.191049 -0.45497,-0.25338 -0.15082,-0.06233 -0.30274,-0.107098 -0.45497,-0.123441 -0.15225,-0.01635 -0.30379,-0.0079 -0.46187,0.01949 -0.33552,0.05777 -0.61123,0.141605 -0.82033,0.246883 -0.2091,0.105278 -0.34916,0.232394 -0.42739,0.376821 -0.0782,0.144426 -0.0915,0.305559 -0.0345,0.480771 0.0571,0.1752112 0.18234,0.3675946 0.37914,0.5652306 0.1484,0.1489862 0.27501,0.2644026 0.39983,0.3573298 0.12481,0.092928 0.25134,0.1584916 0.38603,0.2079011 0.26939,0.098819 0.58634,0.1234413 1.09607,0.1234413 0.40327,0 0.78147,0.036489 1.12364,0.1039518 0.34218,0.067463 0.65193,0.1688746 0.92373,0.2988576 0.27181,0.1299827 0.50409,0.2867101 0.69625,0.4742743 0.19215,0.1875639 0.34484,0.4029901 0.44808,0.6431937 0.0613,0.1459474 0.0935,0.3459671 0.1034,0.5717279 0.01,0.2257602 -0.007,0.4817847 -0.0414,0.7341507 -0.0347,0.2523659 -0.0862,0.5018925 -0.15856,0.7276535 -0.0724,0.2257628 -0.1656,0.4257813 -0.26884,0.5717279 -0.13228,0.1869955 -0.27714,0.3528061 -0.44119,0.4937648 -0.16406,0.140959 -0.34399,0.2560053 -0.5308,0.3508333 -0.18681,0.094828 -0.3854,0.1657958 -0.58595,0.2143975 -0.20056,0.048602 -0.40136,0.075682 -0.60663,0.077963 -0.20525,0.00229 -0.41256,-0.020841 -0.61352,-0.06497 -0.20095,-0.044134 -0.39833,-0.1107574 -0.58595,-0.2014046 -0.18761,-0.09064 -0.36552,-0.2070766 -0.53079,-0.3443289 -0.16527,-0.1372521 -0.32109,-0.2968182 -0.45497,-0.4807711 -0.11615,-0.1581087 -0.19376,-0.3250284 -0.25506,-0.5652308 -0.0613,-0.2402037 -0.10605,-0.5505219 -0.14477,-1.0005238 -0.0645,-0.7236516 -0.13202,-1.1961846 -0.24816,-1.5397672 -0.0581,-0.1717913 -0.1282,-0.3140506 -0.21371,-0.4352927 -0.0855,-0.1212426 -0.18762,-0.2245064 -0.31021,-0.3248454 -0.1226,-0.097298 -0.26996,-0.1693956 -0.43429,-0.2208941 -0.16433,-0.051498 -0.34771,-0.07914 -0.5308,-0.08446 -0.18308,-0.00531 -0.36574,0.010744 -0.54459,0.051975 -0.17884,0.041238 -0.35159,0.1067313 -0.50322,0.194908 -0.10002,0.054729 -0.19287,0.1329443 -0.27574,0.2273906 -0.0829,0.094446 -0.15322,0.2024641 -0.21369,0.3248457 -0.12099,0.2447637 -0.19303,0.5327981 -0.19303,0.81861 0,0.060812 0.10637,0.2170625 0.27574,0.4222992 0.16938,0.2052386 0.40325,0.4588374 0.65489,0.7081629 0.2968,0.2858119 0.52896,0.5251124 0.71003,0.7341505 0.18108,0.2090379 0.30787,0.39275 0.39982,0.5782249 0.0919,0.1854748 0.1498,0.3696021 0.17923,0.5847216 0.0294,0.215118 0.034,0.455667 0.0276,0.7536413 -0.0129,0.407434 -0.0654,0.757529 -0.16544,1.0460022 -0.10001,0.2884728 -0.24806,0.5207525 -0.44808,0.7016659 -0.20003,0.1809128 -0.45224,0.3050594 -0.76518,0.3898143 -0.31294,0.084756 -0.69178,0.1299379 -1.13053,0.1299379 -0.42586,0 -0.79434,-0.03865 -1.11675,-0.1169448 -0.32242,-0.078292 -0.59853,-0.1992208 -0.82033,-0.3573298 -0.221793,-0.1581077 -0.393008,-0.3582718 -0.517014,-0.5977156 -0.124011,-0.2394439 -0.198464,-0.5158025 -0.22748,-0.8381011 -0.01934,-0.2128395 -0.01474,-0.41691 0.01382,-0.6172062 0.02842,-0.2002952 0.08033,-0.3981429 0.158554,-0.5912184 0.07823,-0.1930757 0.180156,-0.3870497 0.310207,-0.5782248 0.130044,-0.1911762 0.291763,-0.3771327 0.475653,-0.5717278 0.42585,-0.4500019 0.66253,-0.7351642 0.79964,-0.98753 0.0686,-0.1261836 0.11185,-0.2399599 0.13788,-0.3703238 0.026,-0.1303641 0.0381,-0.2780156 0.0414,-0.4482867 0.006,-0.1945965 -0.0115,-0.3656344 -0.0483,-0.5197527 -0.0367,-0.1541166 -0.0901,-0.2914836 -0.17235,-0.4093049 -0.0823,-0.1178223 -0.19374,-0.2131511 -0.32399,-0.2988578 -0.13025,-0.085706 -0.2812,-0.156627 -0.46187,-0.2143976 -0.24841,-0.079055 -0.492097,-0.1159576 -0.71692,-0.1104483 -0.224831,0.00551 -0.434106,0.05358 -0.620415,0.1364344 -0.186304,0.082854 -0.349669,0.1978546 -0.482548,0.3508329 -0.132877,0.1529773 -0.231897,0.3428547 -0.29642,0.5587341 -0.06453,0.2432455 -0.130965,0.7680904 -0.130965,1.1694434 0,0.4500019 -0.03903,0.8027706 -0.130989,1.1174681 -0.09193,0.3146975 -0.23515,0.5912705 -0.448076,0.8770822 -0.193558,0.2675688 -0.405737,0.4671144 -0.668672,0.6237032 -0.262933,0.1565896 -0.578393,0.2652819 -0.971985,0.3443362 -0.193558,0.042569 -0.379927,0.06687 -0.558375,0.06497 -0.178452,-0.00187 -0.348444,-0.030835 -0.517014,-0.077963 -0.168572,-0.047128 -0.332402,-0.1147835 -0.496333,-0.2079011 -0.16392,-0.093118 -0.324904,-0.2109673 -0.489436,-0.350833 -0.191946,-0.1626697 -0.360433,-0.3351697 -0.496334,-0.5132556 -0.135893,-0.1780859 -0.243342,-0.3578914 -0.323996,-0.5457403 -0.08065,-0.1878481 -0.132347,-0.3797694 -0.158554,-0.5717278 -0.02621,-0.1919589 -0.02743,-0.3878103 0,-0.5782249 0.02743,-0.1904158 0.08518,-0.3755167 0.16544,-0.558734 0.08026,-0.1832163 0.18483,-0.3623804 0.317101,-0.5327465 0.132278,-0.1703653 0.292161,-0.3354066 0.475651,-0.4872678 0.183495,-0.1518605 0.393413,-0.2880992 0.627311,-0.4158024 0.361328,-0.2006766 0.65626,-0.3201545 0.978877,-0.3703238 0.322616,-0.05017 0.672861,-0.033991 1.137428,0.038982 0.238737,0.036486 0.436855,0.054445 0.606631,0.051975 0.169769,-0.00247 0.306416,-0.022062 0.427396,-0.071467 0.120994,-0.04941 0.224762,-0.129559 0.317104,-0.2338897 0.09235,-0.1043282 0.178083,-0.2355773 0.261952,-0.4028083 0.116135,-0.2280413 0.170966,-0.4436574 0.179234,-0.6431942 0.0083,-0.199537 -0.03132,-0.386111 -0.12408,-0.54574 -0.09276,-0.159629 -0.233587,-0.294489 -0.420504,-0.402808 -0.186926,-0.10832 -0.422021,-0.18828 -0.696245,-0.23389 -0.17099,-0.02736 -0.322776,-0.03298 -0.468761,-0.01949 -0.14598,0.01349 -0.285888,0.04432 -0.434291,0.110448 -0.296806,0.132264 -0.625049,0.385604 -1.096069,0.799119 -0.580709,0.5047323 -0.930235,0.7889198 -1.227043,0.948549 -0.148399,0.079815 -0.28222,0.1276095 -0.427399,0.1559264 -0.145174,0.028315 -0.302319,0.038982 -0.489438,0.038982 -0.232284,-0.00304 -0.456148,-0.032163 -0.668668,-0.077963 -0.212534,-0.045797 -0.414233,-0.1090124 -0.599736,-0.194908 -0.185498,-0.085896 -0.351999,-0.1885187 -0.503228,-0.3118514 -0.151231,-0.1233317 -0.283242,-0.270687 -0.392931,-0.428796 -0.161318,-0.237162 -0.253307,-0.388333 -0.303312,-0.604212 -0.05002,-0.215878 -0.06204,-0.494129 -0.06204,-0.974536 0,-0.504732 0.0088,-0.77538 0.06204,-0.974536 0.05322,-0.199156 0.150655,-0.326821 0.337781,-0.545741 0.125807,-0.148986 0.294421,-0.30272 0.482544,-0.448286 0.188123,-0.145566 0.396123,-0.282707 0.60663,-0.402809 0.210508,-0.1201 0.427452,-0.219767 0.620416,-0.29236 0.192959,-0.07259 0.360836,-0.1204 0.496333,-0.123442 0.161318,0 0.303266,0.01603 0.441184,0.04548 0.13792,0.02946 0.275329,0.07418 0.420504,0.14943 0.290355,0.150507 0.627255,0.41284 1.130536,0.844598 0.445211,0.377029 0.733262,0.595117 1.047814,0.747145 0.314552,0.152027 0.651465,0.234877 1.206366,0.344336 0.112911,0.02129 0.224555,0.02656 0.323994,0.01299 0.09944,-0.01356 0.185682,-0.0481 0.268847,-0.09096 0.166338,-0.08571 0.301349,-0.220304 0.386036,-0.389815 0.08468,-0.16951 0.12256,-0.369377 0.1034,-0.578225 -0.01911,-0.208848 -0.0961,-0.426483 -0.241272,-0.6302 -0.109687,-0.158107 -0.21129,-0.283929 -0.323994,-0.383317 -0.112727,-0.09939 -0.239324,-0.17688 -0.399826,-0.23389 -0.160512,-0.05701 -0.353575,-0.09247 -0.606628,-0.123441 -0.25307,-0.03096 -0.560953,-0.05667 -0.951321,-0.07795 -0.683947,-0.03041 -1.058568,-0.05116 -1.31666,-0.110447 -0.258095,-0.05929 -0.40192,-0.154575 -0.634203,-0.324846 -0.154856,-0.115541 -0.297949,-0.256707 -0.427399,-0.409305 -0.12945,-0.152598 -0.24261,-0.314716 -0.337781,-0.487268 -0.09517,-0.172551 -0.175465,-0.350848 -0.227485,-0.526249 -0.05202,-0.175402 -0.07583,-0.352107 -0.07583,-0.513256 0,-0.16267 0.02437,-0.328031 0.06895,-0.493765 0.04456,-0.165734 0.10386,-0.331761 0.186119,-0.493765 0.164542,-0.324009 0.401342,-0.634741 0.675563,-0.90307 0.274224,-0.268329 0.587768,-0.491392 0.916835,-0.649691 0.164542,-0.07915 0.335267,-0.140462 0.503228,-0.181913 0.167973,-0.04145 0.331799,-0.06151 0.496334,-0.05847 0.183886,0.003 0.371219,0.02202 0.551478,0.06497 0.18027,0.04295 0.354535,0.107835 0.523908,0.18841 0.169378,0.08057 0.33132,0.17644 0.482546,0.292361 0.151231,0.115921 0.294683,0.253821 0.420504,0.402808 0.18711,0.21892 0.286606,0.348663 0.344676,0.578225 0.05808,0.229561 0.07026,0.555251 0.08961,1.169443 0.02582,0.620273 0.05062,0.949835 0.110285,1.182437 0.05969,0.232602 0.157564,0.366218 0.344674,0.591219 0.177438,0.209798 0.388095,0.385778 0.613525,0.519752 0.225431,0.133974 0.462348,0.229959 0.696246,0.279368 0.233893,0.04941 0.465825,0.05039 0.668665,0.0065 0.20284,-0.0439 0.37785,-0.13342 0.51012,-0.279367 0.0903,-0.100339 0.17147,-0.231065 0.23438,-0.376821 0.0629,-0.145756 0.10884,-0.307388 0.13787,-0.467777 0.029,-0.160389 0.0389,-0.317044 0.0276,-0.461281 -0.0113,-0.144235 -0.0453,-0.273026 -0.1034,-0.370323 -0.0774,-0.158109 -0.51166,-0.647144 -0.93752,-1.084984 -0.277445,-0.279731 -0.508038,-0.554118 -0.682452,-0.825107 -0.174421,-0.270989 -0.293575,-0.539568 -0.365356,-0.805617 -0.07178,-0.266048 -0.09248,-0.527714 -0.06204,-0.792622 0.03044,-0.264909 0.108996,-0.531552 0.241274,-0.79912 0.14195,-0.285812 0.270348,-0.479834 0.468756,-0.656186 0.198418,-0.176354 0.470748,-0.332902 0.903048,-0.545741 0.26132,-0.127704 0.53296,-0.218104 0.81343,-0.266374 0.21037,-0.0362 0.42451,-0.04705 0.63421,-0.03898 z m -0.25506,9.102167 c -0.90753,-0.03466 -1.7966,0.546728 -1.985329,1.416326 -0.07471,0.352058 0.07431,0.541856 0.268849,1.046002 0.0736,0.1907 0.4079,0.403207 0.59284,0.552237 0.36242,0.292057 1.12068,0.311852 1.55104,0.311852 0.81299,0 1.47223,-1.097042 1.22704,-2.033532 -0.10323,-0.377029 -0.6787,-1.029163 -1.02713,-1.162947 -0.20325,-0.07753 -0.41788,-0.121938 -0.62731,-0.129938 z"
-       id="path4462-18"
-       inkscape:connector-curvature="0" />
+       id="path4462-18" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:0.7;fill:#cccccc;fill-opacity:1.0;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1.0"
        d="m 121.16904,-22.998687 c 0.0362,0.0014 0.0713,0.003 0.10708,0.0067 0.14324,0.01496 0.28468,0.04719 0.41403,0.100913 0.12935,0.05372 0.24978,0.12734 0.35334,0.218648 0.0651,0.05667 0.11749,0.111615 0.1606,0.168189 0.0431,0.05658 0.0761,0.11413 0.1,0.178283 0.0476,0.128302 0.0598,0.279733 0.0464,0.484385 -0.0117,0.176319 -0.0226,0.314643 -0.0393,0.427202 -0.0166,0.11256 -0.0386,0.200696 -0.075,0.282559 -0.0363,0.08186 -0.0862,0.154605 -0.15704,0.23883 -0.0709,0.08422 -0.16525,0.179734 -0.28553,0.299378 -0.24721,0.251881 -0.4886,0.516463 -0.53537,0.592027 -0.0401,0.07242 -0.0609,0.141256 -0.0678,0.208555 -0.007,0.0673 0.001,0.132346 0.0286,0.198464 0.0276,0.06612 0.0724,0.132954 0.13561,0.201828 0.0633,0.06887 0.14605,0.139718 0.24628,0.215282 0.0935,0.06927 0.29247,0.134774 0.4854,0.174918 0.0965,0.02007 0.1916,0.03277 0.27125,0.037 0.0797,0.0042 0.14338,4.87e-4 0.17845,-0.01682 0.0568,-0.02991 0.10923,-0.07931 0.15704,-0.144643 0.0478,-0.06533 0.0909,-0.146379 0.1285,-0.245556 0.0752,-0.198357 0.13032,-0.462831 0.15703,-0.787128 0.0234,-0.239287 0.046,-0.408547 0.0785,-0.541571 0.0326,-0.133024 0.0719,-0.228253 0.13205,-0.31956 0.0417,-0.06455 0.10856,-0.137025 0.18916,-0.208554 0.0806,-0.07153 0.17818,-0.142831 0.2784,-0.208557 0.10022,-0.06573 0.20274,-0.127786 0.30337,-0.174915 0.10064,-0.04713 0.19655,-0.07844 0.27839,-0.09419 0.11358,-0.02361 0.24037,-0.02391 0.36762,0 0.12726,0.02391 0.25514,0.07197 0.37833,0.134552 0.12318,0.06258 0.24127,0.13971 0.34264,0.232103 0.10137,0.09239 0.18803,0.199485 0.24984,0.312832 0.0367,0.06769 0.063,0.162664 0.0785,0.272468 0.0157,0.109803 0.0189,0.233985 0.0143,0.359925 -0.005,0.125941 -0.0191,0.253916 -0.0428,0.370018 -0.0237,0.116101 -0.0546,0.21909 -0.0964,0.299377 -0.0635,0.116495 -0.14255,0.219915 -0.23557,0.306105 -0.093,0.08619 -0.19993,0.155246 -0.32479,0.211919 -0.12486,0.05667 -0.26573,0.09988 -0.42473,0.127824 -0.15899,0.02794 -0.33637,0.04037 -0.5318,0.04037 -0.27393,0 -0.59401,0.03708 -0.72096,0.08746 -0.0652,0.02676 -0.12998,0.06864 -0.18916,0.117733 -0.0592,0.0491 -0.11425,0.105613 -0.1606,0.16819 -0.0464,0.06258 -0.084,0.131262 -0.11063,0.198463 -0.0266,0.0672 -0.0428,0.135494 -0.0428,0.198464 0,0.06927 0.014,0.115021 0.0643,0.161462 0.0501,0.04644 0.13854,0.09198 0.28553,0.158098 0.19377,0.08816 0.47807,0.176209 0.63174,0.1951 0.0701,0.0094 0.12613,0.01523 0.17488,0.01346 0.0487,-0.0018 0.0931,-0.0092 0.14276,-0.03364 0.0994,-0.0488 0.22322,-0.155488 0.46042,-0.36329 0.13363,-0.119643 0.28738,-0.243357 0.43186,-0.34647 0.14449,-0.103114 0.27697,-0.184444 0.36049,-0.225374 0.13697,-0.06297 0.22282,-0.09741 0.31051,-0.107642 0.0877,-0.01023 0.1778,0.0019 0.32479,0.03027 0.0969,0.02047 0.19736,0.05426 0.29267,0.09755 0.0953,0.04329 0.18732,0.09491 0.27125,0.154735 0.0839,0.05982 0.15854,0.128409 0.22129,0.198464 0.0627,0.07005 0.11102,0.144656 0.14276,0.218646 0.0534,0.119644 0.0843,0.261142 0.0928,0.413747 0.009,0.152604 -0.004,0.315688 -0.0357,0.474294 -0.0313,0.158606 -0.0805,0.3131 -0.14633,0.450749 -0.0659,0.137648 -0.1475,0.256738 -0.2427,0.34647 -0.0585,0.05353 -0.12933,0.101548 -0.20701,0.144643 -0.0777,0.0431 -0.16155,0.08367 -0.25341,0.114369 -0.18374,0.0614 -0.39271,0.09419 -0.60318,0.09419 -0.0652,0 -0.14144,-0.01411 -0.22486,-0.04373 -0.0834,-0.02961 -0.1729,-0.07569 -0.26768,-0.131188 -0.18958,-0.110985 -0.39515,-0.26878 -0.58891,-0.460839 -0.0835,-0.08344 -0.16661,-0.154656 -0.24627,-0.211919 -0.0796,-0.05726 -0.15747,-0.09892 -0.23556,-0.131188 -0.0781,-0.03227 -0.15674,-0.05545 -0.23556,-0.06391 -0.0788,-0.0085 -0.15729,-0.0041 -0.23914,0.01009 -0.1737,0.02991 -0.31646,0.07332 -0.42472,0.127824 -0.10826,0.05451 -0.18078,0.120323 -0.22129,0.1951 -0.0405,0.07478 -0.0474,0.158204 -0.018,0.248921 0.0296,0.09072 0.0944,0.190323 0.1963,0.292649 0.0768,0.07714 0.14239,0.136896 0.20701,0.185009 0.0646,0.04811 0.13013,0.08206 0.19986,0.107641 0.13947,0.05116 0.30358,0.06391 0.5675,0.06391 0.2088,0 0.4046,0.01889 0.58176,0.05382 0.17717,0.03493 0.33754,0.08744 0.47827,0.154735 0.14073,0.0673 0.26099,0.148445 0.36048,0.245556 0.0995,0.09711 0.17854,0.208649 0.23199,0.333016 0.0317,0.07556 0.0484,0.179125 0.0536,0.296014 0.005,0.116887 -0.003,0.249445 -0.0214,0.380108 -0.018,0.130663 -0.0446,0.259857 -0.0821,0.376745 -0.0375,0.11689 -0.0857,0.22045 -0.13919,0.296014 -0.0685,0.09682 -0.14349,0.182665 -0.22842,0.255648 -0.0849,0.07298 -0.17811,0.132548 -0.27482,0.181645 -0.0967,0.0491 -0.19955,0.08584 -0.30338,0.111005 -0.10384,0.02516 -0.20781,0.03918 -0.31408,0.04036 -0.10628,0.0012 -0.21362,-0.01079 -0.31766,-0.03364 -0.10404,-0.02286 -0.20622,-0.05734 -0.30337,-0.104278 -0.0971,-0.04693 -0.18926,-0.107218 -0.27483,-0.178281 -0.0856,-0.07106 -0.16624,-0.153677 -0.23556,-0.248919 -0.0601,-0.08186 -0.10031,-0.168284 -0.13205,-0.29265 -0.0317,-0.124366 -0.0549,-0.285034 -0.075,-0.518024 -0.0334,-0.374673 -0.0683,-0.619328 -0.12847,-0.797219 -0.0301,-0.08894 -0.0664,-0.162601 -0.11066,-0.225374 -0.0443,-0.06277 -0.0971,-0.116239 -0.1606,-0.168189 -0.0635,-0.05038 -0.13977,-0.0877 -0.22486,-0.114369 -0.0851,-0.02666 -0.18004,-0.04097 -0.27482,-0.04373 -0.0948,-0.0028 -0.18937,0.0056 -0.28196,0.02691 -0.0926,0.02135 -0.18205,0.05526 -0.26055,0.100914 -0.0518,0.02834 -0.0999,0.06883 -0.14275,0.117733 -0.0429,0.0489 -0.0793,0.104825 -0.11066,0.168189 -0.0626,0.126728 -0.0999,0.275858 -0.0999,0.423838 0,0.03148 0.0551,0.112385 0.14275,0.218646 0.0877,0.106262 0.20879,0.237564 0.33907,0.366653 0.15368,0.147979 0.27387,0.271878 0.36762,0.380108 0.0937,0.10823 0.15941,0.203347 0.20701,0.299378 0.0476,0.09603 0.0776,0.191363 0.0928,0.302741 0.0152,0.111378 0.0177,0.235924 0.0143,0.3902 -0.007,0.21095 -0.0339,0.392213 -0.0857,0.541571 -0.0518,0.149357 -0.12843,0.269621 -0.23199,0.363289 -0.10356,0.09367 -0.23415,0.157946 -0.39618,0.201829 -0.16203,0.04388 -0.35817,0.06728 -0.58534,0.06728 -0.22048,0 -0.41127,-0.02002 -0.5782,-0.06055 -0.16693,-0.04054 -0.30989,-0.103147 -0.42472,-0.185009 -0.11485,-0.08186 -0.20349,-0.185495 -0.26769,-0.309469 -0.0642,-0.123972 -0.10275,-0.267058 -0.11777,-0.433929 -0.01,-0.110199 -0.008,-0.215856 0.007,-0.31956 0.0147,-0.103705 0.0416,-0.206139 0.0821,-0.306105 0.0405,-0.09997 0.0933,-0.200395 0.1606,-0.299378 0.0673,-0.09898 0.15107,-0.195262 0.24627,-0.296013 0.22048,-0.23299 0.34303,-0.380634 0.41402,-0.511297 0.0355,-0.06533 0.0579,-0.124239 0.0714,-0.191737 0.0134,-0.0675 0.0198,-0.143943 0.0214,-0.232102 0.003,-0.100754 -0.006,-0.189309 -0.025,-0.269104 -0.0191,-0.0798 -0.0466,-0.150916 -0.0892,-0.211919 -0.0426,-0.061 -0.10031,-0.11036 -0.16774,-0.154734 -0.0675,-0.04437 -0.14559,-0.08109 -0.23913,-0.111005 -0.12862,-0.04093 -0.25479,-0.06004 -0.37119,-0.05718 -0.11641,0.0029 -0.22476,0.02774 -0.32122,0.07064 -0.0965,0.0429 -0.18106,0.10244 -0.24984,0.181645 -0.0688,0.0792 -0.12007,0.177514 -0.15347,0.289286 -0.0334,0.125939 -0.0678,0.397681 -0.0678,0.605483 0,0.232989 -0.0203,0.415637 -0.0678,0.578572 -0.0476,0.162937 -0.12175,0.306132 -0.23199,0.454112 -0.10022,0.138533 -0.21007,0.24185 -0.34621,0.322924 -0.13612,0.08108 -0.29946,0.137349 -0.50325,0.17828 -0.10022,0.02204 -0.19671,0.03462 -0.2891,0.03364 -0.0924,-9.74e-4 -0.1804,-0.01595 -0.26768,-0.04037 -0.0873,-0.0244 -0.17209,-0.05943 -0.25698,-0.107641 -0.0849,-0.04821 -0.16822,-0.109229 -0.2534,-0.181646 -0.0994,-0.08422 -0.18661,-0.173534 -0.25698,-0.265739 -0.0704,-0.09221 -0.126,-0.185298 -0.16775,-0.282559 -0.0418,-0.09726 -0.0685,-0.196626 -0.0821,-0.296014 -0.0136,-0.09939 -0.0143,-0.200788 0,-0.299377 0.0143,-0.09859 0.0441,-0.194425 0.0857,-0.289286 0.0416,-0.09486 0.0957,-0.187624 0.16418,-0.275831 0.0685,-0.08821 0.15127,-0.173659 0.24627,-0.252285 0.095,-0.07863 0.20369,-0.149164 0.32479,-0.215282 0.18708,-0.103901 0.33978,-0.165761 0.50682,-0.191737 0.16702,-0.02598 0.34837,-0.0176 0.5889,0.02018 0.1236,0.01889 0.22619,0.02819 0.31409,0.02691 0.0879,-0.0013 0.15864,-0.01142 0.22128,-0.037 0.0626,-0.02558 0.11637,-0.06708 0.16418,-0.121097 0.0478,-0.05402 0.0922,-0.121971 0.13561,-0.208555 0.0601,-0.118069 0.0885,-0.229705 0.0928,-0.333016 0.004,-0.10331 -0.0161,-0.19991 -0.0643,-0.282558 -0.048,-0.08265 -0.12095,-0.152472 -0.21772,-0.208555 -0.0968,-0.05608 -0.21849,-0.09748 -0.36048,-0.121097 -0.0885,-0.01417 -0.16712,-0.01708 -0.2427,-0.01009 -0.0756,0.007 -0.14803,0.02294 -0.22485,0.05718 -0.15368,0.06848 -0.32362,0.199648 -0.5675,0.413746 -0.30066,0.261327 -0.48163,0.408466 -0.6353,0.491114 -0.0768,0.04132 -0.14612,0.06607 -0.22129,0.08073 -0.0752,0.01466 -0.15652,0.02018 -0.25341,0.02018 -0.12025,-0.0016 -0.23617,-0.01665 -0.3462,-0.04037 -0.11003,-0.02371 -0.21447,-0.05644 -0.31052,-0.100914 -0.0961,-0.04447 -0.18225,-0.09761 -0.26054,-0.161462 -0.0783,-0.06386 -0.14665,-0.140149 -0.20344,-0.22201 -0.0835,-0.122792 -0.13115,-0.201061 -0.15703,-0.312833 -0.0259,-0.111772 -0.0321,-0.255837 -0.0321,-0.504569 0,-0.261326 0.005,-0.401455 0.0321,-0.504569 0.0276,-0.103114 0.078,-0.169212 0.17488,-0.282558 0.0652,-0.07714 0.15243,-0.156735 0.24984,-0.232102 0.0974,-0.07537 0.20509,-0.146372 0.31408,-0.208555 0.109,-0.06218 0.22131,-0.113785 0.32122,-0.151371 0.0999,-0.03758 0.18684,-0.06234 0.25698,-0.06391 0.0835,0 0.15701,0.0083 0.22843,0.02355 0.0714,0.01525 0.14254,0.0384 0.21771,0.07737 0.15033,0.07793 0.32476,0.213749 0.58534,0.437293 0.23051,0.195207 0.37965,0.308123 0.54251,0.386836 0.16286,0.07871 0.3373,0.121608 0.6246,0.178281 0.0585,0.01102 0.11627,0.01375 0.16774,0.0067 0.0515,-0.007 0.0961,-0.02491 0.13919,-0.04709 0.0861,-0.04437 0.15602,-0.114063 0.19986,-0.201828 0.0438,-0.08776 0.0634,-0.191245 0.0536,-0.299377 -0.01,-0.108132 -0.0498,-0.220813 -0.12493,-0.326288 -0.0568,-0.08186 -0.10939,-0.147005 -0.16775,-0.198463 -0.0584,-0.05146 -0.12392,-0.09158 -0.207,-0.121097 -0.0831,-0.02952 -0.18306,-0.04787 -0.31409,-0.06391 -0.13101,-0.01604 -0.29043,-0.02934 -0.49254,-0.04036 -0.35411,-0.01574 -0.54808,-0.02649 -0.6817,-0.05719 -0.13364,-0.0307 -0.20809,-0.08003 -0.32836,-0.168189 -0.0802,-0.05982 -0.15428,-0.132911 -0.22129,-0.211919 -0.067,-0.07901 -0.12562,-0.162946 -0.17488,-0.252285 -0.0493,-0.08934 -0.0909,-0.181652 -0.11777,-0.272467 -0.0269,-0.09081 -0.0393,-0.182304 -0.0393,-0.265739 0,-0.08422 0.0127,-0.16984 0.0357,-0.255648 0.0231,-0.08581 0.0538,-0.171769 0.0964,-0.255648 0.0852,-0.167758 0.20779,-0.328639 0.34977,-0.467567 0.14197,-0.13893 0.30432,-0.25442 0.4747,-0.33638 0.0852,-0.04098 0.17359,-0.07272 0.26054,-0.09418 0.087,-0.02146 0.1718,-0.03185 0.25698,-0.03027 0.0952,0.0016 0.1922,0.01139 0.28553,0.03364 0.0933,0.02224 0.18356,0.05583 0.27125,0.09755 0.0877,0.04172 0.17155,0.09135 0.24985,0.151372 0.0783,0.06002 0.15256,0.131416 0.21771,0.208554 0.0969,0.113348 0.1484,0.180521 0.17845,0.299378 0.0301,0.118856 0.0364,0.287484 0.0464,0.605482 0.0133,0.321148 0.0262,0.49178 0.0571,0.61221 0.0309,0.120431 0.0816,0.189611 0.17845,0.306106 0.0919,0.108623 0.20093,0.199737 0.31765,0.269103 0.11671,0.06937 0.23938,0.119061 0.36048,0.144643 0.12111,0.02558 0.24119,0.02609 0.34621,0.0034 0.10503,-0.02273 0.19563,-0.06908 0.26412,-0.144643 0.0468,-0.05195 0.0888,-0.119634 0.12134,-0.1951 0.0326,-0.07547 0.0563,-0.159151 0.0714,-0.242193 0.015,-0.08304 0.02,-0.16415 0.0143,-0.238829 -0.006,-0.07468 -0.0235,-0.14136 -0.0535,-0.191736 -0.0401,-0.08186 -0.26491,-0.335061 -0.4854,-0.561754 -0.14365,-0.144833 -0.26304,-0.286895 -0.35334,-0.427201 -0.0903,-0.140306 -0.15199,-0.279363 -0.18916,-0.417112 -0.0372,-0.137745 -0.0479,-0.273224 -0.0321,-0.410381 0.0157,-0.137157 0.0564,-0.275213 0.12493,-0.413747 0.0735,-0.147979 0.13997,-0.248435 0.2427,-0.339743 0.10273,-0.0913 0.24373,-0.172359 0.46756,-0.282559 0.1353,-0.06612 0.27594,-0.112923 0.42116,-0.137915 0.1089,-0.01875 0.21979,-0.02436 0.32836,-0.02019 z m -0.13207,4.712674 c -0.46988,-0.01795 -0.93019,0.28307 -1.02791,0.733307 -0.0387,0.182279 0.0385,0.280548 0.13919,0.54157 0.0381,0.09874 0.21119,0.208762 0.30694,0.285923 0.18764,0.151213 0.58024,0.161462 0.80306,0.161462 0.42093,0 0.76225,-0.567997 0.6353,-1.052867 -0.0534,-0.195208 -0.3514,-0.532852 -0.5318,-0.602119 -0.10524,-0.04014 -0.21636,-0.06313 -0.32479,-0.06728 z"
-       id="path4462-1-3"
-       inkscape:connector-curvature="0" />
+       id="path4462-1-3" />
   </g>
 </svg>