diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 07785949b..f1e85ef46 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -749,6 +749,17 @@ Found in Advanced->Rendering->Info Displays</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ContactsUseHorizontalButtons</key>
+    <map>
+      <key>Comment</key>
+	  <string>Whether or not groups and friends lists use horizontal buttons at the bottom of the panel or vertical ones on the right, requires a restart.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowLocalChatFloaterBar</key>
     <map>
       <key>Comment</key>
@@ -6171,7 +6182,23 @@ This should be as low as possible, but too low may break functionality</string>
     <key>FloaterContactsRect</key>
     <map>
       <key>Comment</key>
-      <string>Rectangle for chat history</string>
+      <string>Rectangle for contacts floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>390</integer>
+        <integer>395</integer>
+        <integer>0</integer>
+      </array>
+    </map>
+    <key>FloaterContactsHorizRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for contacts floater in horizontal mode</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 824566c78..9b8fd2e63 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -190,6 +190,7 @@ void LLPrefsAscentVan::refreshValues()
 	mTurnAround = gSavedSettings.getBOOL("TurnAroundWhenWalkingBackwards");
 	mAnnounceSnapshots = gSavedSettings.getBOOL("AnnounceSnapshots");
 	mAnnounceStreamMetadata = gSavedSettings.getBOOL("AnnounceStreamMetadata");
+	mHorizButt = gSavedSettings.getBOOL("ContactsUseHorizontalButtons");
 
     //Tags\Colors ----------------------------------------------------------------------------
     mAscentUseTag           = gSavedSettings.getBOOL("AscentUseTag");
@@ -273,6 +274,7 @@ void LLPrefsAscentVan::cancel()
 	gSavedSettings.setBOOL("TurnAroundWhenWalkingBackwards", mTurnAround);
 	gSavedSettings.setBOOL("AnnounceSnapshots", mAnnounceSnapshots);
 	gSavedSettings.setBOOL("AnnounceStreamMetadata", mAnnounceStreamMetadata);
+	gSavedSettings.setBOOL("ContactsUseHorizontalButtons", mHorizButt);
 
     //Tags\Colors ----------------------------------------------------------------------------
     gSavedSettings.setBOOL("AscentUseTag",               mAscentUseTag);
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index 62600a264..4744cedc0 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -62,6 +62,7 @@ protected:
 	bool mTurnAround;
 	bool mAnnounceSnapshots;
 	bool mAnnounceStreamMetadata;
+	bool mHorizButt;
     //Tags\Colors
     BOOL mAscentUseTag;
     std::string mReportClientUUID;
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp
index 9e41340fe..876e2c321 100644
--- a/indra/newview/llfloaterchatterbox.cpp
+++ b/indra/newview/llfloaterchatterbox.cpp
@@ -54,7 +54,8 @@ LLFloaterMyFriends::LLFloaterMyFriends(const LLSD& seed)
 	mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterMyFriends::createGroupsPanel, NULL);
 	// do not automatically open singleton floaters (as result of getInstance())
 	BOOL no_open = FALSE;
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_my_friends.xml", &getFactoryMap(), no_open);
+	static LLCachedControl<bool> horiz("ContactsUseHorizontalButtons");
+	LLUICtrlFactory::getInstance()->buildFloater(this, (horiz ? "floater_my_friends_horiz.xml" : "floater_my_friends.xml"), &getFactoryMap(), no_open);
 }
 
 LLFloaterMyFriends::~LLFloaterMyFriends()
diff --git a/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml b/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml
new file mode 100644
index 000000000..6a488b21f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/floater_my_friends_horiz.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" can_tear_off="true" height="390" min_height="240"
+     min_width="365" name="floater_my_friends"
+     rect_control="FloaterContactsHorizRect" title="Contacts" width="395">
+	<tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"
+	     name="friends_and_groups" tab_position="top" tab_width="80" width="383">
+		<panel bottom="0" filename="panel_friends_horiz.xml" label="Friends" left="0" name="friends_panel" width="370" />
+		<panel bottom="0" filename="panel_groups_horiz.xml" label="Groups" left="0" name="groups_panel" width="370" />
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml b/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml
new file mode 100644
index 000000000..c4d05bf8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" name="friends">
+	<string name="Multiple">Multiple friends...</string>
+	<scroll_list bottom="70" can_resize="true" column_padding="0" draw_heading="true" follows="left|top|bottom|right" left="5" multi_select="true"
+	    name="friend_list" right="-5" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40">
+		<column image="ff_online_status_button.tga" name="icon_online_status" tool_tip="Online status" width="20"/>
+		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online" tool_tip="Friend can see when you're online" width="20"/>
+		<column image="ff_visible_map_button.tga" name="icon_visible_map" tool_tip="Friend can locate you on the map" width="20"/>
+		<column image="ff_edit_mine_button.tga" name="icon_edit_mine" tool_tip="Friend can edit, delete or take objects" width="20"/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs" tool_tip="You can see when they are online (only updates on login)" width="20"/>
+		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" tool_tip="You can locate them on the map" width="20"/>
+		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" tool_tip="You can edit this friend's objects" width="20"/>
+		<column name="friend_last_update_generation" width="0"/>
+	</scroll_list>
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="friends" width="110">Contact Group:</text-->
+	<!--combo_box allow_text_entry="false" enabled="true" follows="right|top" bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" tool_tip="Buddy group" name="buddy_group_combobox" width="130">
+		<combo_item type="string" length="20" enabled="true" name="All" value="All">All</combo_item>
+	</combo_box-->
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
+	<search_editor bottom_delta="-100" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/>
+	<button bottom_delta="0" follows="top|right" height="22" label="0" left="-25" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
+	<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
+	<text bottom="38" left="12" follows="left|bottom" height="32" name="friends" width="95">Online:</text>
+	<text bottom_delta="0" left_delta="60" follows="left|bottom" height="32" name="f_num" width="95">0000</text>
+	<text bottom_delta="0" left_delta="44" follows="left|bottom" height="32" name="sel" width="95">|       Selected:</text>
+	<text bottom_delta="0" left_delta="100" follows="left|bottom" height="32" name="s_num" width="95">0000</text>
+	<button bottom_delta="-8" left="5" follows="left|bottom" height="22" label="IM/Call" name="im_btn" tool_tip="Open Instant Message session" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Profile" name="profile_btn" tool_tip="Show picture, groups, and other information" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Teleport..." name="offer_teleport_btn" tool_tip="Offer this friend a teleport to your current location" width="80" />
+	<button bottom_delta="-24" left="5" follows="left|bottom" height="22" label="Pay..." name="pay_btn" tool_tip="Give in-world money ([CURRENCY]) to this friend" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Remove..." name="remove_btn" tool_tip="Remove this person from your friends list" width="80"/>
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Add..." name="add_btn" tool_tip="Offer friendship to a resident" width="80"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml b/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml
new file mode 100644
index 000000000..2fa154096
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
+     name="groups" width="350">
+	<scroll_list background_visible="true" bottom="85" column_padding="0" draw_border="true"
+	     draw_heading="true" draw_stripes="true" enabled="true"
+	     follows="left|top|right|bottom" left="5" mouse_opaque="true"
+	     multi_select="false" name="group list" tab_stop="true" top="-10"
+	     width="340">
+		<column dynamicwidth="true" label="Name" name="name" tool_tip="Name" />
+    <!--<column label="Active" name="is_active_group"
+		    tool_tip="Group is set as active" width="40" />-->
+    <column image_overlay="ff_visible_online.tga" name="is_listed_group"
+		    tool_tip="Group is visible in profile." width="20" />
+    <column image_overlay="icn_chat_overlay.tga" name="is_chattable_group"
+		    tool_tip="Receive group chat" width="20" />
+    <column image_overlay="smicon_warn.tga" name="is_notice_group"
+        tool_tip="Receive group notices" width="20" />
+	</scroll_list>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="67" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupdesc" v_pad="0" width="280">
+		Your currently active group is displayed in italics.
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="54" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupcount" v_pad="0" width="280">
+		You belong to [COUNT] groups (of [MAX] maximum).
+	</text>
+	<button bottom_delta="-24" follows="left|bottom" font="SansSerif" height="22"
+	     label="IM/Call" left="5" name="IM"
+	     tool_tip="Open Instant Message session" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Activate" name="Activate" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Leave" name="Leave" width="80" />
+	<button bottom_delta="-24" left="5" follows="left|bottom" font="SansSerif" height="22"
+	     label="Create..." name="Create" width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Search..." name="Search..." width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Invite..." name="Invite..." width="80" />
+	<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
+	     label="Titles..." name="Titles..." width="80" />
+  <string name="none">
+		none
+  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 0d730c4bb..d350648e4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -11,6 +11,7 @@
       <check_box bottom_delta="-20" control_name="TurnAroundWhenWalkingBackwards" follows="top" height="16" label="Turn around when walking backwards" tool_tip="Certain AOs may turn you around even with this disabled." name="turn_around"/>
       <check_box bottom_delta="-20" control_name="AnnounceSnapshots" follows="top" height="16" label="Announce when someone takes a snapshot" tool_tip="Won't announce for people who hide the fact that they are taking a snapshot." name="announce_snapshots"/>
       <check_box bottom_delta="-20" control_name="AnnounceStreamMetadata" follows="top" height="16" label="Announce music stream's metadata in local chat when tuned in" tool_tip="When a new song comes on, a message will be displayed in local chat with available information about the track." name="announce_stream_metadata"/>
+      <check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>
     </panel>
     <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
       <!-- Client tag options -->