diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc
index b89fe340d..7df29dd92 100644
--- a/rtgui/filebrowserentry.cc
+++ b/rtgui/filebrowserentry.cc
@@ -37,7 +37,6 @@
 
 //extern Glib::Threads::Thread* mainThread;
 
-bool FileBrowserEntry::iconsLoaded(false);
 Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::editedIcon;
 Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::recentlySavedIcon;
 Glib::RefPtr<Gdk::Pixbuf> FileBrowserEntry::enqueuedIcon;
@@ -58,15 +57,6 @@ FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname)
 
     scale = 1;
 
-    if (!iconsLoaded) {
-        editedIcon = RTImage::createPixbufFromFile ("tick-small.png");
-        recentlySavedIcon = RTImage::createPixbufFromFile ("save-small.png");
-        enqueuedIcon = RTImage::createPixbufFromFile ("gears-small.png");
-        hdr = RTImage::createPixbufFromFile ("filetype-hdr.png");
-        ps = RTImage::createPixbufFromFile ("filetype-ps.png");
-        iconsLoaded = true;
-    }
-
     thumbnail->addThumbnailListener (this);
 }
 
@@ -90,6 +80,15 @@ FileBrowserEntry::~FileBrowserEntry ()
     }
 }
 
+void FileBrowserEntry::init ()
+{
+    editedIcon = RTImage::createPixbufFromFile ("tick-small.png");
+    recentlySavedIcon = RTImage::createPixbufFromFile ("save-small.png");
+    enqueuedIcon = RTImage::createPixbufFromFile ("gears-small.png");
+    hdr = RTImage::createPixbufFromFile ("filetype-hdr.png");
+    ps = RTImage::createPixbufFromFile ("filetype-ps.png");
+}
+
 void FileBrowserEntry::refreshThumbnailImage ()
 {
 
diff --git a/rtgui/filebrowserentry.h b/rtgui/filebrowserentry.h
index 67b953514..f8fca4db1 100644
--- a/rtgui/filebrowserentry.h
+++ b/rtgui/filebrowserentry.h
@@ -50,7 +50,6 @@ class FileBrowserEntry final : public ThumbBrowserEntryBase,
 {
 
     double scale;
-    static bool iconsLoaded;
     bool wasInside;
     ImageAreaToolListener* iatlistener;
     int press_x, press_y, action_x, action_y;
@@ -80,6 +79,7 @@ public:
 
     FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname);
     ~FileBrowserEntry () override;
+    static void init ();
     void draw (Cairo::RefPtr<Cairo::Context> cc) override;
 
     void setImageAreaToolListener (ImageAreaToolListener* l)
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index d588d6aa5..dcfc2f05c 100755
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -241,6 +241,7 @@ RTWindow::RTWindow ()
     RTImage::init();
     WhiteBalance::init();
     MyExpander::init();
+    FileBrowserEntry::init();
 
 #ifndef WIN32
     const std::vector<Glib::RefPtr<Gdk::Pixbuf>> appIcons = {