2 files changed, 6 insertions, 11 deletions
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index e3670bd49..961cce5b5 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -31,19 +31,14 @@ ImageToggler::ImageToggler( char const* on, char const* off) :
 {
     property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
     int phys = sp_icon_get_phys_size((int)Inkscape::ICON_SIZE_DECORATION);
+    Glib::RefPtr<Gtk::IconTheme> icon_theme = Gtk::IconTheme::get_default();
 
-    Glib::RefPtr<Gdk::Pixbuf> pbmm = Gtk::IconTheme::get_default()->load_icon(_pixOnName, phys, (Gtk::IconLookupFlags)0);
-    if ( pbmm ) {
-        GdkPixbuf* pb = gdk_pixbuf_copy(pbmm->gobj());
-        _property_pixbuf_on = Glib::wrap( pb );
-        pbmm->unreference();
+    if (icon_theme->has_icon(_pixOnName)) {
+        _property_pixbuf_on = icon_theme->load_icon(_pixOnName, phys, (Gtk::IconLookupFlags)0);
     }
 
-    pbmm = Gtk::IconTheme::get_default()->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0);
-    if ( pbmm ) {
-        GdkPixbuf* pb = gdk_pixbuf_copy(pbmm->gobj());
-        _property_pixbuf_off = Glib::wrap( pb );
-        pbmm->unreference();
+    if (icon_theme->has_icon(_pixOffName)) {
+        _property_pixbuf_off = icon_theme->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0);
     }
 
     property_pixbuf() = _property_pixbuf_off.get_value();
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 0ad7187f5..3e6683c64 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -18,7 +18,6 @@
 #include "document.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
-#include "inkscape-stock.h"
 #include "selection.h"
 #include "style.h"
 #include "sp-item.h"
@@ -26,6 +25,7 @@
 #include "verbs.h"
 #include "xml/repr.h"
 #include "widgets/icon.h"
+#include "ui/icon-names.h"
 #include "ui/widget/object-composite-settings.h"
 #include "display/sp-canvas.h"