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 c14ed5fa53..2b4b72a835 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -294,7 +294,7 @@
          height="10"
          layout="topleft"
          left="210"
-         name="ToastSpaceText"
+         name="ToastSpaceTextLabel"
          top_pad="7"
          width="145">
             Space between lowest
@@ -342,7 +342,7 @@
          max_val="300"
          name="ToastLifetime"
          top_pad="7"
-         width="266" />
+         width="273" />
         <text
          type="string"
          length="1"
@@ -561,7 +561,7 @@
          left="210"
          min_val="1"
          max_val="90"
-         name="OverflowToastHeight"
+         name="NearbyToastWidth"
          top_pad="7"
          width="272" />
         <text
@@ -571,7 +571,7 @@
          height="16"
          layout="topleft"
          left_delta="269"
-         name="OverflowToastHeightText"
+         name="NearbyToastWidthText"
          top_delta="0"
          width="50">
             %
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 0977747ea7..79607f4d14 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -247,7 +247,7 @@
          height="16"
          name="RenderVolumeSAProtection"
          width="380"
-         tool_tip="This protects you from objects with very large textures over large surface areas often designed to crash the viewer. Default is 5000 square meters, but if you find that some objects are not rendering and this option is enabled you may need to lower it."/>
+         tool_tip="This protects you from objects with very large textures over large surface areas often designed to crash the viewer. Default is 5000 square meters, but if you find that some objects are not rendering and this option is enabled you may need to increase it."/>
         <spinner
          top_delta="-5"
          control_name="RenderVolumeSAFrameMax"
@@ -258,7 +258,7 @@
          left_pad="5"
          increment="1"
          initial_val="5000"
-         max_val="2000"
+         max_val="10000"
          min_val="500"
          name="RenderVolumeSAFrameMax"
          width="90" />
@@ -279,7 +279,7 @@
          follows="left|top"
          height="15"
          layout="topleft"
-         left_delta="20"
+         left="30"
          name="AntiSpamText1"
          width="200">
            Max lines in a single message:
@@ -306,7 +306,7 @@
          follows="left|top"
          height="15"
          layout="topleft"
-         left_delta="-200"
+         left="30"
          name="AntiSpamText2"
          width="200">
            Max events from same source:
@@ -333,7 +333,7 @@
          follows="left|top"
          height="15"
          layout="topleft"
-         left_delta="-200"
+         left="30"
          name="AntiSpamText3"
          width="200">
            Sound play requests multiplier:
@@ -360,7 +360,7 @@
          follows="left|top"
          height="15"
          layout="topleft"
-         left_delta="-200"
+         left="30"
          name="AntiSpamText4"
          width="200">
            Sound preload requests multiplier:
@@ -412,7 +412,7 @@
          height="12"
          layout="topleft"
          name="HeadMovement"
-         width="408">
+         width="500">
             Amount that Avatar's head Follows Mouse (set to '0' for no movement):
         </text>
         <slider
@@ -479,7 +479,7 @@
          layout="topleft"
          text_color="White_50"
          height="12"
-         width="300">
+         width="500">
              (Avatar look at target settings are on the Privacy tab.)
         </text>
 
@@ -540,7 +540,7 @@
          tool_tip="Create a new color preset"
          left="15"
          bottom_delta="25"
-         width="75"
+         width="80"
          height="20"
          follows="left|top" />
 
@@ -550,7 +550,7 @@
          tool_tip="Refresh the preset list"
          left="15"
          bottom_delta="25"
-         width="75"
+         width="80"
          height="20"
          follows="left|top" />
 
@@ -650,7 +650,7 @@
          tool_tip="Customize the beam shape"
          left_delta="-20"
          bottom_delta="25"
-         width="75"
+         width="80"
          height="20"
          follows="left|top"/>
 
@@ -660,7 +660,7 @@
          tool_tip="Refresh the beam list"
          left_delta="0"
          bottom_delta="25"
-         width="75"
+         width="80"
          height="20"
          follows="left|top" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index df192253db..a1adbb377e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -1025,7 +1025,7 @@
          word_wrap="true"
          layout="topleft"
          left="20"
-         name="shadows_label">
+         name="TextureDetailLabel">
             Texture Details Loaded:
         </text>
         <combo_box