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

From: Federico Mena Quintero <federico@gnu.org>

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-file-management-properties.desktop.in.in |    2 +-
 nautilus.desktop.in.in                            |    2 +-
 src/nautilus-file-management-properties.c         |    2 +-
 src/nautilus-navigation-window.c                  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/nautilus-file-management-properties.desktop.in.in b/nautilus-file-management-properties.desktop.in.in
index a696c81..d372b64 100644
--- a/nautilus-file-management-properties.desktop.in.in
+++ b/nautilus-file-management-properties.desktop.in.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=File Management
 _Comment=Change the behaviour and appearance of file manager windows
 Exec=nautilus-file-management-properties
-Icon=system-file-manager
+Icon=gnome-fs-directory
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/nautilus.desktop.in.in b/nautilus.desktop.in.in
index ef7d18d..ed6314f 100644
--- a/nautilus.desktop.in.in
+++ b/nautilus.desktop.in.in
@@ -4,7 +4,7 @@ _Name=File Browser
 _Comment=Browse the file system with the file manager
 TryExec=nautilus
 Exec=nautilus --no-desktop --browser %U
-Icon=system-file-manager
+Icon=gnome-fs-directory
 Terminal=false
 StartupNotify=true
 Type=Application
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 6fcb700..b1338f6 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -789,7 +789,7 @@ nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindo
 			       (GClosureNotify)g_object_unref,
 			       0);
 
-	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));
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index f22e2cd..a23cfca 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -949,7 +949,7 @@ real_set_title (NautilusWindow *window, const char *title)
 static NautilusIconInfo *
 real_get_icon (NautilusWindow *window)
 {
-	return nautilus_icon_info_lookup_from_name ("file-manager", 48);
+	return nautilus_icon_info_lookup_from_name ("gnome-fs-directory", 48);
 }
 
 static void