diff --git a/indra/newview/skins/metaharper/xui/en/floater_quickprefs.xml b/indra/newview/skins/metaharper/xui/en/floater_quickprefs.xml
index 56f6e9b1c2..51554cd2a5 100644
--- a/indra/newview/skins/metaharper/xui/en/floater_quickprefs.xml
+++ b/indra/newview/skins/metaharper/xui/en/floater_quickprefs.xml
@@ -4,7 +4,7 @@
     can_resize="false"
     can_dock="true"
     can_close="false"
-    height="220"
+    height="243"
     width="260"
     layout="topleft"
     name="quickprefs"
@@ -19,7 +19,7 @@
     left="0"
     top="16"
     width="260"
-    height="200"
+    height="220"
     follows="all"
     layout="topleft">
         <text
@@ -30,7 +30,7 @@
             layout="topleft"
             left="5"
             name="Draw Distance"
-            tool_tip=""
+            tool_tip="Change your Draw Distance"
             mouse_opaque="false"
             top="10"
             width="90">
@@ -60,7 +60,7 @@
             layout="topleft"
             left="5"
             name="Particles"
-            tool_tip=""
+            tool_tip="Amount of particles to render"
             mouse_opaque="false"
             top_delta="20"
             width="90">
@@ -90,7 +90,7 @@
             layout="topleft"
             left="5"
             name="Avatar Physics LOD"
-            tool_tip=""
+            tool_tip="Controls level of detail of avatar physics (such as breast physics)"
             mouse_opaque="false"
             top_delta="20"
             width="90">
@@ -110,7 +110,7 @@
             min_val="0"
             name="RenderAvatarPhysicsLOD"
             top_delta="-2"
-            width="146"
+            width="147"
             label_width="3"/>
         <text
             type="string"
@@ -120,7 +120,7 @@
             layout="topleft"
             left="5"
             name="LOD Factor"
-            tool_tip=""
+            tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail) [Default varies]"
             mouse_opaque="false"
             top_delta="20"
             width="90">
@@ -140,7 +140,7 @@
             min_val="0"
             name="RenderVolumeLODFactor"
             top_delta="-2"
-            width="157"
+            width="158"
             label_width="14"/>
         <text
             type="string"
@@ -150,7 +150,7 @@
             layout="topleft"
             left="5"
             name="Max Avatars"
-            tool_tip=""
+            tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Imposters to be on. [Default 12]"
             mouse_opaque="false"
             top_delta="20"
             width="90">
@@ -170,7 +170,7 @@
             min_val="1"
             name="RenderAvatarMaxVisible"
             top_delta="-2"
-            width="150"
+            width="152"
             label_width="17"/>
         <text
             type="string"
@@ -180,7 +180,7 @@
             layout="topleft"
             left="5"
             name="Height Offset"
-            tool_tip=""
+            tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."
             mouse_opaque="false"
             top_delta="20"
             width="90">
@@ -200,8 +200,46 @@
             min_val="-2"
             name="AvatarZOffset"
             top_delta="-2"
-            width="164"
+            width="165"
             label_width="17"/>
+        <text
+            type="string"
+            length="1"
+            follows="left|top"
+            height="0"
+            layout="topleft"
+            left="5"
+            name="name_tags_textbox"
+			top_pad="8"
+            width="400">
+            Name tags:
+        </text>
+		<radio_group
+            control_name="AvatarNameTagMode"
+            height="20"
+            layout="topleft"
+            left="35"
+            top_pad="0" 
+            name="Name_Tag_Preference">
+         <radio_item
+            label="On"
+            name="radio"
+            top_delta="20" 
+            layout="topleft"
+            height="16" 
+            left="72" 
+            value="1"
+            width="75" />
+         <radio_item
+            label="Off"
+            left_pad="-10"
+            layout="topleft"
+            top_delta="0" 
+            height="16" 
+            name="radio2"
+            value="0"
+            width="75" />
+        </radio_group>
         <text
             type="string"
             length="1"
@@ -210,7 +248,7 @@
             layout="topleft"
             left="5"
             name="WL Sky"
-            tool_tip=""
+            tool_tip="Windlight presets for your sky"
             mouse_opaque="false"
             top_delta="27"
             width="90">
@@ -255,7 +293,7 @@
             layout="topleft"
             left="5"
             name="WL Water"
-            tool_tip=""
+            tool_tip="Windlight presets for your water"
             mouse_opaque="false"
             top_delta="25"
             width="90">