diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 3088b1131..9148f7d1e 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-14  Rodney Dawes  <dobey@novell.com>
+
+	* gnome-settings-xsettings.c (xsettings_callback):
+	(gnome_settings_xsettings_load): Set the Net/FallbackIconTheme
+	XSetting for new versions of gnome-icon-theme and gtk+ >= 2.8.10
+
+	See bug #325546
+
 2006-01-11  Sebastien Bacher  <seb128@debian.org>
 
 	reviewed by: Bastien Nocera <hadess@hadess.net>
diff --git a/gnome-settings-daemon/gnome-settings-xsettings.c b/gnome-settings-daemon/gnome-settings-xsettings.c
index 0281a7fdb..a624072ad 100644
--- a/gnome-settings-daemon/gnome-settings-xsettings.c
+++ b/gnome-settings-daemon/gnome-settings-xsettings.c
@@ -229,6 +229,10 @@ xsettings_callback (GConfEntry *entry)
 
   process_value (trans, entry->value);
   
+  for (i = 0; managers [i]; i++)
+    xsettings_manager_set_string (managers [i], "Net/FallbackIconTheme",
+				  "gnome");
+
   for (i = 0; managers [i]; i++)  
     xsettings_manager_notify (managers [i]);
 }
@@ -452,6 +456,10 @@ gnome_settings_xsettings_load (GConfClient *client)
   gnome_settings_update_xft (client);
 #endif /* HAVE_XFT */
 
+  for (i = 0; managers [i]; i++)
+    xsettings_manager_set_string (managers [i], "Net/FallbackIconTheme",
+				  "gnome");
+
   for (i = 0; managers [i]; i++)  
     xsettings_manager_notify (managers [i]);
 }