--- a/src/man/pm-updatemanager.1.txt	Thu Jul 09 13:26:31 2009 -0500
+++ b/src/man/pm-updatemanager.1.txt	Wed Jul 15 13:54:47 2009 +0100
@@ -7,7 +7,7 @@
 SYNOPSIS
      /usr/bin/pm-updatemanager [options]
 
-     /usr/bin/pm-updatemanager [-hrRU]  [--help] [--refresh] [--image-dir dir]
+     /usr/bin/pm-updatemanager [-hRU]  [--help] [--image-dir dir]
         [--update-all be_name]
 
 DESCRIPTION
@@ -21,10 +21,6 @@
      --help or -h
           Displays a usage message.
 
-     ---refresh or -r
-           Force a refresh before checking for updaters. By default, a
-           refresh is not done before checking for updates.
-
      ---image-dir or -R dir
           Operate on the image rooted at dir, rather than the one discovered
           automatically.

--- a/src/um/data/updatemanager.desktop.in	Thu Jul 09 13:26:31 2009 -0500
+++ b/src/um/data/updatemanager.desktop.in	Wed Jul 15 13:54:47 2009 +0100
@@ -2,7 +2,7 @@
 _Name=Update Manager
 _GenericName=Update Manager
 _Comment=Install available updates
-Exec=/usr/lib/pm-launch /usr/bin/pm-updatemanager -r
+Exec=/usr/lib/pm-launch /usr/bin/pm-updatemanager
 Icon=updatemanager
 Terminal=false
 MultipleArgs=false

--- a/src/updatemanager.py	Thu Jul 09 13:26:31 2009 -0500
+++ b/src/updatemanager.py	Wed Jul 15 13:54:47 2009 +0100
@@ -61,7 +61,8 @@
 IMAGE_DIRECTORY_DEFAULT = "/"   # Image default directory
 IMAGE_DIR_COMMAND = "svcprop -p update/image_dir svc:/application/pkg/update"
 
-ICON_LOCATION = "usr/share/package-manager/icons"
+PKG_ICON_LOCATION = "usr/share/package-manager/icons"
+ICON_LOCATION = "usr/share/update-manager/icons"
 PKG_CLIENT_NAME = "updatemanager" # API client name
 SELECTION_CHANGE_LIMIT = 0.5    # Time limit in seconds to cancel selection updates
 IND_DELAY = 0.05                # Time delay for printing index progress
@@ -117,6 +118,8 @@
                 self.ua_be_name = None
                 self.application_path = None
                 self.icon_theme = gtk.IconTheme()
+                pkg_icon_location = os.path.join(self.application_dir, PKG_ICON_LOCATION)
+                self.icon_theme.append_search_path(pkg_icon_location)
                 icon_location = os.path.join(self.application_dir, ICON_LOCATION)
                 self.icon_theme.append_search_path(icon_location)
                 self.ua_start = 0