diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 7774d62367..666bbd5291 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -20,7 +20,7 @@
  right="-1"
  name="tabs"
  tab_min_width="50"
- tab_position="top" >
+ tab_position="bottom" >
 
     <!--General-->
     <panel
diff --git a/indra/newview/skins/vintage/textures/containers/TabBottom_Left_Off.png b/indra/newview/skins/vintage/textures/containers/TabBottom_Left_Off.png
new file mode 100644
index 0000000000..12a697dc06
Binary files /dev/null and b/indra/newview/skins/vintage/textures/containers/TabBottom_Left_Off.png differ
diff --git a/indra/newview/skins/vintage/textures/containers/TabBottom_Left_Selected.png b/indra/newview/skins/vintage/textures/containers/TabBottom_Left_Selected.png
new file mode 100644
index 0000000000..ec2b01e2de
Binary files /dev/null and b/indra/newview/skins/vintage/textures/containers/TabBottom_Left_Selected.png differ
diff --git a/indra/newview/skins/vintage/textures/containers/TabLeft_Top_Off.png b/indra/newview/skins/vintage/textures/containers/TabLeft_Top_Off.png
new file mode 100644
index 0000000000..4cbca32cee
Binary files /dev/null and b/indra/newview/skins/vintage/textures/containers/TabLeft_Top_Off.png differ
diff --git a/indra/newview/skins/vintage/textures/containers/TabLeft_Top_Selected.png b/indra/newview/skins/vintage/textures/containers/TabLeft_Top_Selected.png
new file mode 100644
index 0000000000..54103a58ae
Binary files /dev/null and b/indra/newview/skins/vintage/textures/containers/TabLeft_Top_Selected.png differ
diff --git a/indra/newview/skins/vintage/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/vintage/textures/containers/TabTop_Left_Off.png
new file mode 100644
index 0000000000..e36c4a6c70
Binary files /dev/null and b/indra/newview/skins/vintage/textures/containers/TabTop_Left_Off.png differ
diff --git a/indra/newview/skins/vintage/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/vintage/textures/containers/TabTop_Left_Selected.png
new file mode 100644
index 0000000000..eeb762d763
Binary files /dev/null and b/indra/newview/skins/vintage/textures/containers/TabTop_Left_Selected.png differ
diff --git a/indra/newview/skins/vintage/textures/textures.xml b/indra/newview/skins/vintage/textures/textures.xml
index b5edaf76cd..04d1aacaf6 100644
--- a/indra/newview/skins/vintage/textures/textures.xml
+++ b/indra/newview/skins/vintage/textures/textures.xml
@@ -116,6 +116,56 @@
 		scale.bottom="10"
 		scale.right="4" />
 
+	<!-- our tab widgets don't distinguish between left, middle and right, so we
+		 use the same texture for all of them, see widgets/tab_container.xml -->
+	<texture name="TabTop_Left_Off"
+		file_name="containers/TabTop_Left_Off.png"
+		preload="true"
+		scale.left="4"
+		scale.top="24"
+		scale.right="60"
+		scale.bottom="4" />
+
+	<texture name="TabTop_Left_Selected"
+		file_name="containers/TabTop_Left_Selected.png"
+		preload="true"
+		scale.left="4"
+		scale.top="24"
+		scale.right="60"
+		scale.bottom="4" />
+
+	<texture name="TabLeft_Top_Off"
+		file_name="containers/TabLeft_Top_Off.png"
+		preload="true"
+		scale.left="16"
+		scale.top="4"
+		scale.right="60"
+		scale.bottom="4" />
+
+	<texture name="TabLeft_Top_Selected"
+		file_name="containers/TabLeft_Top_Selected.png"
+		preload="true"
+		scale.left="16"
+		scale.top="4"
+		scale.right="60"
+		scale.bottom="4" />
+
+	<texture name="TabBottom_Left_Off"
+		file_name="containers/TabBottom_Left_Off.png"
+		preload="true"
+		scale.left="4"
+		scale.top="24"
+		scale.right="60"
+		scale.bottom="4" />
+
+	<texture name="TabBottom_Left_Selected"
+		file_name="containers/TabBottom_Left_Selected.png"
+		preload="true"
+		scale.left="4"
+		scale.top="24"
+		scale.right="60"
+		scale.bottom="4" />
+
 	<!-- new-old icons :D -->
 	<texture name="Inv_Alpha"				file_name="legacy/inv_item_alpha.tga" />
 	<texture name="Inv_Animation"			file_name="legacy/inv_item_animation.tga" />
diff --git a/indra/newview/skins/vintage/xui/en/widgets/tab_container.xml b/indra/newview/skins/vintage/xui/en/widgets/tab_container.xml
new file mode 100644
index 0000000000..0b07e7e1b7
--- /dev/null
+++ b/indra/newview/skins/vintage/xui/en/widgets/tab_container.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+label_pad_bottom - vertical padding under tab button labels
+label_pad_left - padding to the left of tab button labels
+-->
+<tab_container name="tab_container" 
+               mouse_opaque="false"
+               tab_min_width="60"
+               tab_max_width="150"
+               use_custom_icon_ctrl="false"
+               halign="left"
+               font="SansSerifSmall"
+               tab_height="18"
+               label_pad_bottom="2"
+               label_pad_left="4">
+  <!--
+  Possible additional attributes for tabs:
+  tab_bottom_image_flash
+  tab_left_image_flash
+  tab_top_image_flash
+  -->
+  <first_tab tab_top_image_unselected="TabTop_Left_Off"
+               tab_top_image_selected="TabTop_Left_Selected"
+               tab_bottom_image_unselected="TabBottom_Left_Off"
+               tab_bottom_image_selected="TabBottom_Left_Selected"
+               tab_left_image_unselected="TabLeft_Top_Off"
+               tab_left_image_selected="TabLeft_Top_Selected"/>
+  <middle_tab tab_top_image_unselected="TabTop_Left_Off"
+               tab_top_image_selected="TabTop_Left_Selected"
+               tab_bottom_image_unselected="TabBottom_Left_Off"
+               tab_bottom_image_selected="TabBottom_Left_Selected"
+               tab_left_image_unselected="TabLeft_Top_Off"
+               tab_left_image_selected="TabLeft_Top_Selected"/>
+  <last_tab tab_top_image_unselected="TabTop_Left_Off"
+               tab_top_image_selected="TabTop_Left_Selected"
+               tab_bottom_image_unselected="TabBottom_Left_Off"
+               tab_bottom_image_selected="TabBottom_Left_Selected"
+               tab_left_image_unselected="TabLeft_Top_Off"
+               tab_left_image_selected="TabLeft_Top_Selected"/>
+</tab_container>