--- a/src/pkgdefs/SUNWipkg-um/prototype	Mon Dec 14 20:38:32 2009 +0000
+++ b/src/pkgdefs/SUNWipkg-um/prototype	Mon Dec 14 21:23:51 2009 +0000
@@ -34,13 +34,13 @@
 d none usr/share/update-manager/icons/hicolor 755 root bin
 d none usr/share/update-manager/icons/hicolor/24x24 755 root bin
 d none usr/share/update-manager/icons/hicolor/24x24/actions 755 root bin
-f none usr/share/update-manager/icons/hicolor/24x24/actions/notify_update.png 444 root other
+f none usr/share/update-manager/icons/hicolor/24x24/actions/updatemanager.png 444 root other
 d none usr/share/update-manager/icons/hicolor/36x36 755 root bin
 d none usr/share/update-manager/icons/hicolor/36x36/actions 755 root bin
-f none usr/share/update-manager/icons/hicolor/36x36/actions/UM_package.png 444 root other
+f none usr/share/update-manager/icons/hicolor/36x36/actions/updatemanager.png 444 root other
 d none usr/share/update-manager/icons/hicolor/48x48 755 root bin
 d none usr/share/update-manager/icons/hicolor/48x48/actions 755 root bin
-f none usr/share/update-manager/icons/hicolor/48x48/actions/UM_app.png 444 root other
+f none usr/share/update-manager/icons/hicolor/48x48/actions/updatemanager.png 444 root other
 f none usr/share/update-manager/updatemanager.glade 444 root bin
 d none var 755 root sys
 d none var/svc 755 root sys

--- a/src/um/Makefile	Mon Dec 14 20:38:32 2009 +0000
+++ b/src/um/Makefile	Mon Dec 14 21:23:51 2009 +0000
@@ -73,13 +73,13 @@
    data/updatemanager-preferences.schemas
 
 ICONS24 = \
-   data/icons/24x24/notify_update.png
+   data/icons/24x24/updatemanager.png
 
 ICONS36 = \
-   data/icons/36x36/UM_package.png
+   data/icons/36x36/updatemanager.png
 
 ICONS48 = \
-   data/icons/48x48/UM_app.png
+   data/icons/48x48/updatemanager.png
 
 PYGLADE = \
    data/updatemanager.glade

Binary file src/um/data/icons/24x24/notify_update.png has changed

Binary file src/um/data/icons/24x24/updatemanager.png has changed

Binary file src/um/data/icons/36x36/UM_package.png has changed

Binary file src/um/data/icons/36x36/updatemanager.png has changed

Binary file src/um/data/icons/48x48/UM_app.png has changed

Binary file src/um/data/icons/48x48/updatemanager.png has changed

Binary file src/um/data/updatemanager.png has changed

--- a/src/updatemanager.py	Mon Dec 14 20:38:32 2009 +0000
+++ b/src/updatemanager.py	Mon Dec 14 21:23:51 2009 +0000
@@ -173,7 +173,7 @@
                     w_xmltree_um.get_widget("um_updateall_button")
                 self.pm_image = \
                     w_xmltree_um.get_widget("pm_image")
-                self.pm_image.set_from_pixbuf(self.__get_icon_pixbuf('UM_app', 48))
+                self.pm_image.set_from_pixbuf(self.__get_icon_pixbuf('updatemanager', 48))
                 self.w_um_expander = w_xmltree_um.get_widget("um_expander")
                 self.w_um_expander.set_expanded(True)
 
@@ -332,7 +332,7 @@
                     self.__on_package_selection_changed, None)
 
                 # Setup Icons
-                self.w_um_dialog.set_icon(self.__get_icon_pixbuf("UM_package", 36))
+                self.w_um_dialog.set_icon(self.__get_icon_pixbuf("updatemanager", 36))
 
         def __get_image_path(self):
                 '''This function gets the image path or the default'''
@@ -563,7 +563,7 @@
                     parent_name = _("Update Manager"),
                     pkg_list = ["SUNWipkg", "SUNWipkg-gui", "SUNWipkg-um"],
                     main_window = self.w_um_dialog,
-                    icon_confirm_dialog = self.__get_icon_pixbuf("UM_package", 36))
+                    icon_confirm_dialog = self.__get_icon_pixbuf("updatemanager", 36))
                 return
                
         def __on_selectall_checkbutton_toggled(self, widget):

--- a/src/updatemanagernotifier.py	Mon Dec 14 20:38:32 2009 +0000
+++ b/src/updatemanagernotifier.py	Mon Dec 14 21:23:51 2009 +0000
@@ -66,7 +66,7 @@
 CHECK_FOR_UPDATES = "/usr/lib/pm-checkforupdates"
 
 ICON_LOCATION = "/usr/share/update-manager/icons"
-NOTIFY_ICON_NAME = "notify_update"
+NOTIFY_ICON_NAME = "updatemanager"
 GKSU_PATH = "/usr/bin/gksu"
 UPDATEMANAGER = "pm-updatemanager"