diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index b187d93b3..c2b6a3918 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -25,21 +25,21 @@
 	<spinner bottom_delta="-25" decimal_digits="0" follows="top" height="16" increment="1" left="148" max_val="3000" min_val="0" width="130" control_name="ConsoleBottomOffset" name="chat_bottom_offset" label="Bottom offset" label_width="80" tool_tip="Offset in pixels between the chat console and the bottom of the viewer."/>
 	<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
 	<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
-	<text bottom_delta="-12" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
+	<text bottom_delta="-12" follows="top" height="10" left="12" mouse_opaque="false" name="text_box6" width="135">Chat Options:</text>
 	<check_box bottom_delta="-8"  follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
 	<check_box bottom_delta="-20" follows="top" height="16" control_name="LetterKeysFocusChatBar" label="Letter keys start typing into local chat" name="letter_keys_start_local_chat"/>
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
 	<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>
 	<check_box bottom_delta="-20" control_name="PlayTypingAnim" follows="top" height="16" initial_value="true" label="Play typing animation when chatting" name="play_typing_animation"/>
-	<text bottom="-365" height="10" left="12" name="text_box7">Bubble Chat:</text>
-	<check_box bottom="-370" control_name="UseChatBubbles" height="16" initial_value="false" label="Show chat bubbles" left="148" name="bubble_text_chat"/>
-	<slider bottom="-386" can_edit_text="false" control_name="ChatBubbleOpacity" height="12" increment="0.05" initial_val="1" label="Opacity" max_val="1" min_val="0" name="bubble_chat_opacity" value="0.5" width="200"/>
+	<text bottom_delta="-32" follows="top" height="10" left="12" name="text_box7">Bubble Chat:</text>
+	<check_box bottom_delta="-5" follows="top" control_name="UseChatBubbles" height="16" initial_value="false" label="Show chat bubbles" left="148" name="bubble_text_chat"/>
+	<slider bottom_delta="-16" follows="top" can_edit_text="false" control_name="ChatBubbleOpacity" height="12" increment="0.05" initial_val="1" label="Opacity" max_val="1" min_val="0" name="bubble_chat_opacity" value="0.5" width="200"/>
 <!--
-	<text bottom="-410" height="10" left="12" name="text_translate_chat">Translate Chat:</text>
-	<check_box bottom="-417" control_name="TranslateChat" height="16" initial_value="false" label="Use machine translation while chatting (powered by Google)" left="148" name="translate_chat"/>
-	<text bottom="-432" height="10" left="149" name="text_translate_chat">Translate into this language:</text>	
-		<combo_box allow_text_entry="true" bottom="-438" follows="top" height="16" left_delta="183" max_chars="135" name="translate_language_combobox" width="146">
+	<text bottom_delta="-24" follows="top" height="10" left="12" name="text_translate_chat">Translate Chat:</text>
+	<check_box bottom_delta="-7" follows="top" control_name="TranslateChat" height="16" initial_value="false" label="Use machine translation while chatting (powered by Google)" left="148" name="translate_chat"/>
+	<text bottom_delta="-15" follows="top" height="10" left="149" name="text_translate_chat">Translate into this language:</text>
+		<combo_box allow_text_entry="true" bottom_delta="-6" follows="top" height="16" left_delta="183" max_chars="135" name="translate_language_combobox" width="146">
 		<combo_item name="System Default Language" value="default">System Default</combo_item>
 		<combo_item name="English" value="en">English</combo_item>
 		<!- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. ->