http://bugzilla.gnome.org/show_bug.cgi?id=350962

https://bugzilla.novell.com/show_bug.cgi?id=117333

Use "gnome-fs-directory" instead of "file-manager" as an icon.  A
folder is more recognizable than a filing cabinet.

--- nautilus-2.15.4/nautilus-file-management-properties.desktop.in.in
+++ nautilus-2.15.4/nautilus-file-management-properties.desktop.in.in
@@ -3,7 +3,7 @@
 _Name=File Management
 _Comment=Change how files are managed
 Exec=nautilus-file-management-properties
-Icon=file-manager
+Icon=gnome-fs-directory
 Terminal=false
 Type=Application
 StartupNotify=true
--- nautilus-2.15.4/nautilus.desktop.in.in
+++ nautilus-2.15.4/nautilus.desktop.in.in
@@ -4,7 +4,7 @@
 _Comment=Browse the file system with the file manager
 TryExec=nautilus
 Exec=nautilus --no-desktop --browser %U
-Icon=file-manager
+Icon=gnome-fs-directory
 Terminal=false
 StartupNotify=true
 Type=Application
--- nautilus-2.15.4/src/nautilus-file-management-properties.c
+++ nautilus-2.15.4/src/nautilus-file-management-properties.c
@@ -632,7 +632,7 @@
 			  G_CALLBACK (nautilus_file_management_properties_dialog_response_cb),
 			  xml_dialog);
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "gnome-fs-directory");
 
 	if (window) {
 		gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
--- nautilus-2.15.4/src/nautilus-navigation-window.c
+++ nautilus-2.15.4/src/nautilus-navigation-window.c
@@ -851,7 +851,7 @@
 static char *
 real_get_icon_name (NautilusWindow *window)
 {
-	return g_strdup ("file-manager");
+	return g_strdup ("gnome-fs-directory");
 }
 
 static void