diff --git a/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
index 973c09e25..cfb2857cc 100644
--- a/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
@@ -1,42 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="perm prefs" title="Default Upload Permissions"
-     width="315" height="180" rect_control="FloaterPermPrefsRect" 
-     can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false" >
-    <panel label="Permissions" name="permissions" width="315" height="120" left="10"
-        border="false" bottom="-140" enabled="true" follows="left|top|right|bottom"
-        mouse_opaque="true" >
-    	<button name="help" label="?" label_selected="?" halign="center" follows="left"
-			     bottom_delta="-25" height="18" width="22" left="260" font="SansSerif" />
-    	<check_box bottom_delta="0" follows="left|top" width="106" height="16" left="10"
-    	     initial_value="false" label="Share with group" 
-    	     mouse_opaque="true" radio_style="false" font="SansSerifSmall" 
-    	     name="share_with_group" control_name="ShareWithGroup" />
-    	<check_box bottom_delta="-32" follows="left|top" width="130" height="16"
-    	     initial_value="false" label="Allow anyone to copy" left="10"
-    	     mouse_opaque="true" radio_style="false" font="SansSerifSmall" 
-    	     name="everyone_copy" control_name="EveryoneCopy" />
-    	<text bottom_delta="-26" bg_visible="false" border_drop_shadow_visible="false" 
-    	     drop_shadow_visible="true" follows="left|top" border_visible="false"
-    	     font="SansSerifSmall" h_pad="0" halign="left" left="10"
-    	     mouse_opaque="true" name="NextOwnerLabel" v_pad="0" width="190" height="10" >
-    		Next owner can:
-    	</text>
-    	<check_box bottom_delta="-30" follows="left|top" width="78" height="16"
-    	     radio_style="false" font="SansSerifSmall" 
-    	     initial_value="false" label="Modify" left="10" mouse_opaque="true"
-    	     name="next_owner_modify" control_name="NextOwnerModify" />
-    	<check_box bottom_delta="0" follows="left|top" width="88" height="16"
-    	     left_delta="78" radio_style="false" font="SansSerifSmall" 
-    	     initial_value="false" label="Copy" mouse_opaque="true"
-    	     name="next_owner_copy" control_name="NextOwnerCopy" />
-    	<check_box bottom_delta="0" follows="left|top" width="106" height="16"
-    	     left_delta="88" radio_style="false" font="SansSerifSmall" 
-    	     initial_value="true" label="Resell/Give away" mouse_opaque="true" enabled="false" 
-    	     name="next_owner_transfer" control_name="NextOwnerTransfer" />
+<floater name="perm prefs" title="Default Upload Permissions" width="315" height="180" rect_control="FloaterPermPrefsRect" can_close="true" can_minimize="true">
+    <panel label="Permissions" name="permissions" width="292" height="120" left="10" border="true" bottom="-140">
+    	<button name="help" label="?" label_selected="?" bottom_delta="-25" height="18" width="22" left="260"/>
+    	<check_box bottom_delta="0" width="106" height="16" left="10" initial_value="false" label="Share with group" name="share_with_group" control_name="ShareWithGroup"/>
+    	<check_box bottom_delta="-32" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
+    	<text bottom_delta="-26" name="NextOwnerLabel" height="10">Next owner can:</text>
+		<check_box bottom_delta="-30" width="78" height="16" initial_value="false" label="Modify" name="next_owner_modify" control_name="NextOwnerModify"/>
+		<check_box bottom_delta="0" width="88" height="16" left_delta="78" initial_value="false" label="Copy" name="next_owner_copy" control_name="NextOwnerCopy"/>
+    	<check_box bottom_delta="0" width="106" height="16" left_delta="88" initial_value="true" label="Resell/Give away" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
     </panel>
-    <button bottom_delta="-30" font="SansSerif" halign="center" height="20" label="OK"
-	     label_selected="OK" left="90" mouse_opaque="true" name="ok" width="100" />
-    <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left_delta="105" mouse_opaque="true" name="cancel"
-	     width="100" />    
+	<button bottom_delta="-30" height="20" label="OK" label_selected="OK" left="90" name="ok" width="100"/>
+	<button bottom_delta="0" height="20" label="Cancel" label_selected="Cancel" left_delta="105" name="cancel" width="100"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 735359ee6..db9789249 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" height="160" label="Audio &amp; Video" name="Media panel" width="175">
-	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="top" height="15" increment="0.05" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_audio" toggle="true" width="25"/>
-	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.05" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_music" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="top" height="15" increment="0.05" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_media" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="top" height="15" increment="0.05" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_voice" tab_stop="false" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="top" height="15" increment="0.05" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="top" height="15" increment="0.05" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_wind" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="top" height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_ui" toggle="true" width="25"/>
+<panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
+	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.05" initial_val="0.5" label="Master" label_width="40" left="3" max_val="1" min_val="0" name="System Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
+	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.05" initial_val="0.5" label="Music" label_width="40" left="3" max_val="1" min_val="0" name="Music Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
+	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.05" initial_val="0.5" label="Media" label_width="40" left="3" max_val="1" min_val="0" name="Media Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
+	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.05" initial_val="0.5" label="Voice" label_width="40" left="3" max_val="1" min_val="0" name="Voice Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
+	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.05" initial_val="0.5" label="Sounds" label_width="40" left="3" max_val="1" min_val="0" name="SFX Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
+	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.05" initial_val="0.5" label="Ambient" label_width="40" left="3" max_val="1" min_val="0" name="Wind Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
+	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.05" initial_val="0.5" label="UI" label_width="40" left="3" max_val="1" min_val="0" name="UI Volume" can_edit_text="true" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 329c013a5..2ca59db4b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -3,14 +3,14 @@
 	<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
 	<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
 	<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
-	<panel border="true" bottom="-195" filename="panel_audio.xml" height="180" label="Volume" left="148" name="Volume Panel" width="260"/>
+	<panel border="true" bottom="-175" filename="panel_audio.xml" height="140" label="Volume" left="142" name="Volume Panel" width="260"/>
 	<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
 	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
 	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
 	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
 	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
-	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="100" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="250" />
-	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="100" max_val="2" min_val="0" name="Rolloff Factor" width="250"/>
+	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="69" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="219" />
+	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="69" max_val="2" min_val="0" name="Rolloff Factor" width="219"/>
 	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
 	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="20" label="Health Change Threshold" label_width="128" max_val="10000" min_val="0" name="Health Change Threshold" width="192" />
 </panel>