diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in b/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
index 66b8b90aa..122007320 100755
--- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
+++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
@@ -15,7 +15,7 @@ function install_desktop_entry()
 Name=@VIEWER_BRANDING_ID@\n\
 Comment=Client for Online Virtual Worlds, such as Second Life\n\
 Exec=${installation_prefix}/@VIEWER_BRANDING_ID@\n\
-Icon=${installation_prefix}/@VIEWER_BRANDING_ID@_icon.png\n\
+Icon=${installation_prefix}/viewer_icon.png\n\
 Terminal=false\n\
 Type=Application\n\
 Categories=Application;Network;\n\
diff --git a/indra/newview/linux_tools/register_secondlifeprotocol.sh b/indra/newview/linux_tools/register_secondlifeprotocol.sh
index f4af742fa..16e73cb85 100755
--- a/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -7,10 +7,10 @@
 HANDLER="$1"
 
 RUN_PATH=`dirname "$0" || echo .`
-cd "${RUN_PATH}"
+cd "${RUN_PATH}/.."
 
 if [ -z "$HANDLER" ]; then
-    HANDLER=`pwd`/handle_secondlifeprotocol.sh
+    HANDLER=`pwd`/etc/handle_secondlifeprotocol.sh
 fi
 
 # Register handler for GNOME-aware apps
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e703cb096..7eb685d89 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -970,7 +970,7 @@ class LinuxManifest(ViewerManifest):
         icon_path = self.icon_path()
         print "DEBUG: icon_path '%s'" % icon_path
         if self.prefix(src=icon_path, dst="") :
-            self.path("viewer_256.png","viewer_icon.png")
+            self.path("viewer_icon.png")
             if self.prefix(src="",dst="res-sdl") :
                 self.path("viewer_256.BMP","viewer_icon.BMP")
                 self.end_prefix("res-sdl")