diff -up gvfs-0.99.3/daemon/gvfsbackendburn.c.icon-names gvfs-0.99.3/daemon/gvfsbackendburn.c
--- gvfs-0.99.3/daemon/gvfsbackendburn.c.icon-names	2008-07-27 21:44:52.000000000 -0400
+++ gvfs-0.99.3/daemon/gvfsbackendburn.c	2008-07-27 21:45:38.000000000 -0400
@@ -344,7 +344,7 @@ g_vfs_backend_burn_init (GVfsBackendBurn
   
   /* Translators: This is the name of the backend */
   g_vfs_backend_set_display_name (backend, _("Burn"));
-  g_vfs_backend_set_icon_name (backend, "gnome-fs-client");
+  g_vfs_backend_set_icon_name (backend, "computer");
   g_vfs_backend_set_user_visible (backend, FALSE);
 
   mount_spec = g_mount_spec_new ("burn");
diff -up gvfs-0.99.3/daemon/gvfsbackendcomputer.c.icon-names gvfs-0.99.3/daemon/gvfsbackendcomputer.c
--- gvfs-0.99.3/daemon/gvfsbackendcomputer.c.icon-names	2008-07-27 21:45:52.000000000 -0400
+++ gvfs-0.99.3/daemon/gvfsbackendcomputer.c	2008-07-27 21:46:41.000000000 -0400
@@ -177,7 +177,7 @@ g_vfs_backend_computer_init (GVfsBackend
   GMountSpec *mount_spec;
   
   g_vfs_backend_set_display_name (backend, _("Computer"));
-  g_vfs_backend_set_icon_name (backend, "gnome-fs-client");
+  g_vfs_backend_set_icon_name (backend, "computer");
   g_vfs_backend_set_user_visible (backend, FALSE);
 
   mount_spec = g_mount_spec_new ("computer");
@@ -691,7 +691,7 @@ try_query_info (GVfsBackend *backend,
       g_file_info_set_name (info, "/");
       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
       g_file_info_set_display_name (info, _("Computer"));
-      icon = g_themed_icon_new ("gnome-fs-client");
+      icon = g_themed_icon_new ("computer");
       g_file_info_set_icon (info, icon);
       g_object_unref (icon);
       g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, FALSE);
diff -up gvfs-0.99.3/daemon/gvfsbackenddnssd.c.icon-names gvfs-0.99.3/daemon/gvfsbackenddnssd.c
--- gvfs-0.99.3/daemon/gvfsbackenddnssd.c.icon-names	2008-07-27 21:54:51.000000000 -0400
+++ gvfs-0.99.3/daemon/gvfsbackenddnssd.c	2008-07-27 21:56:35.000000000 -0400
@@ -50,10 +50,10 @@ static struct {
 	char *icon;
 	gpointer handle;
 } dns_sd_types[] = {
-	{"_ftp._tcp", "ftp", "gnome-fs-ftp"},
-	{"_webdav._tcp", "dav", "gnome-fs-share"},
-	{"_webdavs._tcp", "davs", "gnome-fs-share"},
-	{"_sftp-ssh._tcp", "sftp", "gnome-fs-ssh"},
+	{"_ftp._tcp", "ftp", "folder-remote-ftp"},
+	{"_webdav._tcp", "dav", "folder-remote"},
+	{"_webdavs._tcp", "davs", "folder-remote"},
+	{"_sftp-ssh._tcp", "sftp", "folder-remote-ssh"},
 };
 
 static AvahiClient *global_client = NULL;