diff --git a/indra/llcommon/llsecondlifeurls.cpp b/indra/llcommon/llsecondlifeurls.cpp
index 9154e05e43..ec231495aa 100644
--- a/indra/llcommon/llsecondlifeurls.cpp
+++ b/indra/llcommon/llsecondlifeurls.cpp
@@ -79,6 +79,6 @@ const std::string SL_KB_URL (
 	"http://secondlife.com/knowledgebase/"); // *TODO: NOT USED
 
 const std::string RELEASE_NOTES_BASE_URL (
-	"http://secondlife.com/app/releasenotes/");
+	"http://wiki.phoenixviewer.com/doku.php?id=release_notes");
 */
 
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ccd0a8d717..2478edbfbc 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -30,7 +30,7 @@
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 4;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 47;
+const S32 LL_VERSION_BUILD = 51;
 
 const char * const LL_CHANNEL = "Firestorm Developer";
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d5ddb330c4..bcc75ee6ac 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1145,7 +1145,7 @@ if (DARWIN)
 
   # Add resource files to the project.
   set(viewer_RESOURCE_FILES
-    secondlife.icns
+    phoenix_icon.icns
     macview.r
     gpu_table.txt
     Info-SecondLife.plist
@@ -1768,13 +1768,13 @@ if (DARWIN)
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
-    MACOSX_BUNDLE_ICON_FILE "secondlife.icns"
+    MACOSX_BUNDLE_ICON_FILE "phoenix_icon.icns"
     MACOSX_BUNDLE_GUI_IDENTIFIER "Firestorm"
     MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
     MACOSX_BUNDLE_BUNDLE_NAME "Firestorm"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf"
     MACOSX_BUNDLE_BUNDLE_VERSION "asdf"
-    MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer"
+    MACOSX_BUNDLE_COPYRIGHT "Copyright 2010The Phoenix Viewer Project"
     )
 
   add_custom_command(
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 0b35077d65..8d77c8d17d 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Firestorm</string>
 	<key>CFBundleIconFile</key>
-	<string>secondlife.icns</string>
+	<string>phoenix_icon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.secondlife.indra.viewer</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index b91e407c6d..d9f65dcc72 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -34,7 +34,7 @@
 #include "llweb.h"
 
                                                             
-const char* DEFAULT_LOGIN_PAGE = "http://secondlife.com/app/login/";
+const char* DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/login/";
 
 const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
 const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
diff --git a/indra/newview/phoenix_icon.icns b/indra/newview/phoenix_icon.icns
new file mode 100644
index 0000000000..b8c23885fb
Binary files /dev/null and b/indra/newview/phoenix_icon.icns differ
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a5d730711c..a92e5329b9 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -13,7 +13,7 @@ top="600"
 </panel.string>
 <panel.string
      name="real_url" translate="false">
-       http://secondlife.com/app/login/
+       http://phoenixviewer.com/app/login/
 </panel.string>
     <string name="reg_in_client_url" translate="false">
      http://secondlife.eniac15.lindenlab.com/reg-in-client/
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index dd7761475e..6d41236426 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -164,7 +164,7 @@ namespace tut
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("Agni login page is correct",
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://phoenixviewer.com/app/login/"));
 		ensure("Agni is a favorite",
 			   grid.has(GRID_IS_FAVORITE_VALUE));
 		ensure("Agni is a system grid", 
@@ -208,7 +208,7 @@ namespace tut
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("Agni login page the same after grid file", 
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://phoenixviewer.com/app/login/"));
 		ensure("Agni still a favorite after grid file", 
 			   grid.has(GRID_IS_FAVORITE_VALUE));
 		ensure("Agni system grid still set after grid file", 
@@ -310,7 +310,7 @@ namespace tut
 					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
 		ensure_equals("Override known grid login uri: login page is not set",
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));		
+					  std::string("http://phoenixviewer.com/app/login/"));		
 		
 		// Override with loginuri
 		// override custom grid
@@ -359,7 +359,7 @@ namespace tut
 					  std::string("https://my.helper.uri/mycustomhelpers"));
 		ensure_equals("Override known grid helper uri: login page is not changed",
 					  grid[GRID_LOGIN_PAGE_VALUE].asString(), 
-					  std::string("http://secondlife.com/app/login/"));		
+					  std::string("http://phoenixviewer.com/app/login/"));		
 		
 		// Override with helperuri
 		// override custom grid
@@ -451,9 +451,9 @@ namespace tut
 		ensure_equals("getHelperURI", LLGridManager::getInstance()->getHelperURI(), 
 					  std::string("https://secondlife.com/helpers/"));
 		ensure_equals("getLoginPage", LLGridManager::getInstance()->getLoginPage(), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://phoenixviewer.com/app/login/"));
 		ensure_equals("getLoginPage2", LLGridManager::getInstance()->getLoginPage("util.agni.lindenlab.com"), 
-					  std::string("http://secondlife.com/app/login/"));
+					  std::string("http://phoenixviewer.com/app/login/"));
 		ensure("Is Agni a production grid", LLGridManager::getInstance()->isInProductionGrid());		
 		std::vector<std::string> uris;
 		LLGridManager::getInstance()->getLoginURIs(uris);
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 2e758bfeff..e95ca5e596 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -587,9 +587,9 @@ class DarwinManifest(ViewerManifest):
                 # If we are not using the default channel, use the 'Firstlook
                 # icon' to show that it isn't a stable release.
                 if self.default_channel() and self.default_grid():
-                    self.path("secondlife.icns")
+                    self.path("phoenix_icon.icns")
                 else:
-                    self.path("secondlife_firstlook.icns", "secondlife.icns")
+                    self.path("phoenix_icon.icns", "phoenix_icon.icns") # Does nothing, but we could change it to use a beta icon later. - AO
                 self.path("SecondLife.nib")
                 
                 # Translations