--- ghaldrive.c.orig	2008-11-29 17:32:37.000000000 +0000
+++ ghaldrive.c	2008-11-29 17:30:06.000000000 +0000
@@ -231,7 +231,7 @@
   drive_type = hal_device_get_property_string (d, "storage.drive_type");
   drive_bus = hal_device_get_property_string (d, "storage.bus");
   is_audio_player = hal_device_has_capability (d, "portable_audio_player");
-  icon_from_hal = hal_device_get_property_string (d, "info.desktop.icon");
+  icon_from_hal = hal_device_get_property_string (d, "storage.icon.drive");
 
   if (strlen (icon_from_hal) > 0)
     s = g_strdup (icon_from_hal);
--- ghalmount.c.orig	2008-11-29 17:34:32.000000000 +0000
+++ ghalmount.c	2008-11-29 17:28:43.000000000 +0000
@@ -354,8 +354,8 @@
   volume_disc_is_blank = hal_device_get_property_bool (volume, "volume.disc.is_blank");
   volume_disc_type = hal_device_get_property_string (volume, "volume.disc.type");
   is_audio_player = hal_device_has_capability (drive, "portable_audio_player");
-  icon_from_hal = hal_device_get_property_string (drive, "info.desktop.icon");
-  volume_icon_from_hal = hal_device_get_property_string (volume, "info.desktop.icon");
+  icon_from_hal = hal_device_get_property_string (drive, "storage.icon.drive");
+  volume_icon_from_hal = hal_device_get_property_string (volume, "storage.icon.volume");
   name_from_hal = hal_device_get_property_string (drive, "info.desktop.name");
   volume_name_from_hal = hal_device_get_property_string (volume, "info.desktop.name");
 
