Index: src/gconf-list-model.c
===================================================================
--- src/gconf-list-model.c	(Revision 1355)
+++ src/gconf-list-model.c	(Arbeitskopie)
@@ -19,17 +19,19 @@
 #include "gconf-list-model.h"
 
 #include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gconf-util.h"
+#include <gtk/gtk.h>
 
 #define G_SLIST(x) ((GSList *) x)
 
-static GdkPixbuf *blank_pixbuf;
-static GdkPixbuf *bool_pixbuf;
-static GdkPixbuf *number_pixbuf;
-static GdkPixbuf *schema_pixbuf;
-static GdkPixbuf *string_pixbuf;
-static GdkPixbuf *list_pixbuf;
+static GdkPixbuf *blank_icon;
+static GdkPixbuf *bool_icon;
+static GdkPixbuf *float_icon;
+static GdkPixbuf *int_icon;
+static GdkPixbuf *schema_icon;
+static GdkPixbuf *string_icon;
+static GdkPixbuf *list_icon;
+static GdkPixbuf *pair_icon;
 
 static GObjectClass *parent_class;
 
@@ -253,7 +255,6 @@
 {
 	GConfEntry *entry;
 	gchar *name;
-	GdkPixbuf *icon;
 	
 	g_return_if_fail (iter->stamp == GCONF_LIST_MODEL (tree_model)->stamp);
 
@@ -277,40 +278,45 @@
 	case GCONF_LIST_MODEL_ICON_COLUMN:
 		if (gconf_entry_get_value (entry) == NULL) {
 			g_value_init (value, GDK_TYPE_PIXBUF);
-			g_value_set_object (value, blank_pixbuf);
-			
+			g_value_set_object (value, blank_icon);
 			break;
 		}
 		
 		switch (gconf_entry_get_value (entry)->type) {
 		case GCONF_VALUE_BOOL:
-			icon = bool_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, bool_icon);
 			break;
 		case GCONF_VALUE_INT:
+			/* g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, int_icon);
+			break; */
 		case GCONF_VALUE_FLOAT:
-			icon = number_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, float_icon);
 			break;
 		case GCONF_VALUE_STRING:
-			icon = string_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, string_icon);
 			break;
 		case GCONF_VALUE_LIST:
-			icon = list_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, list_icon);
 			break;
 		case GCONF_VALUE_SCHEMA:
-			icon = schema_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, schema_icon);
 			break;
 		case GCONF_VALUE_PAIR:
-			/* FIXME: We need an icon for pairs */
-			icon = blank_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, pair_icon);
 			break;
 		default:
-			icon = blank_pixbuf;
+			g_value_init (value, GDK_TYPE_PIXBUF);
+			g_value_set_object (value, blank_icon);
 			g_warning ("unknown value type %d", gconf_entry_get_value (entry)->type);
 			break;
 		}
-
-		g_value_init (value, GDK_TYPE_PIXBUF);
-		g_value_set_object (value, icon);
 		
 		break;
 		
@@ -417,13 +423,18 @@
 
 	object_class->finalize = gconf_list_model_finalize;
 	
-	/* 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);
+	GtkIconTheme *git;
+	git = gtk_icon_theme_get_default();
+
+	blank_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-blank", 16, 0, NULL);
+	bool_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-bool", 16, 0, NULL);
+	list_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-list", 16, 0, NULL);
+	int_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-int", 16, 0, NULL);
+	float_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-float", 16, 0, NULL);
+	schema_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-schema", 16, 0, NULL);
+	string_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-string", 16, 0, NULL);
+	pair_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "type-pair", 16, 0, NULL);
+
 }
 
 static void
Index: src/gconf-stock-icons.h
===================================================================
--- src/gconf-stock-icons.h	(Revision 1355)
+++ src/gconf-stock-icons.h	(Arbeitskopie)
@@ -23,9 +23,9 @@
 #include <gtk/gtkstock.h>
 
 #define GCONF_STOCK_ABOUT 	"gconf-about"
-#define STOCK_BOOKMARK		"stock_bookmark"
-#define STOCK_ADD_BOOKMARK	"stock_add-bookmark"
-#define STOCK_EDIT_BOOKMARK	"stock_edit-bookmark"
+#define STOCK_BOOKMARK		"bookmark-new"
+#define STOCK_ADD_BOOKMARK	"bookmark-new"
+#define STOCK_EDIT_BOOKMARK	"document-new"
 
 void gconf_stock_icons_register (void);
 
Index: src/gconf-tree-model.c
===================================================================
--- src/gconf-tree-model.c	(Revision 1355)
+++ src/gconf-tree-model.c	(Arbeitskopie)
@@ -1,6 +1,6 @@
 #include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gconf-tree-model.h"
+#include <gtk/gtk.h>
 
 typedef struct _Node Node;
 
@@ -477,8 +477,10 @@
 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", 16, 0, NULL);
+	open_icon = gtk_icon_theme_load_icon(GTK_ICON_THEME (git), "folder-open", 16, 0, NULL);
 }
 
 static void
