diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index aa9d9fa67c..3326f5ec8d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -41,7 +41,7 @@
          name="UI Size:"
          top_pad="8"
          width="200">
-            UI Scaling (may have side effects):
+            UI Scaling (may cause side effects):
         </text>
         <slider
          control_name="UIScaleFactor"
@@ -60,7 +60,7 @@
 
         <text
          type="string"
-         left="5"
+         left="10"
          top_pad="5"
          length="1"
          follows="left|top"
@@ -70,7 +70,6 @@
          width="100">
             Hover Tips:
         </text>
-
         <check_box
          control_name="ShowHoverTips"
          height="16"
@@ -100,20 +99,36 @@
          label="on Land"
          tool_tip="Set this to show hover tips on land"
          layout="topleft"
-         left_delta="0"
          name="ShowLandHoverTips"
          top_pad="2"
          width="256" />
+		<check_box
+		control_name="FSAdvancedTooltips"
+		name="FSAdvancedTooltips"
+		label="Show extended information in hovertips (Phoenix style)"
+		layout="topleft"
+		top_pad="2"
+		left_delta="-10"
+		height="16"
+		width="350" />
+        <check_box
+		control_name="FSShowGroupTitleInTooltip"
+		name="FSShowGroupTitleInTooltip"
+		label="Show avatar group titles in hovertips"
+		layout="topleft"
+		top_pad="2"
+		height="16"
+		width="350" />
 
         <text
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="12"
          layout="topleft"
-         left="275"
+         left="265"
          name="tooltip_textbox"
-         top_pad="-70"
+         top="30"
          width="200">
            Hovertip Trigger Delays:
         </text>
@@ -128,12 +143,12 @@
          label="Tooltips:"
          label_width="50"
          layout="topleft"
-         left_pad="-200"
          max_val="6.0"
          min_val="0"
          name="ToolTipDelay_slider"
          tool_tip="Delay after that tooltips for user interface elements such as buttons are shown. (Default: 0.7)"
          top_pad="1"
+         left="275"
          width="200" />
         <text
          type="string"
@@ -141,7 +156,7 @@
          follows="left|top"
          height="16"
          layout="topleft"
-         left_delta="200"
+         left_pad="1"
          name="ToolTipDelay_text"
          top_delta="0"
          width="80">
@@ -158,7 +173,7 @@
          label="Avatars:"
          label_width="50"
          layout="topleft"
-         left_pad="-280"
+         left="275"
          max_val="6.0"
          min_val="0"
          name="AvatarInspectorTooltipDelay_slider"
@@ -171,7 +186,7 @@
          follows="left|top"
          height="16"
          layout="topleft"
-         left_delta="200"
+         left_pad="1"
          name="AvatarInspectorTooltipDelay_text"
          top_delta="0"
          width="80">
@@ -188,7 +203,7 @@
          label="Objects:"
          label_width="50"
          layout="topleft"
-         left_pad="-280"
+         left="275"
          max_val="6.0"
          min_val="0"
          name="ObjectInspectorTooltipDelay_slider"
@@ -201,31 +216,12 @@
          follows="left|top"
          height="16"
          layout="topleft"
-         left_delta="200"
+         left_pad="1"
          name="ObjectInspectorTooltipDelay_text"
          top_delta="0"
          width="80">
             seconds
         </text>
-		
-        <check_box
-         control_name="FSAdvancedTooltips"
-         name="FSAdvancedTooltips"
-         label="Show extended information in hovertips (classic Phoenix style)"
-         layout="topleft"
-         top_pad="5"
-         left="15"
-         height="16"
-         width="350" />
-
-        <check_box
-         control_name="FSShowGroupTitleInTooltip"
-         name="FSShowGroupTitleInTooltip"
-         label="Show avatar group titles in hovertips"
-         layout="topleft"
-         top_pad="2"
-         height="16"
-         width="350" />		
 
       <check_box
        control_name="UsePieMenu"
@@ -235,10 +231,10 @@
        layout="topleft"
        left="5"
        name="UsePieMenu"
-       tool_tip="Use the classic V1.x circular menu instead of the rectangular context menus when right clicking on land, avatars, objects or attachments."
-       top_pad="5"
+       tool_tip="Use the classic V1 ring menu instead of rectangular context menus when right clicking on land, avatars, objects or attachments."
+       top="140"
        width="256" />
-
+      
       <check_box
        top_pad="2"
        control_name="ShowNetStats"
@@ -247,7 +243,6 @@
        initial_value="false"
        name="ShowNetStats"
        label="Show lag meter"
-       left="5"
        width="110"
        tool_tip="Show lag meter in the Status Overlay"/>
 
@@ -256,53 +251,60 @@
        height="16"
        name="FSEnableVolumeControls"
        label="Show media controls in top menu"
-       left_pad="5"
        width="256"
        tool_tip="If checked, Firestorm will show media controls (volume, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls."/>
 
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        name="tooltip_textbox"
+        left="5"
+        top_pad="2"
+        width="200">
+        Use stand-alone windows for:
+      </text>
+      
       <check_box
        top_pad="2"
        control_name="FSUseStandaloneGroupFloater"
        follows="left|top"
        height="16"
        name="FSUseStandaloneGroupFloater"
-       label="Use stand-alone windows for group profiles"
-       left="5"
-       width="270"
+       label="Group profiles"
+       left="15"
+       width="170"
        tool_tip="If enabled, group profiles will open in separate windows."/>
-
       <check_box
-       top_pad="2"
        control_name="FSUseStandaloneTeleportHistoryFloater"
        follows="left|top"
        height="16"
        name="FSUseStandaloneTeleportHistoryFloater"
-       label="Use stand-alone window for teleport history"
-       left="5"
-       width="270"
+       label="Teleport history"
+       left_pad="5"
+       width="170"
        tool_tip="If enabled, using the shortcut for teleport history will open the history in a separate window."/>
-
-      <check_box
-       top_pad="2"
-       control_name="FSUseStandalonePlaceDetailsFloater"
-       follows="left|top"
-       height="16"
-       name="FSUseStandalonePlaceDetailsFloater"
-       label="Use stand-alone windows for landmarks, place details and teleport history details"
-       left="5"
-       width="270"
-       tool_tip="If enabled, landmarks, place details and teleport history details will open in separate windows."/>
-
       <check_box
        top_pad="2"
        control_name="FSUseStandaloneBlocklistFloater"
        follows="left|top"
        height="16"
        name="FSUseStandaloneBlocklistFloater"
-       label="Use stand-alone window for the block/mute list"
-       left="5"
-       width="270"
+       label="Block/mute list"
+       left="15"
+       width="170"
        tool_tip="If enabled, the list of blocked/muted residents and objects will open in a separate window."/>
+      <check_box
+       control_name="FSUseStandalonePlaceDetailsFloater"
+       follows="left|top"
+       height="16"
+       name="FSUseStandalonePlaceDetailsFloater"
+       label="Landmarks, place details and teleport history details"
+       left_pad="5"
+       width="170"
+       tool_tip="If enabled, landmarks, place details and teleport history details will open in separate windows."/>
 
       <text
        type="string"
@@ -323,7 +325,7 @@
        height="16"
        name="FSTeleportHistoryShowPosition"
        label="Position"
-       left_pad="5"
+       left_pad="15"
        width="75"
        tool_tip="If enabled, the local coordinates within the region will be shown in the teleport history."/>
 
@@ -341,7 +343,7 @@
       <text
        type="string"
        left="5"
-       top_pad="10"
+       top_pad="6"
        width="140"
        follows="left|top"
        height="16"
@@ -380,7 +382,7 @@
          left="5"
          name="ShowScriptDialogsTopRight"
          tool_tip="Set this to move script dialog notifications to the top right corner of the screen (Classic V1.x behavior)."
-         top_pad="4"
+         top_pad="2"
          width="256" />
         <check_box
          control_name="ShowGroupNoticesTopRight"
@@ -388,7 +390,6 @@
          initial_value="true"
          label="Group Notices and chiclets in Top Right"
          layout="topleft"
-         left_delta="0"
          name="ShowGroupNoticesTopRight"
          tool_tip="Set this to move group notifications and chiclet icons to the top right corner of the screen (Classic V1.x behavior)."
          top_pad="2"
@@ -426,15 +427,14 @@
          layout="topleft"
          name="ButtonFlashing"
          width="128"
-         label="Global Flashing Buttons Override"/>
+         label="Flashing IM tabs override"/>
         <slider
          control_name="FSButtonFlashCount"
          decimal_digits="0"
          follows="left|top"
          height="16"
          increment="1"
-         label="Number of times buttons flash:"
-         tool_tip="Number of times buttons flash"
+         label="Number of times IM tabs flash:"
          label_width="300"
          layout="topleft"
          left="30"
@@ -449,8 +449,8 @@
          follows="left|top"
          height="16"
          increment="0.25"
-         label="Rate button flashes at:"
-         tool_tip="Rate buttons flash at (in Hz) - used for IM notifications"
+         label="IM tab flash rate:"
+         tool_tip="Rate at which tabs flash (in Hz) - used for IM notifications"
          label_width="300"
          layout="topleft"
          left="30"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 2080c69b27..8d68d13d99 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -62,7 +62,7 @@
      height="18"
      control_name="FSPaymentInfoInChat"
      name="FSPaymentInfoInChat"
-     label="Show L$ transactions in nearby chat instead of toasts"/>
+     label="Report L$ transactions in nearby chat instead of toasts"/>
 
     <check_box
      control_name="FSLandmarkCreatedNotification"
@@ -102,7 +102,7 @@
      layout="topleft"
      left_pad="5"
      name="show_script_errors_location"
-     width="200">
+     width="250">
         <radio_item
          height="16"
          label="Nearby chat"
@@ -122,28 +122,106 @@
          value="1"
          width="100" />
     </radio_group>
-     <check_box
-      control_name="FSEnableGrowl"
+    <text
+        type="string"
+        length="1"
+        follows="top|left"
+        height="15"
+        layout="topleft"
+        left="30"
+        top_pad="2"
+        name="friends_logon_label"
+        width="400">
+        When my friends log in or out:
+    </text>
+        
+    <check_box
+    control_name="ChatOnlineNotification"
+    height="16"
+    label="As toasts"
+    layout="topleft"
+    name="friends_online_notify_checkbox"
+    top_pad="2"
+    width="100" />
+    <check_box
+      control_name="OnlineOfflinetoNearbyChat"
+      name="OnlineOfflinetoNearbyChat"
+      label="In nearby chat and console"
+      layout="topleft"
+      left_pad="0"
+      height="18"
+      width="190">
+      <check_box.commit_callback
+      function="Pref.Online_Notices" />
+    </check_box>
+    <check_box
+      enabled="false"
+      control_name="OnlineOfflinetoNearbyChatHistory"
+      follows="left|top"
+      height="18"
+      label="In nearby chat only"
+      layout="topleft"
+      left_pad="0"
+      name="OnlineOfflinetoNearbyChatHistory"
+      width="180" />
+      <text
+        type="string"
+        length="1"
+        follows="top|left"
+        height="15"
+        layout="topleft"
+        left="30"
+        top_pad="2"
+        name="friends_logon_sounds_label"
+        width="225">
+        Play a sound when my friends:
+      </text>
+      <check_box
+      control_name="PlayModeUISndFriendOnline"
+      name="friends_notify_online_sound"
+      label="Log in"
+      layout="topleft"
+      left_pad="10"
       height="16"
-      label="Enable Growl Notifications"
+      width="85" />
+      <check_box
+      control_name="PlayModeUISndFriendOffline"
+      name="friends_notify_offline_sound"
+      label="Log out"
+      layout="topleft"
+      left_pad="0"
+      height="18"
+      width="85" />
+      
+      <check_box
+      control_name="FSReportTotalScriptCountChanges"
+      height="16"
+      label="When the region's total script count changes:"
       layout="topleft"
       left="10"
-      name="notify_growl_checkbox"
       top_pad="2"
-      width="160"/>
-     <check_box
+      name="FSReportTotalScriptCountChanges"
+      width="300" />
+      <spinner
+      top_delta="0"
+      control_name="FSReportTotalScriptCountChangesThreshold"
+      enabled_control="FSReportTotalScriptCountChanges"
+      decimal_digits="0"
       layout="topleft"
       follows="left|top"
-      left="20"
-      top_pad="2"
       height="18"
-      control_name="FSGrowlWhenActive"
-      name="notify_growl_always_checkbox"
-      label="Enable Growl even if Firestorm is active"/>
+      left_pad="0"
+      increment="1"
+      max_val="10000"
+      min_val="0"
+      name="FSReportTotalScriptCountChangesThreshold"
+      width="90"
+      tool_tip="The threshold for total script count changes before reporting [Default: 100]"/>
+	
     <check_box
      control_name="FSCollisionMessagesInChat"
      height="16"
-     label="Show collision notifications in nearby chat"
+     label="Report collision notifications to nearby chat"
      layout="topleft"
      left="10"
      top_pad="2"
@@ -155,124 +233,45 @@
      label="Report collision notifications to scripts on channel"
      layout="topleft"
      left="10"
-     top_pad="10"
+     top_pad="2"
      name="FSReportCollisionMessages"
      width="300" />
-	<spinner
-	 top_delta="-5"
-	 control_name="FSReportCollisionMessagesChannel"
-	 enabled_control="FSReportCollisionMessages"
-	 decimal_digits="0"
-	 layout="topleft"
-	 follows="left|top"
-	 height="18"
-	 left_pad="0"
-	 increment="1"
-	 initial_value="-25000"
-	 max_val="2147483647"
-	 min_val="-2147483648"
-	 name="FSReportCollisionMessagesChannel"
-	 width="90"
-	 tool_tip="The channel used for reporting collision messages to scripts [Default: -25000]"/>
+    <spinner
+      top_delta="-5"
+      control_name="FSReportCollisionMessagesChannel"
+      enabled_control="FSReportCollisionMessages"
+      decimal_digits="0"
+      layout="topleft"
+      follows="left|top"
+      height="18"
+      left_pad="0"
+      increment="1"
+      initial_value="-25000"
+      max_val="2147483647"
+      min_val="-2147483648"
+      name="FSReportCollisionMessagesChannel"
+      width="90"
+      tool_tip="The channel used for reporting collision messages to scripts [Default: -25000]"/>
+      
     <check_box
-     control_name="FSReportTotalScriptCountChanges"
-     height="16"
-     label="Report total script count changes"
-     layout="topleft"
-     left="10"
-     top_pad="10"
-     name="FSReportTotalScriptCountChanges"
-     width="300" />
-	<spinner
-	 top_delta="-5"
-	 control_name="FSReportTotalScriptCountChangesThreshold"
-	 enabled_control="FSReportTotalScriptCountChanges"
-	 decimal_digits="0"
-	 layout="topleft"
-	 follows="left|top"
-	 height="18"
-	 left_pad="0"
-	 increment="1"
-	 max_val="10000"
-	 min_val="0"
-	 name="FSReportTotalScriptCountChangesThreshold"
-	 width="90"
-	 tool_tip="The threshold for total script count changes before reporting [Default: 100]"/>
-
-	 <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="15"
-     layout="topleft"
-     left="10"
-     top_pad="10"
-     name="friends_logon_label"
-     width="400">
-        Show when my friends log in or out:
-    </text>
-	 
+      control_name="FSEnableGrowl"
+      height="16"
+      label="Enable Growl Notifications"
+      layout="topleft"
+      left="10"
+      name="notify_growl_checkbox"
+      top_pad="16"
+      width="160"/>
     <check_box
-     control_name="ChatOnlineNotification"
-     height="16"
-     label="As toasts"
-     layout="topleft"
-     left="10"
-     name="friends_online_notify_checkbox"
-     top_pad="2"
-     width="100" />
-    <check_box
-     control_name="OnlineOfflinetoNearbyChat"
-     name="OnlineOfflinetoNearbyChat"
-     label="In nearby chat and console"
-     layout="topleft"
-     left_pad="0"
-     height="18"
-     width="190">
-     <check_box.commit_callback
-    function="Pref.Online_Notices" />
-    </check_box>
-    <check_box
-     enabled="false"
-     control_name="OnlineOfflinetoNearbyChatHistory"
-     follows="left|top"
-     height="18"
-     label="In nearby chat only"
-     layout="topleft"
-     left_pad="0"
-     name="OnlineOfflinetoNearbyChatHistory"
-     width="180" />
-
-	 <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="15"
-     layout="topleft"
-     left="10"
-     top_pad="10"
-     name="friends_logon_sounds_label"
-     width="400">
-        Play a sound when my friends:
-    </text>
-	 
-    <check_box
-     control_name="PlayModeUISndFriendOnline"
-     name="friends_notify_online_sound"
-     label="Log in"
-     layout="topleft"
-     left="10"
-     top_pad="2"
-     height="16"
-     width="85" />
-    <check_box
-     control_name="PlayModeUISndFriendOffline"
-     name="friends_notify_offline_sound"
-     label="Log out"
-     layout="topleft"
-     left_pad="0"
-     height="18"
-     width="85" />
+      enabled_control="FSEnableGrowl"
+      layout="topleft"
+      follows="left|top"
+      left_delta="10"
+      top_pad="2"
+      height="18"
+      control_name="FSGrowlWhenActive"
+      name="notify_growl_always_checkbox"
+      label="Show Growl Notifications even when Firestorm is active"/>
     </panel>
 
     <!-- Alerts -->
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index b36b417c89..0fa68c1123 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -147,7 +147,7 @@
             <check_box
              control_name="FSChatsUppercase"
              height="16"
-             label="Display Group chats, IM sessions and nearby chat always in uppercase"
+             label="Always display group chats, IM sessions and nearby chat in uppercase"
              layout="topleft"
              left="30"
              name="chat_always_in_uppercase"
@@ -223,7 +223,7 @@
             <check_box
              enabled="true"
              height="16"
-             label="Remove chat headers (revert to V1 Style)"
+             label="Use V1 style chat headers"
              layout="topleft"
              left_delta="0"
              name="plain_text_chat_history"
@@ -233,7 +233,7 @@
              control_name="ShowChatMiniIcons"
              height="16"
              initial_value="false"
-             label="When using chat headers, show mini icons"
+             label="When using V2/3 style chat headers, show mini icons"
              layout="topleft"
              left="30"
              name="ShowChatMiniIcons"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 1dc56f82a8..e937bdd95e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1211,7 +1211,7 @@
      <check_box
        control_name="MiniMapChatRing"
        name="MiniMapChatRing"
-       label="Display a ring on the Minimap indicating local chat range:"
+       label="Display rings on the mini map indicating the say and shout chat ranges:"
        layout="topleft"
        top_pad="16"
        left="25"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index bfef8c17f9..5c2119aac0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -65,32 +65,29 @@
          width="270"
          control_name="FSWorldMapDoubleclickTeleport"
          tool_tip="Enables teleporting via double click to a destination on the world map."/>
-        <check_box
-         top_pad="5"
-         follows="left|top"
-         height="16"
-         label="Disable Teleport Screens"
-         left="15"
-         name="tp_screen_toggle"
-         width="270"
-         control_name="FSDisableTeleportScreens"
-         tool_tip="Disables the black teleport screen during all teleports."/>
-        <check_box
+		<check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Disable Teleport Beacons"
-         left="15"
          name="tp_beam_toggle"
          width="270"
          control_name="FSDisableBeaconAfterTeleport"
          tool_tip="Disables the teleport destination beacons after teleports."/>
+        <check_box
+         top_pad="5"
+         follows="left|top"
+         height="16"
+         label="Disable Teleport Screens"
+         name="tp_screen_toggle"
+         width="270"
+         control_name="FSDisableTeleportScreens"
+         tool_tip="Disables the black teleport screen during all teleports."/>
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Disable Login Progress Screen"
-         left_delta="0"
          name="login_screen_toggle"
          width="270"
          control_name="FSDisableLoginScreens"
@@ -100,7 +97,6 @@
          follows="left|top"
          height="16"
          label="Disable Logout Progress Screen"
-         left_delta="0"
          name="logout_screen_toggle"
          width="270"
          control_name="FSDisableLogoutScreens"
@@ -110,18 +106,15 @@
          follows="left|top"
          height="16"
          label="Always rez objects under the land group if possible"
-         left="15"
          name="grouplandrez"
          width="270"
          control_name="RezUnderLandGroup"
          tool_tip="Attempts to rez objects under the land group if you're in the land group regardless of which current group tag you're wearing."/>
-
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Sort contact lists by username even when display names are shown"
-         left="15"
          name="sortcontactsbyun"
          width="270"
          control_name="FSSortContactsByUserName"
@@ -129,84 +122,70 @@
             <check_box.commit_callback
              function="FS.ToggleSortContacts" />
         </check_box>
-
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Render blocked avatars as particle cloud"
-         left="15"
          name="ShowMutedAvatarsAsCloud"
          width="270"
          control_name="ShowMutedAvatarsAsCloud"
          tool_tip="Blocked avatars will be rendered as a particle cloud in special color.">
         </check_box>
-
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Hide empty system folders from inventory"
-         left="15"
          name="DebugHideEmptySystemFolders"
          width="270"
          control_name="DebugHideEmptySystemFolders"
          tool_tip="If enabled, the inventory windows will hide all empty system folders like Favorites, Landmarks etc.">
         </check_box>
-
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Show the Received Items folder in normal inventory"
-         left="15"
          name="FSShowInboxFolder"
          width="270"
          control_name="FSShowInboxFolder"
          tool_tip="If enabled, the inventory windows will also show the Received Items folder">
         </check_box>
-
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Allow separate search terms on each tab in inventory"
-         left="15"
          name="FSSplitInventorySearchOverTabs"
          width="270"
          control_name="FSSplitInventorySearchOverTabs"
          tool_tip="If enabled, it is possible to enter a different search term for each tab in inventory.">
         </check_box>
-
         <check_box
          top_pad="5"
          follows="left|top"
          height="16"
          label="Deactivate tracking beacon when reaching the targeted avatar (&lt;= 3m)"
-         left="15"
          name="FSDisableAvatarTrackerAtCloseIn"
          width="270"
          control_name="FSDisableAvatarTrackerAtCloseIn"
          tool_tip="If enabled, the tracking beacon will be disabled automatically, if the distance to the targeted avatar is less than 3m. (Default)"/>
-
 		<check_box
 		 control_name="EffectScriptChatParticles"
 		 height="16"
 		 label="Create particle effects when scripts communicate"
 		 layout="topleft"
-		 left="15"
 		 name="EffectScriptChatParticles"
 		 tool_tip="If enabled scripted objects display swirling particle lights when the scripts communicate"
 		 initial_value="true"
 		 top_pad="5"
 		 width="350" />
-
 		<check_box
 		 control_name="FSRenderFarClipStepping"
 		 height="16"
 		 label="Enable progressive draw distance stepping"
 		 layout="topleft"
-		 left="15"
 		 name="FSRenderFarClipStepping"
 		 tool_tip="If enabled, Firestorm will use a progressive draw distance stepping after teleporting."
 		 initial_value="true"
@@ -229,7 +208,7 @@
 		 tool_tip="Interval in seconds between each draw distance increment"/>
 
         <check_box
-         top_pad="15"
+         top_pad="5"
          control_name="UseLSLBridge"
          follows="left|top"
          height="16"
@@ -332,7 +311,7 @@
         </radio_group>
 
         <text
-         left="5"
+         left="10"
          top_pad="5"
          follows="left|top"
          height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 77754a485e..9b3111a61a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -116,7 +116,7 @@
          control_name="DisableCameraConstraints"
          height="16"
          initial_value="true"
-         label="Allow greater camera freedom"
+         label="Disable camera contraints"
          layout="topleft"
          left_delta="0"
          name="DisableCameraConstraints"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index e011c425f1..ab671dc0e8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -260,21 +260,21 @@
          top="10"
          follows="left|top"
          height="16"
-         label="Show look at targets"
+         label="Show look at targets:"
          left="15"
          name="showlookat"
          width="270"
          control_name="DebugLookAt"
-         tool_tip="Enable crosshairs marking where people are looking."/>
+         tool_tip="The LookAt point is an animation hint, viewers use it to know which way to turn your eyes, head and torso. It can also be used to determine the anchor point of an avatar's camera."/>
         <text
          type="string"
          length="1"
          follows="left|top"
          height="15"
          layout="topleft"
-         left="30"
+         left="35"
          name="lookatshownames"
-		 tool_tip="Select whether to show avatar names on the LookAt crosshairs"
+         tool_tip="Name format to show avatar names on the look at targets"
          top_pad="5"
          width="200">
             Show names for look at targets:
@@ -314,59 +314,57 @@
              name="User_Name"
              value="4" />
         </combo_box>
-
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="15"
-         name="mylookat"
-         top_pad="25"
-         width="200">
-            My LookAt:
-        </text>
 		<check_box
-         control_name="DebugLookAtHideOwn"
-         height="16"
-		 initial_value="true"
-         label="Don't show me my lookat target"
-         layout="topleft"
-         left="20"
-         name="LookAtHideOwn"
-		 tool_tip="Don't show me my own camera crosshairs"
-         top_pad="4"
-         width="350" />
+		enabled_control="DebugLookAt"
+		control_name="DebugLookAtHideOwn"
+		height="16"
+		initial_value="true"
+		label="Don't show me my own lookat target"
+		layout="topleft"
+		left="30"
+		name="LookAtHideOwn"
+		tool_tip="Don't show me my own camera crosshairs"
+		top_pad="4"
+		width="350" />
 
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="15"
+      layout="topleft"
+      left="15"
+      name="mylookat"
+      top_pad="25"
+      width="200">
+        My look at targets:
+      </text>
         <check_box
          control_name="PrivateLookAtTarget"
          height="16"
-         label="Don't send my actual camera target hints to others"
+         label="Don't send my look at targets to others"
          layout="topleft"
-         left="20"
+         left_delta="15"
          name="privatelookat"
-		 tool_tip="Prevents your camera focus point from showing to others"
+         tool_tip="Prevents your look at hints from being broadcast to others"
          top_pad="4"
          width="350" />
-
         <check_box
          control_name="PrivateLocalLookAtTarget"
          height="16"
-         label="Don't set any camera target hints even on my own screen."
+         label="Don't send any look at targets at all, not even to myself"
          layout="topleft"
          name="privateLocalLookat"
-		 tool_tip="Prevents your avatar's head from moving to face a point your camera is focused on in your own view. This head movement is not necessarily visible to others whether or not this option is enabled"
+         tool_tip="Prevents your avatar's head from moving to face a point your camera is focused on in your own view. This head movement is not necessarily visible to others whether or not this option is enabled"
          top_pad="4"
          width="400" />
-
         <check_box
          control_name="PrivatePointAtTarget"
          height="16"
          label="Don't send my selection target hints"
          layout="topleft"
          name="privatepointat"
-		 tool_tip="Prevents your selection point from showing to others"
+         tool_tip="Prevents your selection point from showing to others"
          top_pad="4"
          width="350" />
 
@@ -388,11 +386,11 @@
          follows="left|top"
          height="13"
          layout="topleft"
-         left="30"
+         left="15"
          mouse_opaque="false"
          name="text_box3"
-         top_pad="30"
-         width="400">
+         top="15"
+         width="450">
           Automatic response when in UNAVAILABLE (ie, BUSY)  mode:
         </text>
         <text_editor
@@ -402,10 +400,10 @@
          follows="left|top"
          height="42"
          layout="topleft"
-         left="50"
+         left="35"
          top_pad="10"
          name="busy_response"
-         width="450"
+         width="475"
          word_wrap="true">
          log_in_to_change
         </text_editor>
@@ -416,7 +414,7 @@
          follows="left|top"
          height="13"
          layout="topleft"
-         left="30"
+         left="15"
          mouse_opaque="false"
          name="autorespond_response_label"
          top_pad="10"
@@ -430,10 +428,10 @@
          follows="left|top"
          height="42"
          layout="topleft"
-         left="50"
+         left="35"
          top_pad="10"
          name="autorespond_response"
-         width="450"
+         width="475"
          word_wrap="true">
            log_in_to_change
         </text_editor>
@@ -444,7 +442,7 @@
          follows="left|top"
          height="13"
          layout="topleft"
-         left="30"
+         left="15"
          mouse_opaque="false"
          name="autorespond_nf_response_label"
          top_pad="10"
@@ -458,16 +456,16 @@
          follows="left|top"
          height="42"
          layout="topleft"
-         left="50"
+         left="35"
          top_pad="10"
          name="autorespond_nf_response"
-         width="450"
+         width="475"
          word_wrap="true">
            log_in_to_change
         </text_editor>
 
         <check_box
-         top_pad="20"
+         top_pad="10"
          follows="left|top"
          height="16"
          label="Send autoresponse to MUTED avatars"
@@ -476,19 +474,6 @@
          width="270"
          control_name="FSSendMutedAvatarResponse"
          tool_tip="Send the text below when someone you've muted sends you an IM."/>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="13"
-         layout="topleft"
-         left="30"
-         mouse_opaque="false"
-         name="muted_avatar_response_label"
-         top_pad="10"
-         width="400">
-           Automatic response sent to muted avatars:
-        </text>
         <text_editor
          control_name="FSMutedAvatarResponse"
          use_ellipses="false"
@@ -496,13 +481,39 @@
          follows="left|top"
          height="42"
          layout="topleft"
-         left="50"
+         left="35"
          top_pad="10"
          name="muted_avatar_response"
-         width="450"
+         width="475"
          word_wrap="true">
            log_in_to_change
         </text_editor>
+      
+      <!-- Reserved for future FIRE-10500 implementation
+       <check_box
+        top_pad="10"
+        follows="left|top"
+        height="16"
+        label="Send autoresponse when in AWAY mode:"
+        left="15"
+        name="send_away_av_response"
+        width="270"
+        control_name="FSSendAwayAvatarResponse"
+        tool_tip="Send the text below when someone sends you an IM while you're in away mode."/>
+      <text_editor
+        control_name="FSAwayAvatarResponse"
+        use_ellipses="false"
+        commit_on_focus_lost = "true"
+        follows="left|top"
+        height="42"
+        layout="topleft"
+        left="35"
+        top_pad="10"
+        name="away_avatar_response"
+        width="475"
+        word_wrap="true">
+        log_in_to_change
+      </text_editor>-->
     </panel>
 </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 2e81bd821d..7fa9addf74 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -366,7 +366,7 @@
          height="16"
          width="230"
          tool_tip="This settings allows / disallows scripted prims from controlling your media connections"
-         label="Allow resident scripts to play media"
+         label="Allow inworld scripts to play media"
          top_pad="1"
          left="25"/>
         <check_box
@@ -560,8 +560,8 @@
          name="Media Rolloff"
          mouse_opaque="false"
          top_delta="18"
-         width="155">
-            Media audio rolloff distance:
+         width="250">
+            Sound source rolloff distance:
         </text>
         <slider
          can_edit_text="true"
@@ -573,7 +573,7 @@
          increment="1"
          initial_value="5"
          layout="topleft"
-         left="25"
+         left="45"
          max_val="512"
          min_val="1"
          name="MediaRollOffMin"
@@ -604,7 +604,7 @@
          increment="1"
          initial_value="30"
          layout="topleft"
-         left="25"
+         left="45"
          max_val="512"
          min_val="1"
          name="MediaRollOffMax"