diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c79ae52774..156b2d9769 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1798,12 +1798,12 @@ bool LLAppViewer::initLogging()
 
 	// Remove the last ".old" log file.
 	std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-							     "SecondLife.old");
+							     "Firestorm.old");
 	LLFile::remove(old_log_file);
 
 	// Rename current log file to ".old"
 	std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
-							     "SecondLife.log");
+							     "Firestorm.log");
 	LLFile::rename(log_file, old_log_file);
 
 	// Set the log file to SecondLife.log
@@ -3459,7 +3459,7 @@ void LLAppViewer::badNetworkHandler()
 		"the issue. \n"
 		" \n"
 		"If the problem continues, see the Tech Support FAQ at: \n"
-		"www.secondlife.com/support";
+		"www.phoenixviewer.com/support";
 	forceDisconnect(message.str());
 	
 	LLApp::instance()->writeMiniDump();
@@ -4507,7 +4507,7 @@ void LLAppViewer::launchUpdater()
 	query_map["channel"] = gSavedSettings.getString("VersionChannelName");
 	// *TODO constantize this guy
 	// *NOTE: This URL is also used in win_setup/lldownloader.cpp
-	LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
+	LLURI update_url = LLURI::buildHTTP("phoenixviewer.com", 80, "update.php", query_map);
 	
 	if(LLAppViewer::sUpdaterInfo)
 	{
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index f12bc16d4b..7967da9067 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -114,7 +114,7 @@ void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 		case 400:
 			args["FILE"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
 			args["REASON"] = "Error in upload request.  Please visit "
-				"http://secondlife.com/support for help fixing this problem.";
+				"http://phoenixviewer.com/support for help fixing this problem.";
 			LLNotificationsUtil::add("CannotUploadReason", args);
 			break;
 		case 500:
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index fbec2a7b9e..78044498b5 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -677,7 +677,8 @@ void test_cached_control()
 	TEST_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
 //There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd); 
 
-	if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
+	// AO - Phoenixviewer doesn't want to send unecessary noise to secondlife.com
+	// if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
 }
 #endif // TEST_CACHED_CONTROL
 
diff --git a/indra/win_crash_logger/firestorm_icon.ico b/indra/win_crash_logger/firestorm_icon.ico
new file mode 100644
index 0000000000..f5438079cc
Binary files /dev/null and b/indra/win_crash_logger/firestorm_icon.ico differ
diff --git a/indra/win_crash_logger/win_crash_logger.rc b/indra/win_crash_logger/win_crash_logger.rc
index 2819722f63..dfecc6258d 100644
--- a/indra/win_crash_logger/win_crash_logger.rc
+++ b/indra/win_crash_logger/win_crash_logger.rc
@@ -31,7 +31,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_WIN_CRASH_LOGGER    ICON                    "ll_icon.ico"
+IDI_WIN_CRASH_LOGGER    ICON                    "firestorm_icon.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -78,7 +78,7 @@ BEGIN
     CONTROL         "Remember this choice",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,106,89,13
     LTEXT           "Sending crash reports is the best way to help us improve the quality of %s.",IDC_STATIC_MOTIVATION,4,43,288,8
     LTEXT           "If you continue to experience this problem, please try:",IDC_STATIC,4,57,251,8
-    LTEXT           "- Contacting support by visiting http://www.secondlife.com/support",IDC_STATIC,4,67,231,8
+    LTEXT           "- Contacting support by visiting http://www.phoenixviewer.com/support",IDC_STATIC,4,67,231,8
 END
 
 IDD_PREVREPORTBOX DIALOGEX 100, 100, 232, 213
@@ -96,9 +96,9 @@ BEGIN
     LTEXT           "logs, all of which are used for debugging purposes only.",IDC_STATIC,4,33,210,8
     LTEXT           "In the space below, please briefly describe what you were doing",IDC_STATIC,3,48,208,8
     LTEXT           "or trying to do just prior to the crash.",IDC_STATIC,3,56,204,8
-    LTEXT           "If you don't wish to send Linden Lab a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
+    LTEXT           "If you don't wish to send a crash report, press Don't Send.",IDC_STATIC,3,90,223,8
     LTEXT           "This report is NOT read by customer support.  If you have billing or",IDC_STATIC,3,68,208,8
-    LTEXT           "other questions, please go to: www.secondlife.com/support",IDC_STATIC,3,76,206,8
+    LTEXT           "other questions, please go to: www.phoenixviewer.com/support",IDC_STATIC,3,76,206,8
     CONTROL         "Remember this choice",IDC_CHECK_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,193,89,13
 END