diff --git a/icon-names.patch b/icon-names.patch
new file mode 100644
index 0000000..f6b8e0b
--- /dev/null
+++ b/icon-names.patch
@@ -0,0 +1,12 @@
+diff -up nautilus-2.23.5/src/nautilus-file-management-properties.c.icon-names nautilus-2.23.5/src/nautilus-file-management-properties.c
+--- nautilus-2.23.5/src/nautilus-file-management-properties.c.icon-names	2008-07-27 20:29:35.000000000 -0400
++++ nautilus-2.23.5/src/nautilus-file-management-properties.c	2008-07-27 20:30:13.000000000 -0400
+@@ -801,7 +801,7 @@ nautilus_file_management_properties_dial
+ 			       (GClosureNotify)g_object_unref,
+ 			       0);
+ 
+-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager");
++	gtk_window_set_icon_name (GTK_WINDOW (dialog), "system-file-manager");
+ 
+ 	if (window) {
+ 		gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
diff --git a/nautilus.spec b/nautilus.spec
index 9c0279b..5cc5188 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.23.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
@@ -98,6 +98,9 @@ Patch15:	nautilus-2.22.0-treeview-xds-dnd.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=545062
+Patch18:	icon-names.patch
+
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -137,6 +140,7 @@ for writing nautilus extensions.
 %patch14 -p1 -b .default-to-asking
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
+%patch18 -p1 -b .icon-names
 
 %build
 
@@ -255,6 +259,9 @@ fi
 
 
 %changelog
+* Sun Jul 27 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.5-2
+- Use standard icon names
+
 * Tue Jul 22 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.23.5.1-1
 - Update to 2.23.5.1