diff --git a/rtdata/images/themed/png/dark/tick-green-hollow-small.png b/rtdata/images/themed/png/dark/tick-green-hollow-small.png
index 84a4747ed..176bf5489 100644
Binary files a/rtdata/images/themed/png/dark/tick-green-hollow-small.png and b/rtdata/images/themed/png/dark/tick-green-hollow-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green-hollow.png b/rtdata/images/themed/png/dark/tick-green-hollow.png
index 168127adb..7cac33dc0 100644
Binary files a/rtdata/images/themed/png/dark/tick-green-hollow.png and b/rtdata/images/themed/png/dark/tick-green-hollow.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green-small.png b/rtdata/images/themed/png/dark/tick-green-small.png
index c09109a48..54cf5d024 100644
Binary files a/rtdata/images/themed/png/dark/tick-green-small.png and b/rtdata/images/themed/png/dark/tick-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick-green.png b/rtdata/images/themed/png/dark/tick-green.png
index b08cda5f2..2458734b2 100644
Binary files a/rtdata/images/themed/png/dark/tick-green.png and b/rtdata/images/themed/png/dark/tick-green.png differ
diff --git a/rtdata/images/themed/png/dark/tick-hollow-small.png b/rtdata/images/themed/png/dark/tick-hollow-small.png
new file mode 100644
index 000000000..e5e492deb
Binary files /dev/null and b/rtdata/images/themed/png/dark/tick-hollow-small.png differ
diff --git a/rtdata/images/themed/png/light/tick-green-hollow-small.png b/rtdata/images/themed/png/light/tick-green-hollow-small.png
index 84a4747ed..176bf5489 100644
Binary files a/rtdata/images/themed/png/light/tick-green-hollow-small.png and b/rtdata/images/themed/png/light/tick-green-hollow-small.png differ
diff --git a/rtdata/images/themed/png/light/tick-green-hollow.png b/rtdata/images/themed/png/light/tick-green-hollow.png
index 168127adb..7cac33dc0 100644
Binary files a/rtdata/images/themed/png/light/tick-green-hollow.png and b/rtdata/images/themed/png/light/tick-green-hollow.png differ
diff --git a/rtdata/images/themed/png/light/tick-green-small.png b/rtdata/images/themed/png/light/tick-green-small.png
index c09109a48..54cf5d024 100644
Binary files a/rtdata/images/themed/png/light/tick-green-small.png and b/rtdata/images/themed/png/light/tick-green-small.png differ
diff --git a/rtdata/images/themed/png/light/tick-green.png b/rtdata/images/themed/png/light/tick-green.png
index b08cda5f2..2458734b2 100644
Binary files a/rtdata/images/themed/png/light/tick-green.png and b/rtdata/images/themed/png/light/tick-green.png differ
diff --git a/rtdata/images/themed/png/light/tick-hollow-small.png b/rtdata/images/themed/png/light/tick-hollow-small.png
new file mode 100644
index 000000000..9a0973962
Binary files /dev/null and b/rtdata/images/themed/png/light/tick-hollow-small.png differ
diff --git a/rtdata/images/themed/svg/tick-green-hollow-small.svg b/rtdata/images/themed/svg/tick-green-hollow-small.svg
index 2d958e37d..fcac2954d 100644
--- a/rtdata/images/themed/svg/tick-green-hollow-small.svg
+++ b/rtdata/images/themed/svg/tick-green-hollow-small.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="tick-hollow-small.svg">
+   sodipodi:docname="tick-green-hollow-small.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="9.4024691"
-     inkscape:cy="8.7703704"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -105,6 +105,6 @@
        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:1;fill:none;fill-opacity:1;stroke:#008000;stroke-width:1.5;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" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/tick-green-hollow.svg b/rtdata/images/themed/svg/tick-green-hollow.svg
index 04b591787..9b1eca47d 100644
--- a/rtdata/images/themed/svg/tick-green-hollow.svg
+++ b/rtdata/images/themed/svg/tick-green-hollow.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="tick-hollow-large.svg">
+   sodipodi:docname="tick-green-hollow.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
-     inkscape:cx="7.0788177"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,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,6 +104,6 @@
        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:1;fill:none;fill-opacity:1;stroke:#008000;stroke-width:1.99999988;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;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/tick-green-small.svg b/rtdata/images/themed/svg/tick-green-small.svg
index ff440a6c9..edf2dd4b4 100644
--- a/rtdata/images/themed/svg/tick-green-small.svg
+++ b/rtdata/images/themed/svg/tick-green-small.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="tick-small.svg">
+   sodipodi:docname="tick-green-small.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="50.625"
-     inkscape:cx="8"
+     inkscape:cx="5.1160494"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,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,6 +105,6 @@
        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:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
+       style="opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/tick-green.svg b/rtdata/images/themed/svg/tick-green.svg
index ccbfe4f31..fa250d9fe 100644
--- a/rtdata/images/themed/svg/tick-green.svg
+++ b/rtdata/images/themed/svg/tick-green.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="tick-large.svg">
+   sodipodi:docname="tick-green.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="33.833333"
-     inkscape:cx="12"
+     inkscape:cx="7.684729"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,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,6 +104,6 @@
        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:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
+       style="opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:2.30911016" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/tick-hollow-small.svg b/rtdata/images/themed/svg/tick-hollow-small.svg
new file mode 100644
index 000000000..010fba31e
--- /dev/null
+++ b/rtdata/images/themed/svg/tick-hollow-small.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="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>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     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" />
+  </g>
+</svg>
diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
index d0bee943d..501296860 100644
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -123,7 +123,7 @@ void DirBrowser::fillDirTree ()
 
     openfolder = RTImage::createFromFile ("folder-open-small.png");
     closedfolder = RTImage::createFromFile ("folder-closed-small.png");
-    icdrom = RTImage::createFromFile ("drive-optical.png");
+    icdrom = RTImage::createFromFile ("device-optical.png");
     ifloppy = RTImage::createFromFile ("device-floppy.png");
     ihdd = RTImage::createFromFile ("device-hdd.png");
     iremovable = RTImage::createFromFile ("device-usb.png");
diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc
index 974b7a36f..f457ae165 100644
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -56,7 +56,7 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
     scale = 1;
 
     if (!iconsLoaded) {
-        editedIcon = RTImage::createFromFile ("tick-green-large");
+        editedIcon = RTImage::createFromFile ("tick-small.png");
         recentlySavedIcon = RTImage::createFromFile ("save-small.png");
         enqueuedIcon = RTImage::createFromFile ("gears.png");
         hdr = RTImage::createFromFile ("filetype-hdr.png");
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index a7ac089a3..d0866a021 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -243,10 +243,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     // TODO The "g" variant was the more transparent variant of the icon, used
     // when the button was not toggled. Simplify this, change to ordinary
     // togglebutton, use CSS for opacity change.
-    iEdited[0] = new RTImage ("tick-green-hollow-small.png");
-    igEdited[0] = new RTImage ("tick-green-hollow-small.png");
-    iEdited[1] = new RTImage ("tick-green-small.png");
-    igEdited[1] = new RTImage ("tick-green-small.png");
+    iEdited[0] = new RTImage ("tick-hollow-small.png");
+    igEdited[0] = new RTImage ("tick-hollow-small.png");
+    iEdited[1] = new RTImage ("tick-small.png");
+    igEdited[1] = new RTImage ("tick-small.png");
 
     for (int i = 0; i < 2; i++) {
         iEdited[i]->show ();