Initial code to fix

1 files changed, 6 insertions, 8 deletions

diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp
index 2e0e11333..f452b1771 100644
--- a/src/ui/icon-loader.cpp
+++ b/src/ui/icon-loader.cpp
@@ -15,6 +15,8 @@
 #include "inkscape.h"
 #include "svg/svg-color.h"
 #include "widgets/toolbox.h"
+#include "io/resource.h"
+#include <fstream>
 #include <gdkmm/display.h>
 #include <gdkmm/screen.h>
 #include <gtkmm/iconinfo.h>
@@ -66,19 +68,15 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
             bool was_symbolic = false;
             Glib::ustring css_str = "";
             if (!prefs->getBool("/theme/symbolicIconsDefaultColor", true)) {
+                using namespace Inkscape::IO::Resource;
                 gchar colornamed[64];
                 gchar colornamedsuccess[64];
                 gchar colornamedwarning[64];
                 gchar colornamederror[64];
-                gchar colornamed_inverse[64];
-                int colorset = prefs->getInt("/theme/symbolicColor", 0x2E3436ff);
+                INKSCAPE.set_higlightcolors(colornamedsuccess, colornamedwarning, colornamederror);
+                int colorset = 0x2E3436ff;
+                colorset = prefs->getInt("/theme/" + themeiconname + "/symbolicColor", colorset);
                 sp_svg_write_color(colornamed, sizeof(colornamed), colorset);
-                int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x4AD589ff);
-                sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess);
-                int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0xF57900ff);
-                sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
-                int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff);
-                sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror);
                 _icon_pixbuf =
                     iconinfo.load_symbolic(Gdk::RGBA(colornamed), Gdk::RGBA(colornamedsuccess),
                                            Gdk::RGBA(colornamedwarning), Gdk::RGBA(colornamederror), was_symbolic);