diff --git a/ChangeLog b/ChangeLog
index 89b98a030d..9d1c0a9c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-24  Chris Wilson  <chris@chris-wilson.co.uk>
+
+	* gtk/gtkicontheme.c (scan_directory): Ensure the 
+	icon_theme->all_icons and dir->icons hash tables use the same string
+	as their keys. (#418531)
+
 2007-04-23  Cody Russell  <bratsche@gnome.org>
 
 	Backported from trunk:
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 1347df0598..afc594cae9 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2241,7 +2241,7 @@ scan_directory (GtkIconThemePrivate *icon_theme,
       base_name = strip_suffix (name);
 
       hash_suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, base_name));
-      g_hash_table_insert (icon_theme->all_icons, base_name, NULL);
+      g_hash_table_replace (icon_theme->all_icons, base_name, NULL);
       g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix));
     }