--- gnome-settings-daemon-2.91.8/plugins/media-keys/gsd-media-keys-window.c	2010-12-15 17:11:52.000000000 -0500
+++ hacked/plugins/media-keys/gsd-media-keys-window.c	2011-01-18 08:33:51.038766001 -0500
@@ -83,9 +83,9 @@
                         volume_controls_set_visible (window, TRUE);
 
                         if (window->priv->volume_muted) {
-                                window_set_icon_name (window, "audio-volume-muted");
+                                window_set_icon_name (window, "audio-volume-muted-symbolic");
                         } else {
-                                window_set_icon_name (window, "audio-volume-high");
+                                window_set_icon_name (window, "audio-volume-high-symbolic");
                         }
 
                         break;
@@ -124,9 +124,9 @@
 
         if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
                 if (window->priv->volume_muted) {
-                        window_set_icon_name (window, "audio-volume-muted");
+                        window_set_icon_name (window, "audio-volume-muted-symbolic");
                 } else {
-                        window_set_icon_name (window, "audio-volume-high");
+                        window_set_icon_name (window, "audio-volume-high-symbolic");
                 }
         }
 }
@@ -357,10 +357,10 @@
         int                icon_size;
         int                n;
         static const char *icon_names[] = {
-                "audio-volume-muted",
-                "audio-volume-low",
-                "audio-volume-medium",
-                "audio-volume-high",
+                "audio-volume-muted-symbolic",
+                "audio-volume-low-symbolic",
+                "audio-volume-medium-symbolic",
+                "audio-volume-high-symbolic",
                 NULL
         };
 
@@ -625,7 +625,7 @@
                              cr,
                              icon_box_x0, icon_box_y0,
                              icon_box_width, icon_box_height);
-        if (! res && g_strcmp0 (window->priv->icon_name, "media-eject") == 0) {
+        if (! res && g_str_has_prefix (window->priv->icon_name, "media-eject")) {
                 /* draw eject symbol */
                 draw_eject (cr,
                             icon_box_x0, icon_box_y0,
--- gnome-settings-daemon-2.91.8/plugins/media-keys/test-media-window.c	2010-09-30 17:51:00.000000000 -0400
+++ hacked/plugins/media-keys/test-media-window.c	2011-01-18 08:37:38.337766002 -0500
@@ -63,7 +63,7 @@
                 break;
         case 4:
                 gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (window),
-                                                         "media-eject",
+                                                         "media-eject-symbolic",
                                                          FALSE);
 
                 gtk_widget_show (window);
