Move icon-loader and provide a temporary fallback to render pixbuf

34 files changed, 211 insertions, 34 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 98991f25e..47ff6884e 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -5,6 +5,7 @@ set(ui_SRC
 	control-manager.cpp
 	dialog-events.cpp
 	draw-anchor.cpp
+	icon-loader.cpp
 	interface.cpp
         monitor.cpp
 	previewholder.cpp
@@ -152,7 +153,7 @@ set(ui_SRC
 	widget/color-icc-selector.cpp
 	widget/color-notebook.cpp
 	widget/color-picker.cpp
-	widget/color-preview.cpp
+	widget/color-preview.cpp	icon-loader.cpp
 	widget/color-scales.cpp
 	widget/color-slider.cpp
 	widget/color-wheel-selector.cpp
@@ -216,6 +217,7 @@ set(ui_SRC
 	draw-anchor.h
 	event-debug.h
 	icon-names.h
+	icon-loader.h
 	interface.h
         monitor.h
 	previewable.h
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index b1e16abbd..0f80dec6c 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -42,7 +42,7 @@
 
 #include "helper/action.h"
 #include "helper/action-context.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "include/gtkmm_version.h"
 
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 495d2e857..0bae88103 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -41,7 +41,7 @@
 #include "object/sp-root.h"
 #include "object/sp-text.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/multi-path-manipulator.h"
diff --git a/src/ui/dialog/attrdialog.cpp b/src/ui/dialog/attrdialog.cpp
index 6d40750ed..374020a89 100644
--- a/src/ui/dialog/attrdialog.cpp
+++ b/src/ui/dialog/attrdialog.cpp
@@ -16,7 +16,7 @@
 #include "selection.h"
 #include "document-undo.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/iconrenderer.h"
 
 #include "xml/node-event-vector.h"
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 3dc88edb0..c55220973 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -40,7 +40,7 @@
 #include "display/drawing-context.h"
 #include "display/drawing.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "helper/window.h"
 
 #include "object/sp-item.h"
diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index 95f433a30..5b3fe7660 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -17,7 +17,7 @@
 #include "verbs.h"
 #include "selection.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/iconrenderer.h"
 
 #include "xml/attribute-record.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index f81fe79be..f61b52968 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -30,7 +30,7 @@
 #include "display/canvas-grid.h"
 #include "document-properties.h"
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "io/sys.h"
 #include "object/sp-root.h"
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index eea45cc5b..67de34731 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -27,7 +27,7 @@
 
 #include "svg/css-ostringstream.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/widget/notebook-page.h"
 
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 6b7402e47..46c733bf5 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -28,7 +28,7 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "include/gtkmm_version.h"
 
@@ -36,7 +36,7 @@
 
 #include "svg/css-ostringstream.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/tools/tool-base.h"
 #include "ui/widget/imagetoggler.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 200ab86b7..60542a9d8 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -27,7 +27,7 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject-reference.h"
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index d6189fcb2..2954ea418 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -31,7 +31,7 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 
 #include "include/gtkmm_version.h"
 
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 279773def..5bdda62c5 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -16,7 +16,7 @@
 #include "ocaldialogs.h"
 
 #include "filedialogimpl-gtkmm.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "io/sys.h"
 #include "path-prefix.h"
 #include "preferences.h"
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index c20a458b9..f3a44f690 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -19,7 +19,7 @@
 #include "inkscape.h"
 #include "document-undo.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/iconrenderer.h"
 
 #include "xml/attribute-record.h"
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 0141529a7..85f395f26 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -35,7 +35,7 @@
 
 #include "display/cairo-utils.h"
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "io/resource.h"
 #include "io/sys.h"
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 9ee6f4851..f0678c2b2 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -26,8 +26,8 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "object/sp-defs.h"
 #include "object/sp-item.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 9edac0688..ed06f849a 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -26,7 +26,7 @@
 #include "transformation.h"
 #include "verbs.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "object/sp-item-transform.h"
 #include "object/sp-namedview.h"
 
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 7ecb982f3..1306eefd9 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -16,7 +16,7 @@
 
 #include "document-undo.h"
 #include "document.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "util/signal-blocker.h"
 
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 7baccba6f..f0c04828e 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -36,7 +36,7 @@
 #include "object/sp-root.h"
 #include "object/sp-string.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/dialog-events.h"
 #include "ui/icon-names.h"
 #include "ui/interface.h"
diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp
new file mode 100644
index 000000000..0d9166beb
--- /dev/null
+++ b/src/ui/icon-loader.cpp
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Icon Loader
+ *
+ * Icon Loader management code
+ *
+ * Authors:
+ *  Jabiertxo Arraiza <jabier.arraiza@marker.es>
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "icon-loader.h"
+#include "inkscape.h"
+#include "io/resource.h"
+#include "preferences.h"
+#include "svg/svg-color.h"
+#include "widgets/toolbox.h"
+#include <gtkmm/iconinfo.h>
+#include <gtkmm/icontheme.h>
+#include <gtkmm/toolitem.h>
+
+void sp_load_theme()
+{
+   }
+
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
+{
+    using namespace Inkscape::IO::Resource;
+    static auto icon_theme = Gtk::IconTheme::get_default();
+    static bool icon_theme_set;
+    if (!icon_theme_set) {
+        icon_theme_set = true;
+        icon_theme->prepend_search_path(get_path_ustring(SYSTEM, ICONS));
+        icon_theme->prepend_search_path(get_path_ustring(USER, ICONS));
+    }
+    // TODO all calls to "sp_get_icon_pixbuf" need to be removed in thew furture
+    // Put here temporary for allow use symbolic in a few icons require pixbug instead Gtk::Image
+    // We coulden't acces to pixbuf of a symbolic ones with the next order 
+    // icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
+    // Maybe we can do with Gio, but not sure.  Also can render a icon to pixbuf but need to be 
+    // a stock-icon not on named ones I think or access directly to the icon.svg file
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::RefPtr<Gdk::Pixbuf> _icon_pixbuf;
+    try {
+        if (prefs->getBool("/theme/symbolicIcons", false)) {
+            gchar colornamed[64];
+            int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff);
+            // Use in case the special widgets have inverse theme background and symbolic
+            sp_svg_write_color(colornamed, sizeof(colornamed), colorset);
+            Gdk::RGBA color;
+            color.set(colornamed);
+            Gtk::IconInfo iconinfo =
+                icon_theme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE);
+            if (bool(iconinfo)) {
+                bool was_symbolic = false;
+                _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic);
+            }
+            else {
+                _icon_pixbuf = icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
+            }
+            std::cout << "Icon Loader using a future dead function in this icon: " << icon_name << std::endl;
+        }
+        else {
+            _icon_pixbuf = icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
+        }
+    }
+    catch (const Gtk::IconThemeError &e) {
+        std::cout << "Icon Loader error loading icon file: " << e.what() << std::endl;
+    }
+    return _icon_pixbuf;
+}
+
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, Gtk::IconSize icon_size)
+{
+    int width, height;
+    Gtk::IconSize::lookup(icon_size, width, height);
+    return sp_get_icon_pixbuf(icon_name, width);
+}
+
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size)
+{
+    int width, height;
+    Gtk::IconSize::lookup(Gtk::IconSize(icon_size), width, height);
+    return sp_get_icon_pixbuf(icon_name, width);
+}
+
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, GtkIconSize icon_size)
+{
+    gint width, height;
+    gtk_icon_size_lookup(icon_size, &width, &height);
+    return sp_get_icon_pixbuf(icon_name, width);
+}
+
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gchar const *prefs_size)
+{
+    // Load icon based in preference size defined allowed values are:
+    //"/toolbox/tools/small" Toolbox icon size
+    //"/toolbox/small" Control bar icon size
+    //"/toolbox/secondary" Secondary toolbar icon size
+    GtkIconSize icon_size = Inkscape::UI::ToolboxFactory::prefToSize(prefs_size);
+    return sp_get_icon_pixbuf(icon_name, icon_size);
+}
+
+
+Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size)
+{
+    
+    Gtk::Image *icon = new Gtk::Image();
+    icon->set_from_icon_name(icon_name, Gtk::IconSize(icon_size));
+    return icon;
+}
+
+Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::IconSize icon_size)
+{
+    
+    Gtk::Image *icon = new Gtk::Image();
+    icon->set_from_icon_name(icon_name, icon_size);
+    return icon;
+}
+
+Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_size)
+{
+    
+    Gtk::IconSize icon_size = Inkscape::UI::ToolboxFactory::prefToSize_mm(prefs_size);
+    Gtk::Image *icon = new Gtk::Image();
+    icon->set_from_icon_name(icon_name, icon_size);
+    return icon;
+}
+
+
+GtkWidget *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_size)
+{
+    
+    return gtk_image_new_from_icon_name(icon_name.c_str(), icon_size);
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/ui/icon-loader.h b/src/ui/icon-loader.h
new file mode 100644
index 000000000..dd4b3a4ce
--- /dev/null
+++ b/src/ui/icon-loader.h
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Icon Loader
+ *//*
+ * Authors:
+ * see git history
+ * Jabiertxo Arraiza <jabier.arraiza@marker.es>
+ *
+ * Copyright (C) 2018 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+#ifndef SEEN_INK_ICON_LOADER_H
+#define SEEN_INK_ICON_LOADER_H
+
+#include <gdkmm/pixbuf.h>
+#include <gtkmm/box.h>
+#include <gtkmm/image.h>
+
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size);
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size);
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, Gtk::IconSize icon_size);
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, GtkIconSize icon_size);
+Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gchar const *prefs_sice);
+Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size);
+Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::IconSize icon_size);
+Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_sice);
+GtkWidget  *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_size);
+#endif // SEEN_INK_STOCK_ITEMS_H
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index f81d252de..edb000432 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -46,7 +46,7 @@
 #include "extension/input.h"
 
 #include "helper/action.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "helper/window.h"
 
 #include "io/sys.h"
diff --git a/src/ui/widget/alignment-selector.cpp b/src/ui/widget/alignment-selector.cpp
index 25b1b7ec6..e5ac17abe 100644
--- a/src/ui/widget/alignment-selector.cpp
+++ b/src/ui/widget/alignment-selector.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ui/widget/alignment-selector.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 
 #include <gtkmm/image.h>
diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp
index f57f419e0..b151a81ea 100644
--- a/src/ui/widget/anchor-selector.cpp
+++ b/src/ui/widget/anchor-selector.cpp
@@ -8,7 +8,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 #include "ui/widget/anchor-selector.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 
 #include <gtkmm/image.h>
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index 3caff3fb5..f8c8a9994 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -10,7 +10,7 @@
 
 #include "ui/widget/clipmaskicon.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "layertypeicon.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index cc6832815..395aa7b9e 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -29,7 +29,7 @@
 #include "preferences.h"
 #include "profile-manager.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "object/color-profile.h"
 
 #include "svg/svg-icc-color.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index e438521c0..ae5efb73d 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -11,7 +11,7 @@
 #include "ui/widget/dock.h"
 
 #include "desktop.h"
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "ui/icon-names.h"
 #include <glibmm/exceptionhandler.h>
diff --git a/src/ui/widget/iconrenderer.cpp b/src/ui/widget/iconrenderer.cpp
index 447c1821d..c6cc1ddcc 100644
--- a/src/ui/widget/iconrenderer.cpp
+++ b/src/ui/widget/iconrenderer.cpp
@@ -11,7 +11,7 @@
 
 #include "ui/widget/iconrenderer.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "layertypeicon.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index e50e3815e..a1d258eb2 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -12,7 +12,7 @@
 
 #include "ui/widget/imagetoggler.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 3abb82586..aa433947a 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -10,7 +10,7 @@
 
 #include "ui/widget/insertordericon.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "layertypeicon.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index 39d1456dd..1e679a01b 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -9,7 +9,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "labelled.h"
 #include <gtkmm/image.h>
 #include <gtkmm/label.h>
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 59b26c2ad..0be876e02 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -14,7 +14,7 @@
 #include <cstring>
 #include <string>
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/dialog/layer-properties.h"
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 33e668702..d8b13788e 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -10,7 +10,7 @@
 
 #include "ui/widget/layertypeicon.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index a44199b10..acdf4f01d 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -33,7 +33,7 @@
 
 #include "io/sys.h"
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "ui/dialog/filedialog.h"
 #include "ui/widget/preferences-widget.h"
 
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index 81d9f1ace..32124bfd2 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include "helper/icon-loader.h"
+#include "ui/icon-loader.h"
 #include "random.h"
 #include <glibmm/i18n.h>