diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_eyes.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_eyes.xml
index 761e2095b7..9ee5cc57e5 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_eyes.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_eyes.xml
@@ -12,12 +12,12 @@
      <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="90"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_eye_color_panel"
-	  top="120"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -28,39 +28,29 @@
              left="5"
              name="Iris"
              tool_tip="Click to choose a picture"
-             top="0"
+             top="5"
              width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
      </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Eyes Panel -->
       <panel
        name="eyes_main_tab_holder"
        title="Eyes"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="eyes_main_accordion"
        top="0"
@@ -77,15 +67,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="eyes_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Eyes Panel -->
 
-    </tab_container>
+<!--    </tab_container>   -->
 </panel>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_gloves.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_gloves.xml
index 6f2fdd6b7d..4bb1660a5f 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_gloves.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_gloves.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="180"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_gloves_color_panel"
-	  top="80"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
      </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Gloves Panel -->
       <panel
        name="gloves_main_tab_holder"
        title="Gloves"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="gloves_main_accordion"
        top="0"
@@ -91,10 +81,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="gloves_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_hair.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_hair.xml
index c508ef487c..e04869755f 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_hair.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_hair.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="90"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_hair_color_panel"
-	  top="120"
-	  width="80" >
+	  top="0"
+	  width="333" >
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -28,7 +28,7 @@
              left="5"
              name="Texture"
              tool_tip="Click to choose a picture"
-             top="0"
+             top="5"
              width="64" >
               <texture_picker.commit_callback
                   function="TexturePicker.Commit" />
@@ -40,11 +40,10 @@
        fit_parent="true"
        layout="topleft"
        follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
+       tab_position="top"
+       top_pad="0"
+       left="0"
+       height="320"
        width="333">
 
       <!-- Begin Color Panel -->
@@ -54,13 +53,13 @@
        layout="topleft"
        fit_parent="false"
        follows="left"
-       height="385"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="hair_color_accordion"
        top="0"
@@ -77,10 +76,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="hair_color_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -94,13 +93,13 @@
        layout="topleft"
        fit_parent="false"
        follows="left"
-       height="385"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="hair_style_accordion"
        top="0"
@@ -117,10 +116,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="hair_style_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -134,13 +133,13 @@
        layout="topleft"
        fit_parent="false"
        follows="left"
-       height="385"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="hair_eyebrows_accordion"
        top="0"
@@ -157,10 +156,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="hair_eyebrows_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -174,13 +173,13 @@
        layout="topleft"
        fit_parent="false"
        follows="left"
-       height="385"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="hair_facial_accordion"
        top="0"
@@ -197,10 +196,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="hair_facial_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_jacket.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_jacket.xml
index 83826e2460..0967da4924 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_jacket.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="270"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_jacket_color_panel"
-	  top="80"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Upper Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -40,10 +40,10 @@
         height="80"
         label="Lower Fabric"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Lower Fabric"
         tool_tip="Click to choose a picture"
-        left="5"
+        top_delta="0"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -54,42 +54,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Jacket Panel -->
       <panel
        name="jacket_main_tab_holder"
        title="Jacket"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="jacket_main_accordion"
        top="0"
@@ -106,16 +96,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="jacket_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Jacket Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_pants.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_pants.xml
index b3fc7b8bb8..8334cda324 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_pants.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_pants.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="180"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_pants_color_panel"
-	  top="80"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Pants Panel -->
       <panel
        name="pants_main_tab_holder"
        title="Pants"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="pants_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="pants_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Pants Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml
index b0e86b82eb..0e65d5adbc 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_shape.xml
@@ -22,7 +22,7 @@
          left="0"
          name="avatar_height"
          top="0"
-         width="310">
+         width="333">
      </text>
 
     <tab_container
@@ -30,26 +30,26 @@
        fit_parent="true"
        layout="topleft"
        follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       height="385"
+       tab_position="top"
+       height="384"
        width="333">
 
       <!-- Begin Body Panel -->
       <panel
        name="shape_body_tab_holder"
        title="Body"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_body_accordion"
        top="0"
@@ -65,11 +65,11 @@
       <!-- Viewer will replace things here with tiled editing views -->
 	  <scrolling_panel_list
        layout="topleft"
-	   follows="all"
-       left="10"
+	     follows="all"
+       left="0"
        name="shape_body_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -80,16 +80,18 @@
       <panel
        name="shape_head_tab_holder"
        title="Head"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_head_accordion"
        top="0"
@@ -106,10 +108,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_head_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -120,16 +122,18 @@
       <panel
        name="shape_eyes_tab_holder"
        title="Eyes"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_eyes_accordion"
        top="0"
@@ -146,10 +150,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_eyes_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -160,16 +164,18 @@
       <panel
        name="shape_ears_tab_holder"
        title="Ears"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_ears_accordion"
        top="0"
@@ -186,10 +192,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_ears_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -200,16 +206,18 @@
       <panel
        name="shape_nose_tab_holder"
        title="Nose"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_nose_accordion"
        top="0"
@@ -226,10 +234,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_nose_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -240,16 +248,18 @@
       <panel
        name="shape_mouth_tab_holder"
        title="Mouth"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_mouth_accordion"
        top="0"
@@ -266,10 +276,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_mouth_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -280,16 +290,18 @@
       <panel
        name="shape_chin_tab_holder"
        title="Chin"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_chin_accordion"
        top="0"
@@ -306,10 +318,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_chin_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -320,16 +332,18 @@
       <panel
        name="shape_torso_tab_holder"
        title="Torso"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_torso_accordion"
        top="0"
@@ -346,10 +360,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_torso_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -360,16 +374,18 @@
       <panel
        name="shape_legs_tab_holder"
        title="Legs"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="384"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="384"
        left="0"
        name="shape_legs_accordion"
        top="0"
@@ -386,10 +402,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shape_legs_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="330"
        width="333" />
       </accordion_tab>
       </accordion>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_shirt.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_shirt.xml
index 0f72f8eaa1..161014445d 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_shirt.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_shirt.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="180"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_shirt_color_panel"
-	  top="80"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Shirt Panel -->
       <panel
        name="shirt_main_tab_holder"
        title="Shirt"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="shirt_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shirt_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Shirt Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_shoes.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_shoes.xml
index d563215064..7c50766def 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_shoes.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_shoes.xml
@@ -12,12 +12,12 @@
    <panel
       border="false"
       follows="top|left|right"
-      height="180"
+      height="80"
       left="0"
       layout="topleft"
       name="avatar_shoes_color_panel"
-      top="80"
-      width="80" >
+      top="0"
+      width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Shoes Panel -->
       <panel
        name="shoes_main_tab_holder"
        title="Shoes"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="shoes_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="shoes_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Shoes Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_skin.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_skin.xml
index 5ee21e4db6..642de651bb 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_skin.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_skin.xml
@@ -12,12 +12,12 @@
      <panel
       border="false"
       follows="top|left|right"
-      height="250"
+      height="80"
       left="0"
       layout="topleft"
       name="avatar_skin_color_panel"
-      top="120"
-      width="80" >
+      top="0"
+      width="333" >
        <texture_picker
         allow_no_texture="true"
         can_apply_immediately="true"
@@ -29,8 +29,8 @@
         left="5"
         name="Head Tattoos"
         tool_tip="Click to choose a picture"
-        top="0"
-        width="74" >
+        top="5"
+        width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
@@ -42,11 +42,11 @@
         height="80"
         label="Upper Tattoos"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Upper Tattoos"
         tool_tip="Click to choose a picture"
-        left="5"
-        width="74" >
+        top_delta="0"
+        width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
@@ -58,11 +58,11 @@
         height="80"
         label="Lower Tattoos"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Lower Tattoos"
         tool_tip="Click to choose a picture"
-        left="5"
-        width="74" >
+        top_delta="0"
+        width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
@@ -73,11 +73,10 @@
        fit_parent="true"
        layout="topleft"
        follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
+       tab_position="top"
+       top_pad="0"
+       left="0"
+       height="320"
        width="333">
 
       <!-- Begin Skin Color Panel -->
@@ -86,14 +85,14 @@
        title="Skin Color"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="skin_color_accordion"
        top="0"
@@ -110,10 +109,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="skin_color_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -126,14 +125,14 @@
        title="Face Detail"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="skin_face_accordion"
        top="0"
@@ -150,10 +149,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="skin_face_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -166,14 +165,14 @@
        title="Makeup"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="skin_makeup_accordion"
        top="0"
@@ -190,10 +189,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="skin_makeup_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
@@ -206,14 +205,14 @@
        title="Body Detail"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="skin_body_accordion"
        top="0"
@@ -230,10 +229,10 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="skin_body_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_skirt.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_skirt.xml
index 2492915f9b..5412d0ecc1 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_skirt.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_skirt.xml
@@ -12,12 +12,12 @@
    <panel
       border="false"
       follows="top|left|right"
-      height="180"
+      height="80"
       left="0"
       layout="topleft"
       name="avatar_skirt_color_panel"
-      top="80"
-      width="80" >
+      top="0"
+      width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Skirt Panel -->
       <panel
        name="skirt_main_tab_holder"
        title="Skirt"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="skirt_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="skirt_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="266"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Skirt Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_socks.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_socks.xml
index 0515738b5d..5a24ae6d26 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_socks.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_socks.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="180"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_socks_color_panel"
-	  top="80"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Socks Panel -->
       <panel
        name="socks_main_tab_holder"
        title="Socks"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="socks_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="socks_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Socks Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_underpants.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_underpants.xml
index 18da0ec7df..cac32a04df 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_underpants.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_underpants.xml
@@ -12,12 +12,12 @@
    <panel
       border="false"
       follows="top|left|right"
-      height="180"
+      height="80"
       left="0"
       layout="topleft"
       name="avatar_underpants_color_panel"
-      top="80"
-      width="80" >
+      top="0"
+      width="333" >
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -28,7 +28,7 @@
              left="5"
              name="Fabric"
              tool_tip="Click to choose a picture"
-             top="0"
+             top="5"
              width="64" >
               <texture_picker.commit_callback
                   function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
              height="80"
              label="Color/Tint"
              layout="topleft"
-             top_pad="5"
+             left_pad="10"
              name="Color/Tint"
              tool_tip="Click to open color picker"
-             left="5"
+             top_delta="0"
              width="64" >
               <color_swatch.commit_callback
                   function="ColorSwatch.Commit" />
             </color_swatch>
 	 </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Underpants Panel -->
       <panel
        name="underpants_main_tab_holder"
        title="Underpants"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="underpants_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="underpants_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Underpants Panel -->
 
-    </tab_container>
 </panel>
 
diff --git a/indra/newview/skins/firestorm/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/firestorm/xui/en/panel_edit_undershirt.xml
index bcbf02cd9c..f676c17fd8 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_edit_undershirt.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_edit_undershirt.xml
@@ -12,12 +12,12 @@
 	 <panel
 	  border="false"
 	  follows="top|left|right"
-	  height="180"
+	  height="80"
 	  left="0"
 	  layout="topleft"
 	  name="avatar_undershirt_color_panel"
-	  top="80"
-	  width="80" >
+	  top="0"
+	  width="333" >
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
@@ -28,7 +28,7 @@
         left="5"
         name="Fabric"
         tool_tip="Click to choose a picture"
-        top="0"
+        top="5"
         width="64" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
@@ -39,42 +39,32 @@
         height="80"
         label="Color/Tint"
         layout="topleft"
-        top_pad="5"
+        left_pad="10"
         name="Color/Tint"
         tool_tip="Click to open Color Picker"
-        left="5"
+        top_delta="0"
         width="64" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
        </panel>
 
-     <tab_container
-       name="wearable_accordion"
-       fit_parent="true"
-       layout="topleft"
-       follows="all"
-       halign="left"
-       tab_position="left"
-       tab_width="80"
-       top="0"
-       height="385"
-       width="333">
-
       <!-- Begin Undershirt Panel -->
       <panel
        name="undershirt_main_tab_holder"
        title="Undershirt"
+       top_pad="0"
+       left="0"
        layout="topleft"
        fit_parent="false"
-       follows="left"
-       height="385"
+       follows="all"
+       height="320"
        width="333">
       <!-- Viewer demands an accordion here, so we provide one -->
       <accordion
        layout="topleft"
        follows="all"
-       height ="385"
+       height ="320"
        left="0"
        name="undershirt_main_accordion"
        top="0"
@@ -91,16 +81,15 @@
       <scrolling_panel_list
        layout="topleft"
        follows="all"
-       left="10"
+       left="0"
        name="undershirt_main_param_list"
-       top="10"
-       height="385"
+       top="0"
+       height="288"
        width="333" />
       </accordion_tab>
       </accordion>
       </panel>
       <!-- End Undershirt Panel -->
 
-    </tab_container>
 </panel>