diff --git a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
index 288b1a8706..78117e103d 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
@@ -2,7 +2,7 @@
 <panel
  background_visible="true"
  bg_alpha_color="ltgrey123"
- bg_opaque_color="drkgrey123"
+ bg_opaque_color="DkGray"
  chrome="true"
  follows="left|bottom|right"
  height="33"
@@ -41,7 +41,7 @@
          auto_resize="false"
          layout="topleft"
          max_width="320"
-         min_width="214"
+         min_width="25"
          height="28" 
          mouse_opaque="false"
 		 name="chat_bar_layout_panel"
@@ -58,8 +58,43 @@
             follows="left|right"
           />
         </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="80"
+         mouse_opaque="false"
+         name="gesture_panel"
+         top_delta="0"
+         user_resize="false"
+         width="76">
+            <gesture_combo_list
+             follows="left|right"
+             height="23"
+             label="Gestures"
+             image_overlay="gesture_18"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             layout="topleft"
+             left="0"
+             name="Gesture"
+             tool_tip="Shows/hides gestures"
+             top="5"
+             width="76">
+                <combo_button
+                 pad_right="10"
+                 use_ellipses="true" />
+                <combo_list
+                 page_lines="17" />
+            </gesture_combo_list>
+        </layout_panel>
+
+        
         <!--
-        There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap)
+        There is resize bar after the chat bar. It has 2px width (is is set as 2*UIResizeBarOverlap)
         -->
         <layout_panel
          auto_resize="false"
@@ -72,7 +107,7 @@
          name="speak_panel"
          top_delta="0"
          user_resize="true"
-         width="110">
+         width="50">
             <talk_button
              follows="left|right"
              height="23"
@@ -80,65 +115,180 @@
              left="2"
              name="talk"
              top="5"
-             width="105">
+             width="45">
                 <show_button
                  tab_stop="true">
                     <init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="voice_controls" />
                 </show_button>
-                <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
-                 & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
-                <speak_button
-                 halign="center"
-                 label="Speak"
-                 label_selected="Speak"
-                 name="speak_btn"
-                 pad_right="20"
-                 tab_stop="true"
-                 use_ellipses="true" />
             </talk_button>
         </layout_panel>
+
+
         <layout_panel
          auto_resize="false"
-         follows="right"
+         follows="left|right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="65"
+         min_width="40"
          mouse_opaque="false"
-         name="gesture_panel"
-         top_delta="0"
+         name="bottom_sbhome"
          user_resize="false"
-         width="85">
-            <gesture_combo_list
+         width="40">
+            <bottomtray_button
              follows="left|right"
              height="23"
-             label="Gesture"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="TabIcon_Home_Selected"
              layout="topleft"
              left="0"
-             name="Gesture"
-             tool_tip="Shows/hides gestures"
+             name="sidebar_home_btn"
+             tool_tip="Shows/hides sidebar home"
              top="5"
-             width="82">
-                <combo_button
-                 pad_right="10"
-                 use_ellipses="true" />
-                <combo_list
-                 page_lines="17" />
-            </gesture_combo_list>
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
         </layout_panel>
+        
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbme"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="TabIcon_Me_Selected"
+             layout="topleft"
+             left="0"
+             name="sidebar_me_btn"
+             tool_tip="Shows/hides avatar profile"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+        
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbpeople"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="TabIcon_People_Selected"
+             layout="topleft"
+             left="0"
+             name="sidebar_people_btn"
+             tool_tip="Shows/hides people panel"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+        
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbhome"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="TabIcon_Places_Selected"
+             layout="topleft"
+             left="0"
+             name="sidebar_places_btn"
+             tool_tip="Shows/hides places panel"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+        
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="40"
+         mouse_opaque="false"
+         name="bottom_sbhome"
+         user_resize="false"
+         width="40">
+            <bottomtray_button
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="false"
+             image_overlay="TabIcon_Appearance_Selected"
+             layout="topleft"
+             left="0"
+             name="sidebar_appearance_btn"
+             tool_tip="Shows/hides appearance panel"
+             top="5"
+             enabled="true"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+        </layout_panel>
+
+
+
         <layout_panel
          auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          mouse_opaque="false"
          name="movement_panel"
          user_resize="false"
-         width="83">
+         width="40">
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -146,13 +296,13 @@
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Move"
+             image_overlay="move_18"
              layout="topleft"
              name="movement_btn"
              tool_tip="Shows/hides movement controls"
              top="5"
              use_ellipses="true"
-             width="80">
+             width="36">
                 <init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="moveview" />
@@ -165,11 +315,11 @@
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          mouse_opaque="false"
          name="cam_panel"
          user_resize="false"
-         width="83">
+         width="40">
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -177,14 +327,14 @@
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="View"
+             image_overlay="view_18"
              layout="topleft"
              left="0"
              name="camera_btn"
              tool_tip="Shows/hides camera controls"
              top="5"
              use_ellipses="true"
-             width="80">
+             width="36">
                 <init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
@@ -199,7 +349,7 @@
          mouse_opaque="false"
          name="snapshot_panel"
          user_resize="false"
-         width="39">
+         width="40">
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -225,11 +375,11 @@
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          mouse_opaque="false"
          name="build_btn_panel"
          user_resize="false"
-         width="83">
+         width="40">
 <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
 Disabled for now.
 -->
@@ -240,14 +390,14 @@ Disabled for now.
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Build"
+             image_overlay="hammer_18"
              layout="topleft"
              left="0"
              name="build_btn"
              tool_tip="Shows/hides Build Tools"
              top="5"
              use_ellipses="true"
-             width="80">
+             width="36">
                 <commit_callback
                  function="Build.Toggle"
                  parameter="build" />
@@ -259,11 +409,11 @@ Disabled for now.
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          mouse_opaque="false"
          name="search_btn_panel"
          user_resize="false"
-         width="83">
+         width="40">
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -271,14 +421,14 @@ Disabled for now.
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Search"
+             image_overlay="search_18"
              layout="topleft"
              left="0"
              name="search_btn"
              tool_tip="Shows/hides Search"
              top="5"
              use_ellipses="true"
-             width="80">
+             width="36">
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="search" />
@@ -290,11 +440,11 @@ Disabled for now.
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          mouse_opaque="false"
          name="world_map_btn_panel"
          user_resize="false"
-         width="83">
+         width="40">
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -302,14 +452,14 @@ Disabled for now.
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Map"
+             image_overlay="map_18"
              layout="topleft"
              left="0"
              name="world_map_btn"
              tool_tip="Shows/hides World Map"
              top="5"
              use_ellipses="true"
-             width="80">
+             width="36">
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="world_map" />
@@ -321,11 +471,11 @@ Disabled for now.
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          mouse_opaque="false"
          name="mini_map_btn_panel"
          user_resize="false"
-         width="83">
+         width="40">
             <bottomtray_button
              follows="left|right"
              height="23"
@@ -333,31 +483,44 @@ Disabled for now.
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Mini-Map"
+             image_overlay="minimap_18"
              layout="topleft"
              left="0"
              name="mini_map_btn"
              tool_tip="Shows/hides Mini-Map"
              top="5"
              use_ellipses="true"
-             width="80">
+             width="36">
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="mini_map" />
             </bottomtray_button>
         </layout_panel>
-		<layout_panel
+        <icon
+         auto_resize="false"
+         color="Transparent"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="3"
+         name="after_inventory_button"
+         top="0"
+         width="3"/>
+        
+         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
+         min_width="40"
          name="inventory_panel"
          user_resize="false"
-         width="83">
-            <bottomtray_button
+         width="40">
+            <button
                  image_selected="PushButton_Selected_Press"
                  image_pressed="PushButton_Press"
                  image_pressed_selected="PushButton_Selected_Press"
@@ -365,18 +528,21 @@ Disabled for now.
              height="23"
              use_ellipses="true"
              is_toggle="true"
-             label="Inventory"
+             image_overlay="inventory_18"
              layout="topleft"
              left="0"
              tool_tip="Shows/hides Inventory"
              top="5"
              name="inventory_btn"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
+             width="36">
+                <button.init_callback
+                 function="Button.SetDockableFloaterToggle"
                  parameter="inventory" />
-            </bottomtray_button>
+            </button>
         </layout_panel>
+
+        
+        
         <layout_panel
          follows="left|right"
          height="30"