diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 09cafa632c..b8d6b0ef8a 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14096,7 +14096,7 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>SpeakerParticipantRemoveDelay</key>
     <map>
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index 65679778c1..00f2de0579 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -419,7 +419,7 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id)
 	if(!mParticipantList)
 	{
 		LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(session_id);
-		mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), true,false);
+		mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("grp_speakers_list"), true,false);
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 2c32d9d303..8297952be8 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -2,28 +2,6 @@
 <context_menu
  layout="topleft"
  name="Participant List Context Menu">
-    <menu_item_check
-     label="Sort by Name"
-     layout="topleft"
-     name="SortByName">
-        <on_check
-         function="ParticipantList.CheckItem"
-         parameter="is_sorted_by_name" />
-        <on_click
-         function="ParticipantList.Sort"
-         parameter="sort_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort by Recent Speakers"
-     layout="topleft"
-     name="SortByRecentSpeakers">
-        <on_check
-         function="ParticipantList.CheckItem"
-         parameter="is_sorted_by_recent_speakers" />
-        <on_click
-         function="ParticipantList.Sort"
-         parameter="sort_by_recent_speakers" />
-    </menu_item_check>
     <menu_item_call
      label="View Profile"
      layout="topleft"
@@ -84,6 +62,31 @@
          function="ParticipantList.EnableItem"
          parameter="can_pay" />
     </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Sort Separator" />
+    <menu_item_check
+     label="Sort by Name"
+     layout="topleft"
+     name="SortByName">
+        <on_check
+         function="ParticipantList.CheckItem"
+         parameter="is_sorted_by_name" />
+        <on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort by Recent Speakers"
+     layout="topleft"
+     name="SortByRecentSpeakers">
+        <on_check
+         function="ParticipantList.CheckItem"
+         parameter="is_sorted_by_recent_speakers" />
+        <on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_recent_speakers" />
+    </menu_item_check>
     <menu_item_separator
      layout="topleft"
      name="View Icons Separator" />
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 5730adab8a..7d9694caec 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -35,7 +35,7 @@
              height="130"
              ignore_online_status="true"
              layout="topleft"
-             name="speakers_list"
+             name="grp_speakers_list"
              opaque="false"
              show_info_btn="true"
              show_profile_btn="false"
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index b47fdefb09..7c93202a01 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -34,7 +34,7 @@
              height="90"
              ignore_online_status="true"
              layout="topleft"
-             name="speakers_list"
+             name="grp_speakers_list"
              opaque="false"
              show_info_btn="true"
              show_profile_btn="false"