diff --git a/ChangeLog b/ChangeLog
index 5f1232757d..4b37f50689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-22  Dennis Cranston  <dennis_cranston@yahoo.com>
+
+	* gtk/gtkfilechooserbutton.c: (change_icon_theme),
+	(model_add_bookmarks), (model_update_current_folder):
+	* gtk/gtkfilechooserdefault.c: (shortcuts_reload_icons),
+	(shortcuts_insert_path):  Use the remote folder icon when
+	appropriate.
+
+	Follow up to #354887
+
 2007-06-17  Christian Persch  <chpe@gnome.org>
 
 	* gtk/Makefile.am: Pass the print settings to the preview programme.
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 7b08b933e8..c8bb2d8ad5 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1348,7 +1348,7 @@ change_icon_theme (GtkFileChooserButton *button)
 		 * If we switch to a better bookmarks file format (XBEL), we
 		 * should use mime info to get a better icon.
 		 */
-		pixbuf = gtk_icon_theme_load_icon (theme, "gnome-fs-regular",
+		pixbuf = gtk_icon_theme_load_icon (theme, "gnome-fs-share",
 						   priv->icon_size, 0, NULL);
 	    }
 	  else
@@ -1895,7 +1895,7 @@ model_add_bookmarks (GtkFileChooserButton *button,
 	    }
 
 	  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
-	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
 					     button->priv->icon_size, 0, NULL);
 
 	  gtk_list_store_insert (store, &iter, pos);
@@ -2004,8 +2004,16 @@ model_update_current_folder (GtkFileChooserButton *button,
 	}
       
       icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
-      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
-					 button->priv->icon_size, 0, NULL);
+      if (gtk_file_system_path_is_local (button->priv->fs, path)) 
+	{
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+					     button->priv->icon_size, 0, NULL);
+	}
+      else
+	{
+	  pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
+					     button->priv->icon_size, 0, NULL);
+	}
       
       gtk_list_store_set (store, &iter,
 			  ICON_COLUMN, pixbuf,
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b93d2ae03b..63bdaf2fdd 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1410,7 +1410,7 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
 	           * should use mime info to get a better icon.
 	           */
 	          icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
-	          pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+	          pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
 						     impl->icon_size, 0, NULL);
 
 	          gtk_list_store_set (impl->shortcuts_model, &iter,
@@ -1811,7 +1811,7 @@ shortcuts_insert_path (GtkFileChooserDefault *impl,
            * should use mime info to get a better icon.
            */
           icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
-          pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+          pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-share", 
 					     impl->icon_size, 0, NULL);
         }
     }