diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico
index 1e00530c9016b16548de6890ab5562bbe2cbbe1d..efe6c4f323d216cdced45fdcf0d67ac217440841 100644
Binary files a/indra/newview/installers/windows/install_icon.ico and b/indra/newview/installers/windows/install_icon.ico differ
diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico
index c4ec6c70bd7f325369d8763afef61ee8e93f2960..05e154686092d89fec551319a8ab9ffd906cdd44 100644
Binary files a/indra/newview/installers/windows/uninstall_icon.ico and b/indra/newview/installers/windows/uninstall_icon.ico differ
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 224514dd483c4548d3c20d81f21e77026d0e4517..839d3f0c21cabae0d276fa5ea019c4da5c31f457 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1289,7 +1289,7 @@ BOOL LLPanelPreference::postBuild()
 	if (hasChild("media_enabled"))
 	{
 		bool media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia");
-		getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+		
 		getChild<LLCheckBoxCtrl>("media_enabled")->set(media_enabled);
 		getChild<LLCheckBoxCtrl>("autoplay_enabled")->setEnabled(media_enabled);
 	}
@@ -1297,7 +1297,11 @@ BOOL LLPanelPreference::postBuild()
 	{
 		getChild<LLCheckBoxCtrl>("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic"));
 	}
-	
+	if (hasChild("voice_call_friends_only_check"))
+	{
+		getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+	}
+
 	apply();
 	return true;
 }
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 1dc601e26094d046272bb1b538cd2b042ac371db..b3f085ef6d566718a01243bbfbaf52077d52ca40 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1565,7 +1565,7 @@ void LLCallDialog::onOpen(const LLSD& key)
 	LLDockableFloater::onOpen(key);
 
 	// it should be over the all floaters. EXT-5116
-	gFloaterView->bringToFront(this);
+	gFloaterView->bringToFront(this, FALSE);
 }
 
 void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id)
diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico
index c35a3fa3a3423e3ce6de9568c28978930ca99fe8..87985b9285118128e6e9e3eb344fdde0b60481d7 100644
Binary files a/indra/newview/res/ll_icon.ico and b/indra/newview/res/ll_icon.ico differ
diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns
index ceb6036e0ef7805a2386693a5baf872e87c5427e..4560d4bb2440bbeed09e95039ba4a42450d61af7 100644
Binary files a/indra/newview/secondlife.icns and b/indra/newview/secondlife.icns differ
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 936f4a3fab9c2fc3cae685d082ad457ffd9200bf..14347e146bd8cb1e419ee5ed1986c99ce11bab80 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -249,7 +249,7 @@ Save all changes to clothing/body parts?
     Non-friends won't know that you've choosen to ignore their calls and instant messages.
     <usetemplate
      name="okbutton"
-     yestext="Yes"/>
+     yestext="OK"/>
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 5147bb72d09a64c5e8a5d63bbbacaad26114a24f..701a14e1c52260e9248c8d50bfc03f3cca5da688 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -44,11 +44,16 @@ background_visible="true"
      tab_stop="false"
      top="2"
      width="23" />
-    <text
+    <text_editor
+     allow_scroll="false"
+     bg_visible="false"
+     read_only = "true"
      layout="topleft"
      name="group_name"
+     v_pad="0"
      value="(Loading...)"
       font="SansSerifHugeBold"
+     h_pad="0"
       height="26"
       left_pad="10"
      text_color="LtGray"