diff --git a/indra/newview/skins/vintage/xui/en/floater_profile_view.xml b/indra/newview/skins/vintage/xui/en/floater_profile_view.xml
new file mode 100644
index 0000000000..41ab42feaf
--- /dev/null
+++ b/indra/newview/skins/vintage/xui/en/floater_profile_view.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ open_positioning="centered"
+ height="510"
+ width="420"
+ layout="topleft"
+ can_close="true"
+ can_resize="true"
+ name="avatarinfo"
+ title="Profile" >
+<panel
+ top="0"
+ left="0"
+ follows="all"
+ width="420"
+ height="500"
+ name="panel_profile_view">
+
+    <tab_container
+     follows="all"
+     top_pad="5"
+     left="0"
+     width="420"
+     height="500"
+     halign="center"
+     layout="topleft"
+     name="tabs"
+     tab_position="top"
+     tab_min_width="45">
+        <panel
+         class="panel_profile_secondlife"
+         filename="panel_profile_secondlife.xml"
+         label="2nd Life"
+         layout="topleft"
+         help_topic="profile_profile_tab"
+         name="panel_profile_secondlife" />
+        <panel
+         class="panel_profile_web"
+         filename="panel_profile_web.xml"
+         label="Web"
+         layout="topleft"
+         help_topic="profile_web_tab"
+         name="panel_profile_web" />
+        <panel
+         class="panel_profile_interests"
+         filename="panel_profile_interests.xml"
+         label="Interests"
+         layout="topleft"
+         help_topic="profile_interests_tab"
+         name="panel_profile_interests" />
+        <panel
+         class="panel_profile_picks"
+         filename="panel_profile_picks.xml"
+         label="Picks"
+         layout="topleft"
+         help_topic="profile_picks_tab"
+         name="panel_profile_picks" />
+        <panel
+         class="panel_profile_classified"
+         filename="panel_profile_classified.xml"
+         label="Classified"
+         layout="topleft"
+         help_topic="profile_classified_tab"
+         name="panel_profile_classified" />
+        <panel
+         class="panel_profile_firstlife"
+         filename="panel_profile_firstlife.xml"
+         label="1st Life"
+         layout="topleft"
+         help_topic="profile_profile_tab"
+         name="panel_profile_firstlife" />
+        <panel
+         class="panel_profile_notes"
+         filename="panel_profile_notes.xml"
+         label="Notes"
+         layout="topleft"
+         help_topic="profile_notes_tab"
+         name="panel_profile_notes" />
+    </tab_container>
+
+    <button
+     bottom_delta="0"
+     left="10"
+     height="20"
+     width="90"
+     layout="topleft"
+     follows="left|bottom"
+     name="ok_btn"
+     label="OK"
+     tool_tip="Save changes to profile and close"
+     visible="false" />
+
+    <button
+     bottom_delta="0"
+     right="-10"
+     height="20"
+     width="90"
+     layout="topleft"
+     follows="right|bottom"
+     name="cancel_btn"
+     label="Cancel"
+     label_selected="Cancel"
+     visible="false" />
+
+</panel>
+</floater>
diff --git a/indra/newview/skins/vintage/xui/en/panel_group_list_item.xml b/indra/newview/skins/vintage/xui/en/panel_group_list_item.xml
index 114a2f6d4a..e721a81c0a 100644
--- a/indra/newview/skins/vintage/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_group_list_item.xml
@@ -43,7 +43,6 @@
      text_color="ScrollUnselectedColor"
      parse_urls="false"
      follows="left|right"
-     font="SansSerifSmall"
      height="16"
      layout="topleft"
      left_pad="5"
diff --git a/indra/newview/skins/vintage/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/vintage/xui/en/panel_group_list_item_short.xml
new file mode 100644
index 0000000000..66b2cc3525
--- /dev/null
+++ b/indra/newview/skins/vintage/xui/en/panel_group_list_item_short.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ background_opaque="true"
+ bg_opaque_color="ScrollBgWriteableColor"
+ follows="top|right|left"
+ height="16"
+ layout="topleft"
+ left="0"
+ name="group_list_item"
+ top="0"
+ width="320">
+    <icon
+     follows="top|right|left"
+     height="16"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="320" />
+    <icon
+     height="16"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="320" />
+    <icon
+     height="14"
+     image_name="Generic_Group"
+     name="group_icon"
+     mouse_opaque="true"
+     left="5"
+     top="2"
+     use_draw_context_alpha="false"
+     width="14" />
+   <text
+     text_color="ScrollUnselectedColor"
+     parse_urls="false"
+     follows="left|right"
+     height="16"
+     layout="topleft"
+     left_pad="5"
+     name="group_name"
+     top="0"
+     use_ellipses="true"
+     value="Unknown"
+     right="-2" />
+
+<!--
+    We don't want the "hover buttons" to appear, since they only waste space
+    and their function is redundant
+
+    <button
+     follows="right"
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     left_pad="3"
+     right="-31"
+     name="info_btn"
+     tab_stop="false"
+     top_delta="-2"
+     width="16" />
+
+    <button
+     follows="right"
+     height="20"
+     image_overlay="ForwardArrow_Off"
+     layout="topleft"
+     left_pad="5"
+     right="-3"
+     name="profile_btn"
+     tab_stop="false"
+     tool_tip="View profile"
+     top_delta="-2"
+     width="20" />
+-->
+</panel>
diff --git a/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
new file mode 100644
index 0000000000..8dd9b1d0f5
--- /dev/null
+++ b/indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ top="0"
+ left="0"
+ width="420"
+ height="480"
+ layout="topleft"
+ follows="all"
+ name="panel_profile"
+ label="Profile">
+    <string
+     name="status_online">
+Currentl Online
+    </string>
+    <string
+     name="status_offline">
+Currently Offline
+    </string>
+    <string
+     name="CaptionTextAcctInfo">
+[ACCTTYPE]
+[PAYMENTINFO]
+[FIRESTORM][FSDEV][FSSUPP]
+    </string>
+    <!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
+    LLPanelAvatarProfile::fillAccountStatus() ...TS -->
+    <string
+     name="payment_update_link_url">
+http://www.secondlife.com/account/billing.php?lang=en
+    </string>
+    <string
+     name="partner_edit_link_url">
+http://www.secondlife.com/account/partners.php?lang=en
+    </string>
+    <string
+     name="my_account_link_url"
+     value="http://secondlife.com/account" />
+    <string
+     name="no_partner_text"
+     value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
+    <string
+     name="RegisterDateFormat">
+[REG_DATE] ([AGEDAYS])
+    </string>
+    <string
+    name="name_text_args">
+[NAME]
+    </string>
+    <string
+     name="display_name_text_args">
+[DISPLAY_NAME]
+    </string>
+    <string
+     name="FSDev"
+     value=" Developer" />
+    <string
+     name="FSSupp"
+     value=" Support" />
+
+<!--
+
+KC: Use view_border's around text_editor's due to text render issues with border_visible
+
+-->
+
+        <text
+         top="8"
+         left="6"
+         height="16"
+         width="55"
+         layout="topleft"
+         follows="left|top"
+         name="Key:"
+         halign="right"
+         value="Key:" />
+
+        <view_border
+         left_pad="4"
+         right="-86"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="info_border2"
+         bevel_style="in" />
+        <text_editor
+         bottom_delta="2"
+         left_delta="3"
+         right="-86"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="user_key"
+         bg_visible="false"
+         border_visible="false"
+         allow_scroll="false"
+         h_pad="0"
+         v_pad="0"
+         enabled="false"
+         max_length="254"
+         value="(loading...)" />
+        <button
+         top_delta="-2"
+         left_pad="4"
+         right="-6"
+         height="20"
+         layout="topleft"
+         follows="top|right"
+         name="copy_uri_button"
+         label="Copy URI" />
+
+        <text
+         top_pad="2"
+         left="6"
+         height="16"
+         width="55"
+         layout="topleft"
+         follows="left|top"
+         name="Name:"
+         halign="right"
+         value="Name:" />
+
+        <view_border
+         left_pad="4"
+         right="-86"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="info_border"
+         bevel_style="in" />
+        <text_editor
+         bottom_delta="2"
+         left_delta="3"
+         right="-86"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="complete_name"
+         bg_visible="false"
+         border_visible="false"
+         allow_scroll="false"
+         h_pad="0"
+         v_pad="0"
+         enabled="false"
+         max_length="254"
+         value="(loading...)" />
+        <button
+         top_delta="-2"
+         left_pad="4"
+         right="-6"
+         height="20"
+         layout="topleft"
+         follows="top|right"
+         name="copy_name_button"
+         label="Copy Name" />
+
+        <text
+         top_pad="3"
+         left="6"
+         height="16"
+         width="55"
+         layout="topleft"
+         follows="left|top"
+         name="Photo:"
+         halign="right"
+         value="Photo:" />
+
+        <texture_picker
+         left_pad="4"
+         top_delta="0"
+         height="180"
+         width="220"
+         layout="topleft"
+         follows="top|left"
+         allow_no_texture="true"
+         name="2nd_life_pic"
+         default_image_name="None"
+         enabled="false"
+         fallback_image="Generic_Person_Large" />
+
+        <text
+         top_delta="0"
+         left_pad="4"
+         right="-6"
+         height="16"
+         layout="topleft"
+         follows="top|right"
+         name="status"
+         halign="center"
+         text_color="LtGray_50"
+         value="Status Unknown" />
+
+        <text
+         top_pad="2"
+         width="42"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="label"
+         value="Born:" />
+
+        <view_border
+         top_pad="0"
+         right="-6"
+         height="16"
+         name="info_border3"
+         layout="topleft"
+         follows="left|top|right"
+         bevel_style="in" />
+        <text
+         top_delta="2"
+         left_delta="2"
+         right="-6"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="register_date"
+         value="(loading...)"
+         max_length="254" />
+
+        <text
+         top_pad="7"
+         left_delta="-2"
+         right="-6"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="label2"
+         value="Account:" />
+
+        <view_border
+         top_pad="0"
+         left_delta="0"
+         right="-6"
+         height="48"
+         layout="topleft"
+         follows="left|top|right"
+         name="acct_border"
+         bevel_style="in" />
+        <text_editor
+         top_delta="2"
+         left_delta="2"
+         right="-6"
+         height="44"
+         layout="topleft"
+         follows="left|top|right"
+         name="acc_status_text"
+         bg_visible="false"
+         border_visible="false"
+         allow_scroll="false"
+         h_pad="2"
+         v_pad="0"
+         read_only="true"
+         translate="false"
+         word_wrap="true"/>
+
+        <text
+         top_pad="7"
+         left_delta="-2"
+         right="-6"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="partner_label"
+         value="Partner:" />
+
+        <view_border
+         top_pad="0"
+         left_delta="0"
+         right="-6"
+         height="18"
+         layout="topleft"
+         follows="left|top|right"
+         name="info_border4"
+         bevel_style="in" />
+        <text
+         top_delta="2"
+         left_delta="2"
+         right="-6"
+         height="16"
+         layout="topleft"
+         follows="left|top|right"
+         name="partner_text"
+         max_length="254" />
+<!--
+        <button
+         top_pad="8"
+         left="6"
+         height="18"
+         width="40"
+         layout="topleft"
+         follows="left|top"
+         name="bigimg"
+         halign="center"
+         label="&lt; &lt;"
+         label_selected="&gt; &gt;"
+         tool_tip="Open Full Size." />
+-->
+        <text
+         top_pad="8"
+         left="6"
+         height="16"
+         width="55"
+         layout="topleft"
+         follows="left|top"
+         name="Groups:"
+         halign="right"
+         value="Groups:" />
+
+        <button
+         top_delta="20"
+         left="40"
+         height="20"
+         width="20"
+         layout="topleft"
+         follows="left|top"
+         name="group_invite"
+         label="+"
+         label_selected="+"
+         tool_tip="Invite to Group" />
+
+        <group_list
+         top_delta="-20"
+         left="66"
+         right="-6"
+         height="80"
+         layout="topleft"
+         follows="left|top|right"
+         name="group_list"
+         border_visible="true"
+         color="ScrollBgWriteableColor"
+         for_agent="false" />
+
+        <text
+         top_pad="8"
+         left="6"
+         height="16"
+         width="55"
+         layout="topleft"
+         follows="left|top"
+         name="About:"
+         halign="right"
+         value="About:" />
+
+        <view_border
+         top_delta="0"
+         left="66"
+         right="-6"
+         height="102"
+         layout="topleft"
+         follows="all"
+         name="info_border5"
+         bevel_style="in" />
+        <text_editor
+         top_delta="1"
+         left_delta="1"
+         right="-7"
+         height="100"
+         layout="topleft"
+         follows="all"
+         name="sl_description_edit"
+         border_visible="false"
+         font="SansSerifSmall"
+         enabled="false"
+         max_length="512"
+         h_pad="2"
+         word_wrap="true"
+         parse_urls="true" />
+
+        <text
+         top_pad="10"
+         left="6"
+         height="16"
+         width="55"
+         layout="topleft"
+         follows="left|bottom"
+         name="Give item:"
+         halign="right"
+         value="Give item:" />
+        <view_border
+         top_delta="0"
+         left="66"
+         right="-6"
+         height="16"
+         layout="topleft"
+         follows="left|bottom|right"
+         name="drop_target_rect_vis"
+         bevel_style="in" />
+        <text
+         top_delta="2"
+         left_delta="0"
+         height="16"
+         right="-6"
+         layout="topleft"
+         follows="left|right|bottom"
+         name="Give inventory"
+         halign="center"
+         tool_tip="Drop inventory items here to give them to this person.">
+            Drop inventory item here.
+        </text>
+
+        <layout_stack
+         bottom="-3"
+         left="6"
+         right="-6"
+         height="44"
+         layout="topleft"
+         follows="left|bottom|right"
+         name="buttonstack"
+         orientation="horizontal">
+
+            <layout_panel
+             left="2"
+             right="-2"
+             height="42"
+             follows="all"
+             layout="topleft"
+             name="left_buttonstack"
+             user_resize="false">
+
+                <button
+                 top="2"
+                 left="2"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="show_on_map_btn"
+                 label="Find on Map"
+                 label_selected="Find on Map"
+                 tool_tip="Locate the Resident on the map" />
+
+                <button
+                 top_pad="2"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="pay"
+                 label="Pay"
+                 label_selected="Pay"
+                 tool_tip="Pay money to the Resident" />
+
+            </layout_panel>
+            <layout_panel
+             left="2"
+             right="-2"
+             follows="all"
+             layout="topleft"
+             name="middle_buttonstack"
+             user_resize="false">
+
+                <button
+                 top="2"
+                 left="2"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="teleport"
+                 label="Offer Teleport"
+                 label_selected="Offer Teleport"
+                 tool_tip="Offer a teleport to the Resident" />
+
+                <button
+                 top_pad="2"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="im"
+                 label="Instant Message"
+                 label_selected="Instant Message"
+                 tool_tip="Open instant message session" />
+
+            </layout_panel>
+            <layout_panel
+             left="2"
+             right="-2"
+             follows="all"
+             layout="topleft"
+             name="right_buttonstack"
+             user_resize="false">
+
+                <button
+                 top="2"
+                 left="2"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="add_friend"
+                 label="Add Friend"
+                 label_selected="Add Friend"
+                 tool_tip="Offer friendship to the Resident" />
+
+                <button
+                 top_pad="2"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="block"
+                 label="Block"
+                 tool_tip="Block this Resident" />
+
+                <button
+                 top_delta="0"
+                 height="20"
+                 layout="topleft"
+                 follows="left|top|right"
+                 name="unblock"
+                 label="Unblock"
+                 tool_tip="Unblock this Resident" />
+
+            </layout_panel>
+        </layout_stack>
+        
+        <check_box
+         bottom="-30"
+         left="60"
+         height="16"
+         width="130"
+         layout="topleft"
+         follows="left|bottom"
+         name="show_in_search_checkbox"
+         label="Show in search"
+         visible="false"
+         enabled="false" />
+
+        <profile_drop_target
+         top="0"
+         bottom="-1"
+         left="0"
+         right="-1"
+         layout="topleft"
+         follows="all"
+         name="drop_target"
+         mouse_opaque="false" />
+
+        <!-- hiding this control, (loading ...) in the name field should be enough. -Zi -->
+        <loading_indicator
+         top="0"
+         right="0"
+         height="0"
+         width="0"
+         layout="topleft"
+         follows="top|right"
+         name="progress_indicator"
+         enabled="false"
+         visible="false" />
+
+        <!-- hiding the gear menu, all functions are accessible in other ways -->
+        <menu_button
+         top="0"
+         right="0"
+         height="0"
+         width="0"
+         layout="topleft"
+         follows="top|right"
+         name="overflow_btn"
+         enabled="false"
+         image_overlay="OptionsMenu_Off" />
+</panel>
+