Index: src/gconf-tree-model.c
===================================================================
--- src/gconf-tree-model.c	(revision 1236)
+++ src/gconf-tree-model.c	(working copy)
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 #include "gconf-tree-model.h"
 
 typedef struct _Node Node;
@@ -475,8 +475,11 @@ gconf_tree_model_tree_model_init (GtkTre
 static void
 gconf_tree_model_class_init (GConfTreeModelClass *klass)
 {
-	closed_icon = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/folder-closed.png", NULL);
-	open_icon = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/folder-open.png", NULL);
+	GtkIconTheme *git;
+
+	git = gtk_icon_theme_get_default();
+	closed_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "folder", 24, 0, NULL);
+	open_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "folder-open", 24, 0, NULL);
 }
 
 static void
Index: src/gconf-list-model.c
===================================================================
--- src/gconf-list-model.c	2008-03-02 01:17:44.143268968 +0100
+++ src/gconf-list-model.c.new	2008-03-02 01:18:12.802512289 +0100
@@ -19,7 +19,7 @@
 #include "gconf-list-model.h"
 
 #include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 #include "gconf-util.h"
 
 #define G_SLIST(x) ((GSList *) x)
@@ -410,20 +410,16 @@
 static void
 gconf_list_model_class_init (GConfListModelClass *klass)
 {
-	GObjectClass *object_class;
+	GtkIconTheme *git;
 
-	object_class = (GObjectClass *)klass;
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->finalize = gconf_list_model_finalize;
-	
+	git = gtk_icon_theme_get_default();
 	/* Load the pixbufs */
-	blank_pixbuf = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/entry-blank.png", NULL);
-	bool_pixbuf = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/entry-bool.png", NULL);	
-	list_pixbuf = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/entry-list.png", NULL);
-	number_pixbuf = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/entry-number.png", NULL);
-	schema_pixbuf = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/entry-schema.png", NULL);
-	string_pixbuf = gdk_pixbuf_new_from_file (GCONF_EDITOR_IMAGEDIR"/entry-string.png", NULL);
+	blank_pixbuf = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-blank", 16, 0, NULL);
+	bool_pixbuf = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-bool", 16, 0, NULL);
+	list_pixbuf = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-list", 16, 0, NULL);
+	number_pixbuf = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-number", 16, 0, NULL);
+	schema_pixbuf = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-schema", 16, 0, NULL);
+	string_pixbuf = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-string", 16, 0, NULL);
 }
 
 static void
