diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index fe05b63557..b780233f22 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  positioning="centered"
  default_tab_group="2"
- height="521"
+ height="561"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -20,7 +20,7 @@
      left_pad="5"
      right="-105"
      name="OK"
-     top="488"
+     top="528"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
@@ -89,7 +89,7 @@
     <tab_container
      follows="all"
      halign="left"
-     height="440"
+     height="480"
      layout="topleft"
      left="0"
      name="pref core"
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 f1593ae59c..d1d80688dd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 3a7ba9921b..35326ba1e0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
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 ccb26278d4..74a18a0b1d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
@@ -424,7 +424,7 @@
     <!-- Making scroll lists follow="all" results in all kinds of havoc :( -Zi -->
     <scroll_list
      follows="top|left|right"
-     height="344"
+     height="384"
      top_pad="8"
      sort_column="2"
      sort_ascending="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
index 342c256eb0..ce7811dd1b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
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 34a8702b61..de106ee70d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
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 f83657dea8..8df8102615 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 49e7df7d4d..98c28a1ea3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="408"
+ height="480"
  label="Controls"
  layout="topleft"
  left="102"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
index 318b01d55f..52eb4a1926 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
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 20ee2fdc43..dfcbae7fa0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index c5c7782d94..9da9723370 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
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 2daee4c182..29b0c515c0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
@@ -1416,50 +1416,13 @@ If you do not understand the distinction then leave this control alone."
          label="HDR and Emissive"
          tool_tip="Enables additional rendering pipeline features on newer machines such as HDR and emissive textures on PBR content."
          layout="topleft"
-         left_delta="10"
+         left="20"
          name="VintageMode"
          top_pad="6"
          width="256">
          <check_box.commit_callback
            function="Pref.RenderOptionUpdate" />
         </check_box>
-        <text
-          type="string"
-          length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left_delta="200"
-          width="200"
-          name="ExcludeAnimeshImposterLabel">
-            Exclude Animesh Impostor Avatar:
-        </text>
-        <combo_box
-         control_name="FSImpostorAvatarExclude"
-         height="23"
-         layout="topleft"
-         tool_tip="Allows for Animesh User or Control Avatars to be excluded from using impostor rendering."
-         left_pad="8"
-         top_delta="-4"
-         name="FSImpostorAvatarExclude"
-         width="80">
-            <combo_box.item
-             label="None"
-             name="0"
-             value="0"/>
-            <combo_box.item
-             label="User"
-             name="1"
-             value="1"/>
-            <combo_box.item
-             label="Control"
-             name="2"
-             value="2"/>
-            <combo_box.item
-             label="Both"
-             name="3"
-             value="3"/>
-        </combo_box>
         <check_box
          control_name="RenderAutoMaskAlphaDeferred"
          height="16"
@@ -1480,7 +1443,7 @@ If you do not understand the distinction then leave this control alone."
          layout="topleft"
          left_delta="0"
          name="RenderGlow"
-         top_pad="2"
+         top_pad="1"
          width="256"/>
 		<slider
 		enabled_control="RenderGlow"
@@ -1509,15 +1472,16 @@ If you do not understand the distinction then leave this control alone."
          initial_value="false"
          label="Show avatars that haven't finished loading"
          layout="topleft"
-         left_delta="-240"
+         left="20"
          name="RenderUnloadedAvatars"
-         top_pad="2"
+         top_pad="1"
          width="256"/>
         <check_box
          follows="top|left"
+         height="16"
          layout="topleft"
          left="20"
-         top_pad="9"
+         top_pad="1"
          label="Show the Scene as Wireframe"
          name="Wireframe">
         <check_box.on_check
@@ -1528,9 +1492,10 @@ If you do not understand the distinction then leave this control alone."
         </check_box>
         <check_box
          follows="top|left"
+         height="16"
          layout="topleft"
          left="20"
-         top_pad="9"
+         top_pad="1"
          width="220"
          label="Enable Attached Lights (Face Lights)"
          tool_tip="This will enable any lights, such as face lights, avatars have attached to them. Useful for turning off facelights when necessary."
@@ -1544,8 +1509,9 @@ If you do not understand the distinction then leave this control alone."
         </check_box>
         <check_box
          layout="topleft"
-         left_pad="20"
-         top_delta="0"
+         left="20"
+         height="16"
+         top_pad="1"
          width="200"
          label="Render Attached Particles"
          name="Render Attached Particles">
@@ -1559,12 +1525,51 @@ If you do not understand the distinction then leave this control alone."
         <check_box
          control_name="FSDrawDistanceVRAMOptimization"
          follows="top|left"
+         height="16"
          layout="topleft"
          left="20"
-         top_pad="9"
+         top_pad="1"
          label="Reduce Draw Distance when VRAM is full"
          name="Reduce Draw Distance when VRAM is full"
          tool_tip="Enables a feature that reduces your draw distance when VRAM becomes full"/>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          top_pad="10"
+          width="200"
+          name="ExcludeAnimeshImposterLabel">
+            Exclude Animesh Impostor Avatar:
+        </text>
+        <combo_box
+         control_name="FSImpostorAvatarExclude"
+         height="20"
+         layout="topleft"
+         tool_tip="Allows for Animesh User or Control Avatars to be excluded from using impostor rendering."
+         left_pad="8"
+         top_delta="-4"
+         name="FSImpostorAvatarExclude"
+         width="80">
+            <combo_box.item
+             label="None"
+             name="0"
+             value="0"/>
+            <combo_box.item
+             label="User"
+             name="1"
+             value="1"/>
+            <combo_box.item
+             label="Control"
+             name="2"
+             value="2"/>
+            <combo_box.item
+             label="Both"
+             name="3"
+             value="3"/>
+        </combo_box>
         <slider
          control_name="PrecachingDelay"
          decimal_digits="0"
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 a14170176a..944eb91c23 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_opensim.xml b/indra/newview/skins/default/xui/en/panel_preferences_opensim.xml
index ca680e29f7..af7b82a4b7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_opensim.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_opensim.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
@@ -23,7 +23,7 @@
   <panel
   border="false"
   follows="all"
-  height="440"
+  height="480"
   layout="topleft"
   left="0"
   top="0"
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 1feddaa65d..28e0b9d8d4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -2,7 +2,7 @@
 <panel
     border="true"
  follows="all"
- height="440"
+ height="480"
     layout="topleft"
  left="1"
     top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 1ec0df2b0f..c12f5e3951 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
index ae630acf37..97c0354142 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_skins.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
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 a3c4cd3bbe..405bff4b17 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
index 4b13fcfa24..0a3f0f0d83 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="408"
+ height="480"
  label="Uploads"
  layout="topleft"
  left="102"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
index f46438a1ec..4e21f44797 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  positioning="centered"
  default_tab_group="2"
- height="521"
+ height="561"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -30,7 +30,7 @@ https://accounts.secondlife.com/change_email/
      left_pad="5"
      right="-105"
      name="OK"
-     top="488"
+     top="528"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_preferences_custom_colors.xml b/indra/newview/skins/starlightcui/xui/en/panel_preferences_custom_colors.xml
index 6076634468..8729f79105 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_preferences_custom_colors.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_preferences_custom_colors.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="440"
+ height="480"
  layout="topleft"
  left="1"
  top="1"