diff --git a/indra/newview/skins/vintage/xui/en/floater_people.xml b/indra/newview/skins/vintage/xui/en/floater_people.xml
deleted file mode 100644
index 19db62c297..0000000000
--- a/indra/newview/skins/vintage/xui/en/floater_people.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<floater
-  positioning="none"
-  can_close="true"
-  can_resize="true"
-  height="570"
-  help_topic="sidebar_people"
-  min_height="250"
-  min_width="268"
-  layout="topleft"
-  name="floater_people"
-  save_rect="true"
-  save_visibility="true"
-  single_instance="true"
-  reuse_instance="true"
-  title="PEOPLE"
-  width="333">
-    <panel_container
-      default_panel_name="panel_people"
-      follows="all"
-      height="570"
-      name="main_panel"
-      width="333">
-      <panel
-        class="panel_people"
-        name="panel_people"
-        filename="panel_people.xml"/>
-      <panel
-        class="panel_group_info_sidetray"
-        name="panel_group_info_sidetray"
-        filename="panel_group_info_sidetray.xml"
-        label="Group Profile"
-        font="SansSerifBold"/>
-      <panel
-        class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray"
-        filename="panel_block_list_sidetray.xml"
-        label="Blocked Residents &amp; Objects"
-        font="SansSerifBold"/>
-    </panel_container>
-</floater>
diff --git a/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml b/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml
deleted file mode 100644
index 6ced0bed80..0000000000
--- a/indra/newview/skins/vintage/xui/en/panel_fs_radar.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- name="panel_radar"
- width="327"
- height="333">
-	<string name="FlagsColumnType" value="icon"/>
-	<string name="FlagsColumnValue_0" value=""/>
-	<string name="FlagsColumnValue_1" value="Payment_Info_Filled"/>
-	<string name="FlagsColumnValue_2" value="Payment_Info_Used"/>
-	<string
-	 name="MiniMapToolTipMsg"
-	 value="[REGION] (Double-click to open Map, shift-drag to pan)"/>
-	<string
-	 name="AltMiniMapToolTipMsg"
-	 value="[REGION] (Double-click to teleport, shift-drag to pan)"/>
-	<string
-	 name="avatar_name_count"
-	 value="Name [[TOTAL]/[IN_REGION]/[IN_CHAT_RANGE]]"/>
-	<panel
-	 background_opaque="false"
-	 background_visible="false"
-	 follows="all"
-	 height="333"
-	 layout="topleft"
-	 left="0"
-	 name="nearby_panel"
-	 top="0"
-	 width="327">
-		<layout_stack
-		 orientation="vertical"
-		 clip="true"
-		 follows="all"
-		 layout="topleft"
-		 top="0"
-		 left="0"
-		 height="306"
-		 width="327"
-		 mouse_opaque="false"
-		 name="radar_ls"
-		 auto_resize="false"
-		 user_resize="true">
-			<layout_panel
-			 layout="topleft"
-			 top="0"
-			 left="3"
-			 height="140"
-			 width="321"
-			 min_dim="140"
-			 follows="top"
-			 mouse_opaque="false"
-			 visibility_control="ShowRadarMinimap"
-			 name="minimaplayout"
-			 auto_resize="false"
-			 user_resize="true">
-				<net_map
-				 bg_color="NetMapBackgroundColor"
-				 visibility_control="ShowRadarMinimap"
-				 follows="all"
-				 layout="topleft"
-				 left="3"
-				 mouse_opaque="false"
-				 name="Net Map"
-				 width="316"
-				 height="140"
-				 top="0"/>
-			</layout_panel>
-
-			<layout_panel
-			 layout="topleft"
-			 top="0"
-			 left="0"
-			 height="166"
-			 width="327"
-			 mouse_opaque="false"
-			 follows="all"
-			 name="radarlayout">
-				<radar_list
-				 draw_heading="true"
-				 follows="all"
-				 height="166"
-				 layout="topleft"
-				 left="0"
-				 top_pad="0"
-				 sort_column="0"
-				 sort_ascending="true"
-				 name="radar_list"
-				 draw_stripes="true"
-				 multi_select="true"
-				 width="327">
-					<radar_list.columns
-					 label="Name"
-					 name="name"
-					 tool_tip="[TOTAL] avatars, [IN_REGION] in the same region, [IN_CHAT_RANGE] in chat range"
-					 relative_width="0.32"/>
-					<radar_list.columns
-					 label=""
-					 name="voice_level"
-					 tool_tip="Is talking on voice"
-					 relative_width="0.07"/>
-					<radar_list.columns
-					 label="Distance"
-					 name="range"
-					 relative_width="0.15"/>
-					<radar_list.columns
-					 label="Time"
-					 name="seen"
-					 relative_width="0.15"/>
-					<radar_list.columns
-					 label="Age"
-					 name="age"
-					 relative_width="0.1"/>
-					<radar_list.columns
-					 label=""
-					 name="in_region"
-					 tool_tip="Is in the same region"
-					 relative_width="0.03"/>
-					<radar_list.columns
-					 label=""
-					 name="flags"
-					 tool_tip="Payment info status"
-					 relative_width="0.08"/>
-					<radar_list.columns
-					 label="av_id"
-					 name="uuid"
-					 relative_width="0"/>
-				</radar_list>
-			</layout_panel>
-		</layout_stack>
-
-<!--  Buttons -->
-		<panel
-		 background_visible="false"
-		 follows="left|right|bottom"
-		 height="27"
-		 label="bottom_panel"
-		 layout="topleft"
-		 left="0"
-		 name="bottom_panel_nearby"
-		 top_pad="0"
-		 width="327">
-			<menu_button
-			 follows="bottom|left"
-			 height="25"
-			 image_hover_unselected="Toolbar_Left_Over"
-			 image_overlay="OptionsMenu_Off"
-			 image_selected="Toolbar_Left_Selected"
-			 image_unselected="Toolbar_Left_Off"
-			 layout="topleft"
-			 left="0"
-			 name="nearby_view_sort_btn"
-			 tool_tip="Options"
-			 top="1"
-			 width="31"/>
-			<button
-			 follows="bottom|left"
-			 height="25"
-			 image_hover_unselected="Toolbar_Middle_Over"
-			 image_overlay="AddItem_Off"
-			 image_selected="Toolbar_Middle_Selected"
-			 image_unselected="Toolbar_Middle_Off"
-			 layout="topleft"
-			 left_pad="1"
-			 name="add_friend_btn_nearby"
-			 tool_tip="Add selected Resident to your friends List"
-			 width="31">
-				<commit_callback
-				 function="People.addFriend"/>
-			</button>
-			<icon
-			 follows="bottom|left|right"
-			 height="25"
-			 image_name="Toolbar_Right_Off"
-			 layout="topleft"
-			 left_pad="1"
-			 name="nearby_dummy_icon"
-			 width="263"/>
-			<slider
-			 visibility_control="LimitRadarByRange"
-			 control_name="NearMeRange"
-			 decimal_digits="0"
-			 follows="bottom|left"
-			 height="16"
-			 increment="2"
-			 initial_value="96"
-			 label="Range(m):"
-			 label_width="70"
-			 layout="topleft"
-			 max_val="4096"
-			 min_val="20"
-			 name="NearMeRange"
-			 visible="True"
-			 left_delta="10"
-			 top_delta="6"
-			 width="220"/>
-		</panel>
-	</panel>
-</panel>
diff --git a/indra/newview/skins/vintage/xui/en/panel_people.xml b/indra/newview/skins/vintage/xui/en/panel_people.xml
deleted file mode 100644
index 9e71bb3a38..0000000000
--- a/indra/newview/skins/vintage/xui/en/panel_people.xml
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	default_tab_group="1"
-	follows="all"
-	height="449"
-	label="People"
-	layout="topleft"
-	left="0"
-	min_height="350"
-	name="people_panel"
-	top="0"
-	width="333">
-	<string name="FlagsColumnType" value="icon"/>
-	<string name="FlagsColumnValue_0" value=""/>
-	<string name="FlagsColumnValue_1" value="Payment_Info_Filled"/>
-	<string name="FlagsColumnValue_2" value="Payment_Info_Used"/>
-	<string
-		name="high_server_load"
-		value="Due to server load, mass toggling visibility can take a while to become effective. Please be patient."/>
-    <string
-		name="no_recent_people"
-		value="No recent people. Looking for people to hang out with? Use the search box to find topics or content you might be interested in, then visit those places to meet people with similar interests." />
-    <string
-		name="no_filtered_recent_people"
-		value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
-    <string
-		name="no_one_near"
-		value="No one nearby. Looking for people to hang out with? Use the search box to find topics or content you might be interested in, then visit those places to meet people with similar interests." />
-    <string
-		name="no_one_filtered_near"
-		value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
-    <string
-		name="no_friends_online"
-		value="No friends online" />
-    <string
-		name="no_friends"
-		value="No friends" />
-    <string
-		name="no_friends_msg">
-		Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
-Looking for people to hang out with? Use the search box to find topics or content you might be interested in, then visit those places to meet people with similar interests.
-	</string>
-    <string
-		name="no_filtered_friends_msg">
-		Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
-	</string>
-	<string
-		name="people_filter_label"
-		value="Filter People" />
-	<string
-		name="groups_filter_label"
-		value="Filter Groups" />
-		<!--
-			*WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
-			They are not defined as translatable in VLT. See EXT-5931
-		-->
-	<string
-		name="no_filtered_groups_msg"
-		value="Didn't find what you're looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]." />
-	<string
-		name="no_groups_msg"
-		value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." />
-	<string
-		name="MiniMapToolTipMsg"
-		value="[REGION](Double-click to open Map, shift-drag to pan)"/>
-	<string
-		name="AltMiniMapToolTipMsg"
-		value="[REGION] (Double-click to teleport, shift-drag to pan)"/>
-	<string
-		name="avatar_name_count"
-		value="Name [[TOTAL] / [IN_REGION] / [IN_CHAT_RANGE]]" />
-	<filter_editor
-		follows="left|top|right"
-		height="23"
-		layout="topleft"
-		left="2"
-		label="Filter"
-		max_length_chars="300"
-		name="filter_input"
-		text_pad_left="10"
-		top="2"
-		right="-2" />
-
-	<tab_container
-		follows="all"
-		height="413"
-		layout="topleft"
-		left="2"
-		name="tabs"
-		tab_drag_commit="true"
-		tab_group="1"
-		tab_position="top"
-		top_pad="4"
-		halign="center"
-		right="-2">
-
-		<panel
-			background_visible="false"
-			follows="all"
-			height="400"
-			label="Nearby"
-			layout="topleft"
-			left="0"
-			help_topic="people_nearby_tab"
-			name="nearby_panel"
-			top="0"
-			width="313">
-
-			<tab_container
-				name="tabcont_radarpeople_main"
-				layout="topleft"
-				follows="all"
-				tab_position="bottom"
-				height="400">
-
-				<panel
-					name="radarmap_nearby_panel"
-					layout="topleft"
-					follows="all"
-					label="List"
-					height="400">
-
-					<layout_stack
-						orientation="vertical"
-						clip="true"
-						follows="all"
-						layout="topleft"
-						top="0"
-						left="0"
-						height="400"
-						width="313"
-						mouse_opaque="false"
-						name="radar_ls"
-						border_size="0">
-
-						<layout_panel
-							layout="topleft"
-							top="0"
-							left="0"
-							height="140"
-							width="313"
-							follows="all"
-							min_dim="140"
-							mouse_opaque="false"
-							visibility_control="ShowRadarMinimap"
-							name="minimaplayout"
-							user_resize="true"
-							auto_resize="false">
-
-							<net_map
-								bg_color="NetMapBackgroundColor"
-								visibility_control="ShowRadarMinimap"
-								follows="all"
-								layout="topleft"
-								left="0"
-								mouse_opaque="false"
-								name="Net Map"
-								width="313"
-								height="140"
-								top="0"/>
-
-						</layout_panel>
-
-						<layout_panel
-							layout="topleft"
-							top="0"
-							left="0"
-							height="260"
-							width="313"
-							mouse_opaque="false"
-							follows="all"
-							name="radarlayout"
-							user_resize="true"
-							auto_resize="true">
-
-							<radar_list
-								draw_heading="true"
-								follows="all"
-								layout="topleft"
-								left="0"
-								top_pad="0"
-								height="255"
-								sort_column="0"
-								sort_ascending="true"
-								name="radar_list"
-								draw_stripes="true"
-								multi_select="true"
-								width="311">
-								<radar_list.columns
-									label="Name"
-									name="name"
-									relative_width="0.32" />
-								<radar_list.columns
-									label=""
-									name="voice_level"
-									relative_width="0.07" />
-								<radar_list.columns
-									label="Distance"
-									name="range"
-									relative_width="0.15" />
-								<radar_list.columns
-									label="Time"
-									name="seen"
-									relative_width="0.15" />
-								<radar_list.columns
-									label="Age"
-									name="age"
-									relative_width="0.1" />
-								<radar_list.columns
-									label=""
-									name="in_region"
-									relative_width="0.03" />
-								<radar_list.columns
-									label=""
-									name="flags"
-									relative_width="0.08" />
-								<radar_list.columns
-									label="av_id"
-									name="uuid"
-									relative_width="0" />
-							</radar_list>
-						</layout_panel>
-					</layout_stack>
-
-				</panel>
-
-				<panel
-					name="radarmap_options_panel"
-					label="Options"
-					layout="topleft"
-					follows="all"
-					top="0"
-					height="383">
-
-				<check_box
-					label="Show Minimap above Radar"
-					left="0"
-					top="4"
-					name="ShowRadarMinimap"
-					control_name="ShowRadarMinimap"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-				<check_box
-					label="Report Entering Draw Range"
-					left="0"
-					top_pad="2"
-					name="RadarReportDrawRangeEnter"
-					control_name="RadarReportDrawRangeEnter"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-          <check_box
-					label="Report Leaving Draw Range"
-					left="0"
-					top_pad="2"
-					name="RadarReportDrawRangeLeaving"
-					control_name="RadarReportDrawRangeLeaving"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-				<check_box
-					label="Report Entering Chat Range"
-					left="0"
-					top_pad="2"
-					name="RadarReportChatRangeEnter"
-					control_name="RadarReportChatRangeEnter"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-          <check_box
-					label="Report Leaving Chat Range"
-					left="0"
-					top_pad="2"
-					name="RadarReportChatRangeLeave"
-					control_name="RadarReportChatRangeLeave"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-				<check_box
-					label="Report Entering your Region"
-					left="0"
-					top_pad="2"
-					name="RadarReportSimRangeEnter"
-					control_name="RadarReportSimRangeEnter"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-          <check_box
-					label="Report Leaving your Region"
-					left="0"
-					top_pad="2"
-					name="RadarReportSimRangeLeave"
-					control_name="RadarReportSimRangeLeave"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-				<check_box
-					label="Report Enter Alerts to Scripts"
-					left="0"
-					top_pad="2"
-					name="RadarEnterChannelAlert"
-					control_name="RadarEnterChannelAlert"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-				<check_box
-					label="Report Exit Alerts to Scripts"
-					left="0"
-					top_pad="2"
-					name="RadarLeaveChannelAlert"
-					control_name="RadarLeaveChannelAlert"
-					right="-1"
-					height="16"
-					layout="topleft"
-					follows="left|top"/>
-
-				<check_box
-					label="Limit range to:"
-					tool_tip="Limit Results to specific Radius"
-					left="0"
-					top_pad="2"
-					name="LimitRadarByRange"
-					control_name="LimitRadarByRange"
-					width="100"
-					height="16"
-					layout="topleft"
-					follows="left|top" />
-				<slider
-					visibility_control="LimitRadarByRange"
-					enabled_control="LimitRadarByRange"
-					control_name="NearMeRange"
-					decimal_digits="0"
-					follows="top|left|right"
-					height="16"
-					increment="2"
-					initial_value="96"
-					layout="topleft"
-					max_val="4096"
-					min_val="20"
-					name="NearMeRangeVintage"
-					visible="true"
-					left_pad="4"
-					width="140" />
-				<text
-					value="m"
-					layout="topleft"
-					follows="top|left"
-					width="20"
-					left_pad="-6"
-					height="16"
-					wrap="false" />
-
-				<text
-					name="radarmap_range_label"
-					layout="topleft"
-					follows="left|top"
-					value="Radar Name Format:"
-					left="3"
-					top_pad="4"
-					height="16"
-					width="120"/>
-				<combo_box
-					layout="topleft"
-					follows="left|top|right"
-					left_pad="2"
-					top_delta="-2"
-					height="20"
-					right="-1"
-					name="RadarNameFormat"
-					control_name="RadarNameFormat"
-					enabled_control="UseDisplayNames">
-					<combo_box.item name="RadarNameFormat_display" value="0" label="Display Name only" />
-					<combo_box.item name="RadarNameFormat_user" value="1" label="Username only" />
-					<combo_box.item name="RadarNameFormat_displayuser" value="2" label="Display Name (Username)" />
-					<combo_box.item name="RadarNameFormat_userdisplay" value="3" label="Username (Display Name)" />
-				</combo_box>
-
-			</panel>
-			<panel
-				class="panel_block_list_sidetray"
-				name="panel_block_list_sidetray"
-				filename="panel_block_list_sidetray.xml"
-				label="Blocked" />
-
-		</tab_container>
-
-		<!-- Keep these controls so the code doesn't complain about them being missing -Zi -->
-		<panel name="hide_controls" enabled="false" visible="false" left="0" top="0">
-			<view 			follows="top|left" height="0" layout="topleft" name="NearMeRange"
-							left="0" top="0" width="0" />
-			<view 			follows="top|left" height="0" layout="topleft" name="add_friend_btn_nearby"
-							left="0" top="0" width="0" />
-			<avatar_list	follows="top|left" height="0" layout="topleft" name="avatar_list"
-							left="0" top="0" width="0" />
-		</panel>
-		<!-- Keep these controls so the code doesn't complain about them being missing -Zi -->
-
-	</panel>
-
-	<panel
-		follows="all"
-		height="383"
-		label="Recent"
-		layout="topleft"
-		left="0"
-		help_topic="people_recent_tab"
-		name="recent_panel"
-		top="0"
-		width="313">
-		<avatar_list
-			allow_select="true"
-			follows="all"
-			height="383"
-			layout="topleft"
-			left="3"
-			multi_select="true"
-			name="avatar_list"
-			show_last_interaction_time="true"
-			top="0"
-			width="307" />
-
-	<!-- Keep these controls so the code doesn't complain about them being missing -Zi -->
-	<panel name="hide_controls" enabled="false" visible="false" left="0" top="0">
-		<menu_button	follows="top|left" height="0" layout="topleft" name="recent_viewsort_btn"
-						left="0" top="0" width="0" />
-		<button	follows="top|left" height="0" layout="topleft" name="add_friend_btn_recent"
-						left="0" top="0" width="0" />
-		</panel>
-	</panel>
-
-	</tab_container>
-
-	<!-- Keep these controls so the code doesn't complain about them being missing -Zi -->
-	<panel name="hide_controls" enabled="false" visible="false" left="0" top="0">
-	<avatar_list	follows="top|left" height="0" layout="topleft" name="nearby_avatar_list"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="view_profile_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="im_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="call_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="share_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="teleport_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="group_info_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="chat_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="group_call_btn"
-					left="0" top="0" width="0" />
-	<group_list 	follows="top|left" height="0" layout="topleft" name="group_list"
-					left="0" top="0" width="0" />
-	<panel			follows="top|left" height="0" layout="topleft" name="groups_panel"
-					left="0" top="0" width="0" />
-	<accordion_tab	follows="top|left" height="0" layout="topleft" name="tab_all"
-					left="0" top="0" width="0" />
-	<accordion_tab	follows="top|left" height="0" layout="topleft" name="tab_online"
-					left="0" top="0" width="0" />
-	<menu_button	follows="top|left" height="0" layout="topleft" name="nearby_view_sort_btn"
-					left="0" top="0" width="0" />
-	<menu_button	follows="top|left" height="0" layout="topleft" name="friends_viewsort_btn"
-					left="0" top="0" width="0" />
-	<menu_button	follows="top|left" height="0" layout="topleft" name="groups_viewsort_btn"
-					left="0" top="0" width="0" />
-	</panel>
-
-	<panel			follows="top|left" height="0" layout="topleft" name="friends_panel"
-					left="0" top="0" width="0" enabled="false" visible="false">
-	<avatar_list	follows="top|left" height="0" layout="topleft" name="avatars_online"
-					left="0" top="0" width="0" />
-	<avatar_list	follows="top|left" height="0" layout="topleft" name="avatars_all"
-					left="0" top="0" width="0" />
-	</panel>
-
-	<panel			follows="top|left" height="0" layout="topleft" name="button_bar"
-					left="0" top="0" width="0" enabled="false" visible="false">
-	<button	 	follows="top|left" height="0" layout="topleft" name="group_info_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="chat_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="view_profile_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="im_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="call_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="group_call_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="teleport_btn"
-					left="0" top="0" width="0" />
-	<button	 	follows="top|left" height="0" layout="topleft" name="share_btn"
-					left="0" top="0" width="0" />
-	</panel>
-	<!-- Keep these controls so the code doesn't complain about them being missing -Zi -->
-</panel>