diff -dur thunar-volman-0.3.80.orig/icons/48x48/Makefile.am thunar-volman-0.3.80/icons/48x48/Makefile.am
--- thunar-volman-0.3.80.orig/icons/48x48/Makefile.am	2008-08-21 13:23:29.000000000 +0200
+++ thunar-volman-0.3.80/icons/48x48/Makefile.am	2010-11-06 23:01:13.697843845 +0100
@@ -3,8 +3,7 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
 	tvm-burn-cd.png							\
-	tvm-dev-pocketpc.png						\
-	tvm-dev-tablet.png
+	tvm-dev-pocketpc.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)
diff -dur thunar-volman-0.3.80.orig/icons/48x48/Makefile.in thunar-volman-0.3.80/icons/48x48/Makefile.in
--- thunar-volman-0.3.80.orig/icons/48x48/Makefile.in	2008-09-14 00:10:59.000000000 +0200
+++ thunar-volman-0.3.80/icons/48x48/Makefile.in	2010-11-06 23:01:06.962842979 +0100
@@ -235,8 +235,7 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA = \
 	tvm-burn-cd.png							\
-	tvm-dev-pocketpc.png						\
-	tvm-dev-tablet.png
+	tvm-dev-pocketpc.png
 
 EXTRA_DIST = \
 	$(icons_DATA)
diff -dur thunar-volman-0.3.80.orig/thunar-volman/tvm-preferences-dialog.c thunar-volman-0.3.80/thunar-volman/tvm-preferences-dialog.c
--- thunar-volman-0.3.80.orig/thunar-volman/tvm-preferences-dialog.c	2008-08-21 13:23:30.000000000 +0200
+++ thunar-volman-0.3.80/thunar-volman/tvm-preferences-dialog.c	2010-11-06 22:57:28.719812524 +0100
@@ -162,7 +162,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-removable", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("media-optical", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -264,7 +264,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-cdrom-audio", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("media-optical-cd-audio", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -296,7 +296,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-cdrom", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("media-optical-dvd", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -328,7 +328,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-ipod", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("multimedia-player", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -412,7 +412,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("palm-pilot", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("pda", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -486,7 +486,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-printer", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("printer", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -528,7 +528,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-keyboard", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("input-keyboard", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -560,7 +560,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("gnome-dev-mouse-optical", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("input-mouse", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
@@ -592,7 +592,7 @@
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  image = gtk_image_new_from_icon_name ("tvm-dev-tablet", GTK_ICON_SIZE_DIALOG);
+  image = gtk_image_new_from_icon_name ("input-tablet", GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (image);
diff -dur thunar-volman-0.3.80.orig/thunar-volman-settings.desktop.in.in thunar-volman-0.3.80/thunar-volman-settings.desktop.in.in
--- thunar-volman-0.3.80.orig/thunar-volman-settings.desktop.in.in	2008-08-21 13:23:31.000000000 +0200
+++ thunar-volman-0.3.80/thunar-volman-settings.desktop.in.in	2010-11-06 22:59:15.297827891 +0100
@@ -4,7 +4,7 @@
 _Comment=Configure management of removable drives and media
 _GenericName=Removable Drives and Media
 Exec=@libexecdir@/thunar-volman-settings
-Icon=gnome-dev-removable
+Icon=drive-removable-media
 Terminal=false
 StartupNotify=true
 Type=Application