diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index ba73b74052..09b9677dcd 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -1308,6 +1308,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 		{
 			if( mCurrentHistoryLine > mLineHistory.begin() )
 			{
+				(*mCurrentHistoryLine).assign(getText());
 				mText.assign( *(--mCurrentHistoryLine) );
 				setCursorToEnd();
 			}
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 32f326238b..44083102c3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9303,6 +9303,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>ShowMeButton</key>
+    <map>
+      <key>Comment</key>
+      <string>Shows/Hides profile sidebar button in the bottom tray.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>ShowPlacesButton</key>
+    <map>
+      <key>Comment</key>
+      <string>Shows/Hides the places sidebar button in the bottom tray.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowMoveButton</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 9680086823..4e69cf2d74 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -1565,6 +1565,8 @@ void LLBottomTray::initResizeStateContainers()
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_WORLD_MAP, getChild<LLPanel>("world_map_btn_panel")));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MINI_MAP, getChild<LLPanel>("mini_map_btn_panel")));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild<LLPanel>("bottom_sbhome")));
+	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild<LLPanel>("bottom_sbme")));
+	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild<LLPanel>("bottom_sbplaces")));
 
 	// init an order of processed buttons
 	mButtonsProcessOrder.push_back(RS_BUTTON_GESTURES);
@@ -1576,6 +1578,8 @@ void LLBottomTray::initResizeStateContainers()
 	mButtonsProcessOrder.push_back(RS_BUTTON_WORLD_MAP);
 	mButtonsProcessOrder.push_back(RS_BUTTON_MINI_MAP);
 	mButtonsProcessOrder.push_back(RS_BUTTON_HOME);
+	mButtonsProcessOrder.push_back(RS_BUTTON_ME);
+	mButtonsProcessOrder.push_back(RS_BUTTON_PLACES);
 
 	mButtonsOrder.push_back(RS_BUTTON_SPEAK);
 	mButtonsOrder.insert(mButtonsOrder.end(), mButtonsProcessOrder.begin(), mButtonsProcessOrder.end());
@@ -1615,6 +1619,8 @@ void LLBottomTray::initButtonsVisibility()
 	setVisibleAndFitWidths(RS_BUTTON_WORLD_MAP, gSavedSettings.getBOOL("ShowWorldMapButton"));
 	setVisibleAndFitWidths(RS_BUTTON_MINI_MAP, gSavedSettings.getBOOL("ShowMiniMapButton"));
 	setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton"));
+	setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton"));
+	setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton"));
 }
 
 void LLBottomTray::setButtonsControlsAndListeners()
@@ -1628,6 +1634,8 @@ void LLBottomTray::setButtonsControlsAndListeners()
 	gSavedSettings.getControl("ShowWorldMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_WORLD_MAP, _2));
 	gSavedSettings.getControl("ShowMiniMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_MINI_MAP, _2));
 	gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2));
+	gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2));
+	gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2));
 
 
 	LLButton* build_btn = getChild<LLButton>("build_btn");
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index c256f289c6..3a9ba8ce66 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -155,6 +155,8 @@ private:
 		, RS_BUTTON_WORLD_MAP	= 0x0800
 		, RS_BUTTON_MINI_MAP	= 0x1000
 		, RS_BUTTON_HOME		= 0x2000
+		, RS_BUTTON_ME			= 0x4000
+		, RS_BUTTON_PLACES		= 0x8000
 
 		/*
 		Once new button that can be hidden on resize is added don't forget to update related places:
@@ -169,6 +171,7 @@ private:
 		 */
 		, RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES
 									| RS_BUTTON_BUILD | RS_BUTTON_SEARCH | RS_BUTTON_WORLD_MAP | RS_BUTTON_MINI_MAP | RS_BUTTON_HOME
+									| RS_BUTTON_ME | RS_BUTTON_PLACES
 	}EResizeState;
 
 	// Below are three methods that were introduced to handle drag'n'drop
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 33c66f0877..18385b7ce6 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -409,16 +409,20 @@ void LLInventoryFilter::setFilterSubString(const std::string& string)
 {
 	if (mFilterSubString != string)
 	{
+		std::string filterSubStringNew = string;
+		LLStringUtil::trimHead(filterSubStringNew);
+		mFilterSubStringOrig = filterSubStringNew;
+		LLStringUtil::toUpper(filterSubStringNew);
+
 		// hitting BACKSPACE, for example
-		const BOOL less_restrictive = mFilterSubString.size() >= string.size() && !mFilterSubString.substr(0, string.size()).compare(string);
+		const BOOL less_restrictive = mFilterSubString.size() >= filterSubStringNew.size()
+		&& !mFilterSubString.substr(0, filterSubStringNew.size()).compare(filterSubStringNew);
 
 		// appending new characters
-		const BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString);
+		const BOOL more_restrictive = mFilterSubString.size() < filterSubStringNew.size()
+		&& !filterSubStringNew.substr(0, mFilterSubString.size()).compare(mFilterSubString);
 
-		mFilterSubStringOrig = string;
-		LLStringUtil::trimHead(mFilterSubStringOrig);
-		mFilterSubString = mFilterSubStringOrig;
-		LLStringUtil::toUpper(mFilterSubString);
+		mFilterSubString = filterSubStringNew;
 		if (less_restrictive)
 		{
 			setModified(FILTER_LESS_RESTRICTIVE);
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index d02803d7ae..a4cdd8b53c 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -244,7 +244,7 @@
     </panel>
     <panel
      border="false"
-     height="69"
+     height="81"
      layout="topleft"
      left="186"
      top="20"
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index 5d04fcc4c2..23eb6b45d5 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -107,6 +107,28 @@
          function="CheckControl"
          parameter="ShowHomeButton" />
     </menu_item_check>
+    <menu_item_check
+     label="Profile Button"
+     layout="topleft"
+     name="ShowMeButton">
+        <menu_item_check.on_click
+         function="ToggleControl"
+         parameter="ShowMeButton" />
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="ShowMeButton" />
+    </menu_item_check>
+    <menu_item_check
+     label="Places Button"
+     layout="topleft"
+     name="ShowPlacesButton">
+        <menu_item_check.on_click
+         function="ToggleControl"
+         parameter="ShowPlacesButton" />
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="ShowPlacesButton" />
+    </menu_item_check>
     <menu_item_separator
      name="Separator" />
     <menu_item_call
diff --git a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
index 78117e103d..ff42157794 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
@@ -11,622 +11,622 @@
  name="bottom_tray"
  top="28"
  width="1310">
-    <string
-     name="DragIndicationImageName"
-     value="Accordion_ArrowOpened_Off" />
-    <string
-     name="SpeakBtnToolTip"
-     value="Turns microphone on/off" />
-    <string
-     name="VoiceControlBtnToolTip"
-     value="Shows/hides voice control panel" />
-    <layout_stack
-     border_size="0"
-     clip="false"
-     follows="all"
+  <string
+   name="DragIndicationImageName"
+   value="Accordion_ArrowOpened_Off" />
+  <string
+   name="SpeakBtnToolTip"
+   value="Turns microphone on/off" />
+  <string
+   name="VoiceControlBtnToolTip"
+   value="Shows/hides voice control panel" />
+  <layout_stack
+   border_size="0"
+   clip="false"
+   follows="all"
+   height="28"
+   layout="topleft"
+   left="0"
+   mouse_opaque="false"
+   name="toolbar_stack"
+   orientation="horizontal"
+   top="0"
+   width="1310">
+    <layout_panel
+     auto_resize="false"
+     user_resize="false"
+     min_width="2"
+     width="2" />
+    <layout_panel
+     auto_resize="false"
+     layout="topleft"
+     max_width="320"
+     min_width="25"
+     height="28"
+     mouse_opaque="false"
+ name="chat_bar_layout_panel"
+     user_resize="true"
+     width="308" >
+      <panel
+     name="chat_bar"
+        filename="panel_nearby_chat_bar.xml"
+        left="0"
+        height="28"
+        width="308"
+        top="0"
+        mouse_opaque="false"
+        follows="left|right"
+          />
+    </layout_panel>
+    <layout_panel
+     auto_resize="false"
+     follows="right"
      height="28"
      layout="topleft"
-     left="0"
+     min_height="28"
+     min_width="80"
      mouse_opaque="false"
-     name="toolbar_stack"
-     orientation="horizontal"
-     top="0"
-     width="1310">
-        <layout_panel
-         auto_resize="false"
-         user_resize="false" 
-         min_width="2"
-         width="2" />
-        <layout_panel
-         auto_resize="false"
-         layout="topleft"
-         max_width="320"
-         min_width="25"
-         height="28" 
-         mouse_opaque="false"
-		 name="chat_bar_layout_panel"
-         user_resize="true"
-         width="308" >
-          <panel
-         name="chat_bar"
-            filename="panel_nearby_chat_bar.xml"
-            left="0"
-            height="28"
-            width="308"
-            top="0"
-            mouse_opaque="false"
-            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>
+     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 after the chat bar. It has 2px width (is is set as 2*UIResizeBarOverlap)
         -->
-        <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="59"
-         mouse_opaque="false"
-         name="speak_panel"
-         top_delta="0"
-         user_resize="true"
-         width="50">
-            <talk_button
-             follows="left|right"
-             height="23"
-             layout="topleft"
-             left="2"
-             name="talk"
-             top="5"
-             width="45">
-                <show_button
-                 tab_stop="true">
-                    <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="voice_controls" />
-                </show_button>
-            </talk_button>
-        </layout_panel>
+    <layout_panel
+     auto_resize="false"
+     follows="right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="59"
+     mouse_opaque="false"
+     name="speak_panel"
+     top_delta="0"
+     user_resize="true"
+     width="50">
+      <talk_button
+       follows="left|right"
+       height="23"
+       layout="topleft"
+       left="2"
+       name="talk"
+       top="5"
+       width="45">
+        <show_button
+         tab_stop="true">
+          <init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="voice_controls" />
+        </show_button>
+      </talk_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_Home_Selected"
-             layout="topleft"
-             left="0"
-             name="sidebar_home_btn"
-             tool_tip="Shows/hides sidebar home"
-             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_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="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_Home_Selected"
+       layout="topleft"
+       left="0"
+       name="sidebar_home_btn"
+       tool_tip="Shows/hides sidebar home"
+       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_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_sbplaces"
+     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_sbappearance"
+     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="40"
-         mouse_opaque="false"
-         name="movement_panel"
-         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="true"
-             image_overlay="move_18"
-             layout="topleft"
-             name="movement_btn"
-             tool_tip="Shows/hides movement controls"
-             top="5"
-             use_ellipses="true"
-             width="36">
-                <init_callback
-                 function="Button.SetDockableFloaterToggle"
-                 parameter="moveview" />
-            </bottomtray_button>
+    <layout_panel
+     auto_resize="false"
+     follows="right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="40"
+     mouse_opaque="false"
+     name="movement_panel"
+     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="true"
+       image_overlay="move_18"
+       layout="topleft"
+       name="movement_btn"
+       tool_tip="Shows/hides movement controls"
+       top="5"
+       use_ellipses="true"
+       width="36">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="moveview" />
+      </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="cam_panel"
-         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="true"
-             image_overlay="view_18"
-             layout="topleft"
-             left="0"
-             name="camera_btn"
-             tool_tip="Shows/hides camera controls"
-             top="5"
-             use_ellipses="true"
-             width="36">
-                <init_callback
-                 function="Button.SetDockableFloaterToggle"
-                 parameter="camera" />
-            </bottomtray_button>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_width="40"
-         mouse_opaque="false"
-         name="snapshot_panel"
-         user_resize="false"
-         width="40">
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_overlay="Snapshot_Off"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             layout="topleft"
-             left="0"
-             name="snapshots"
-             tool_tip="Take snapshot"
-             top="5"
-             width="36">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="snapshot" />
-            </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="build_btn_panel"
-         user_resize="false"
-         width="40">
-<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
+    </layout_panel>
+    <layout_panel
+     auto_resize="false"
+     follows="left|right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="40"
+     mouse_opaque="false"
+     name="cam_panel"
+     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="true"
+       image_overlay="view_18"
+       layout="topleft"
+       left="0"
+       name="camera_btn"
+       tool_tip="Shows/hides camera controls"
+       top="5"
+       use_ellipses="true"
+       width="36">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="camera" />
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
+     auto_resize="false"
+     follows="left|right"
+     height="28"
+     layout="topleft"
+     min_width="40"
+     mouse_opaque="false"
+     name="snapshot_panel"
+     user_resize="false"
+     width="40">
+      <bottomtray_button
+       follows="left|right"
+       height="23"
+       image_overlay="Snapshot_Off"
+       image_pressed="PushButton_Press"
+       image_pressed_selected="PushButton_Selected_Press"
+       image_selected="PushButton_Selected_Press"
+       is_toggle="true"
+       layout="topleft"
+       left="0"
+       name="snapshots"
+       tool_tip="Take snapshot"
+       top="5"
+       width="36">
+        <init_callback
+         function="Button.SetFloaterToggle"
+         parameter="snapshot" />
+      </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="build_btn_panel"
+     user_resize="false"
+     width="40">
+      <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
 Disabled for now.
 -->
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             image_overlay="hammer_18"
-             layout="topleft"
-             left="0"
-             name="build_btn"
-             tool_tip="Shows/hides Build Tools"
-             top="5"
-             use_ellipses="true"
-             width="36">
-                <commit_callback
-                 function="Build.Toggle"
-                 parameter="build" />
-            </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="search_btn_panel"
-         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="true"
-             image_overlay="search_18"
-             layout="topleft"
-             left="0"
-             name="search_btn"
-             tool_tip="Shows/hides Search"
-             top="5"
-             use_ellipses="true"
-             width="36">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="search" />
-            </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="world_map_btn_panel"
-         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="true"
-             image_overlay="map_18"
-             layout="topleft"
-             left="0"
-             name="world_map_btn"
-             tool_tip="Shows/hides World Map"
-             top="5"
-             use_ellipses="true"
-             width="36">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="world_map" />
-            </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="mini_map_btn_panel"
-         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="true"
-             image_overlay="minimap_18"
-             layout="topleft"
-             left="0"
-             name="mini_map_btn"
-             tool_tip="Shows/hides Mini-Map"
-             top="5"
-             use_ellipses="true"
-             width="36">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="mini_map" />
-            </bottomtray_button>
-        </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="40"
-         name="inventory_panel"
-         user_resize="false"
-         width="40">
-            <button
-                 image_selected="PushButton_Selected_Press"
-                 image_pressed="PushButton_Press"
-                 image_pressed_selected="PushButton_Selected_Press"
-             follows="left|right"
-             height="23"
-             use_ellipses="true"
-             is_toggle="true"
-             image_overlay="inventory_18"
-             layout="topleft"
-             left="0"
-             tool_tip="Shows/hides Inventory"
-             top="5"
-             name="inventory_btn"
-             width="36">
-                <button.init_callback
-                 function="Button.SetDockableFloaterToggle"
-                 parameter="inventory" />
-            </button>
-        </layout_panel>
+      <bottomtray_button
+       follows="left|right"
+       height="23"
+       image_pressed="PushButton_Press"
+       image_pressed_selected="PushButton_Selected_Press"
+       image_selected="PushButton_Selected_Press"
+       is_toggle="true"
+       image_overlay="hammer_18"
+       layout="topleft"
+       left="0"
+       name="build_btn"
+       tool_tip="Shows/hides Build Tools"
+       top="5"
+       use_ellipses="true"
+       width="36">
+        <commit_callback
+         function="Build.Toggle"
+         parameter="build" />
+      </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="search_btn_panel"
+     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="true"
+       image_overlay="search_18"
+       layout="topleft"
+       left="0"
+       name="search_btn"
+       tool_tip="Shows/hides Search"
+       top="5"
+       use_ellipses="true"
+       width="36">
+        <init_callback
+         function="Button.SetFloaterToggle"
+         parameter="search" />
+      </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="world_map_btn_panel"
+     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="true"
+       image_overlay="map_18"
+       layout="topleft"
+       left="0"
+       name="world_map_btn"
+       tool_tip="Shows/hides World Map"
+       top="5"
+       use_ellipses="true"
+       width="36">
+        <init_callback
+         function="Button.SetFloaterToggle"
+         parameter="world_map" />
+      </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="mini_map_btn_panel"
+     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="true"
+       image_overlay="minimap_18"
+       layout="topleft"
+       left="0"
+       name="mini_map_btn"
+       tool_tip="Shows/hides Mini-Map"
+       top="5"
+       use_ellipses="true"
+       width="36">
+        <init_callback
+         function="Button.SetFloaterToggle"
+         parameter="mini_map" />
+      </bottomtray_button>
+    </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
-         follows="left|right"
-         height="30"
-         layout="topleft"
-         min_width="95"
-         mouse_opaque="false"
-         name="chiclet_list_panel"
-         top="0"
-         user_resize="false"
-         width="189">
-<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
+    <layout_panel
+    mouse_opaque="false"
+    auto_resize="false"
+    follows="left|right"
+    height="28"
+    layout="topleft"
+    min_height="28"
+    min_width="40"
+    name="inventory_panel"
+    user_resize="false"
+    width="40">
+      <button
+           image_selected="PushButton_Selected_Press"
+           image_pressed="PushButton_Press"
+           image_pressed_selected="PushButton_Selected_Press"
+       follows="left|right"
+       height="23"
+       use_ellipses="true"
+       is_toggle="true"
+       image_overlay="inventory_18"
+       layout="topleft"
+       left="0"
+       tool_tip="Shows/hides Inventory"
+       top="5"
+       name="inventory_btn"
+       width="36">
+        <button.init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="inventory" />
+      </button>
+    </layout_panel>
+
+
+
+    <layout_panel
+     follows="left|right"
+     height="30"
+     layout="topleft"
+     min_width="95"
+     mouse_opaque="false"
+     name="chiclet_list_panel"
+     top="0"
+     user_resize="false"
+     width="189">
+      <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
 as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
-            <chiclet_panel
-             chiclet_padding="4"
-             follows="left|right"
-             height="24"
-             layout="topleft"
-             left="1"
-             min_width="95"
-             mouse_opaque="false"
-             name="chiclet_list"
-             top="7"
-             width="189">
-                <button
-                 auto_resize="true"
-                 follows="right"
-                 height="29"
-                 image_hover_selected="SegmentedBtn_Left_Over"
-                 image_hover_unselected="SegmentedBtn_Left_Over"
-                 image_overlay="Arrow_Small_Left"
-                 image_pressed="SegmentedBtn_Left_Press"
-                 image_pressed_selected="SegmentedBtn_Left_Press"
-                 image_selected="SegmentedBtn_Left_Off"
-                 image_unselected="SegmentedBtn_Left_Off"
-                 layout="topleft"
-                 name="chicklet_left_scroll_button"
-                 tab_stop="false"
-                 top="-28"
-                 visible="false"
-                 width="7" />
-                <button
-                 auto_resize="true"
-                 follows="right"
-                 height="29"
-                 image_hover_selected="SegmentedBtn_Right_Over"
-                 image_hover_unselected="SegmentedBtn_Right_Over"
-                 image_overlay="Arrow_Small_Right"
-                 image_pressed="SegmentedBtn_Right_Press"
-                 image_pressed_selected="SegmentedBtn_Right_Press"
-                 image_selected="SegmentedBtn_Right_Off"
-                 image_unselected="SegmentedBtn_Right_Off"
-                 layout="topleft"
-                 name="chicklet_right_scroll_button"
-                 tab_stop="false"
-                 top="-28"
-                 visible="false"
-                 width="7" />
-            </chiclet_panel>
-        </layout_panel>
-        <layout_panel auto_resize="false"
-                      user_resize="false" 
-                      width="4"
-                      min_width="4"/>
-        <layout_panel
-         auto_resize="false"
+      <chiclet_panel
+       chiclet_padding="4"
+       follows="left|right"
+       height="24"
+       layout="topleft"
+       left="1"
+       min_width="95"
+       mouse_opaque="false"
+       name="chiclet_list"
+       top="7"
+       width="189">
+        <button
+         auto_resize="true"
          follows="right"
-         height="28"
+         height="29"
+         image_hover_selected="SegmentedBtn_Left_Over"
+         image_hover_unselected="SegmentedBtn_Left_Over"
+         image_overlay="Arrow_Small_Left"
+         image_pressed="SegmentedBtn_Left_Press"
+         image_pressed_selected="SegmentedBtn_Left_Press"
+         image_selected="SegmentedBtn_Left_Off"
+         image_unselected="SegmentedBtn_Left_Off"
          layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="im_well_panel"
-         top="0"
-         user_resize="false"
-         width="37">
-            <chiclet_im_well
-             follows="right"
-             height="28"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="im_well"
-             top="0"
-             width="35">
-             <!--
+         name="chicklet_left_scroll_button"
+         tab_stop="false"
+         top="-28"
+         visible="false"
+         width="7" />
+        <button
+         auto_resize="true"
+         follows="right"
+         height="29"
+         image_hover_selected="SegmentedBtn_Right_Over"
+         image_hover_unselected="SegmentedBtn_Right_Over"
+         image_overlay="Arrow_Small_Right"
+         image_pressed="SegmentedBtn_Right_Press"
+         image_pressed_selected="SegmentedBtn_Right_Press"
+         image_selected="SegmentedBtn_Right_Off"
+         image_unselected="SegmentedBtn_Right_Off"
+         layout="topleft"
+         name="chicklet_right_scroll_button"
+         tab_stop="false"
+         top="-28"
+         visible="false"
+         width="7" />
+      </chiclet_panel>
+    </layout_panel>
+    <layout_panel auto_resize="false"
+                  user_resize="false"
+                  width="4"
+                  min_width="4"/>
+    <layout_panel
+     auto_resize="false"
+     follows="right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="37"
+     name="im_well_panel"
+     top="0"
+     user_resize="false"
+     width="37">
+      <chiclet_im_well
+       follows="right"
+       height="28"
+       layout="topleft"
+       left="0"
+       max_displayed_count="99"
+       name="im_well"
+       top="0"
+       width="35">
+        <!--
 Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
 xml attribute           Description
 image_unselected        "Unlit" - there are no new messages
@@ -634,74 +634,74 @@ image_selected          "Unlit" + "Selected" - there are no new messages and the
 image_pressed           "Lit" - there are new messages
 image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
              -->
-                <button
-                 auto_resize="true"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Unread_IM"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread IM messages"
-                 tool_tip="Conversations"
-                 width="34">
-                    <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="im_well_window" />
-                </button>
-            </chiclet_im_well>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
+        <button
+         auto_resize="true"
          follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="notification_well_panel"
-         top="0"
-         user_resize="false"
-         width="37">
-            <chiclet_notification
-             follows="right"
-             height="23"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="notification_well"
-             top="5"
-             width="35">
-                <button
-                 auto_resize="true"
-                 bottom_pad="3"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Notices_Unread"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread"
-                 tool_tip="Notifications"
-                 width="34">
-                    <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="notification_well_window" />
-                </button>
-            </chiclet_notification>
-        </layout_panel>
-      <layout_panel
-         auto_resize="false"
-         user_resize="false" 
-         min_width="4"
-         name="DUMMY2"
-         width="8" />
-    </layout_stack>
+         halign="center"
+         height="23"
+         image_overlay="Unread_IM"
+         image_overlay_alignment="center"
+         image_pressed="WellButton_Lit"
+         image_pressed_selected="WellButton_Lit_Selected"
+         image_selected="PushButton_Press"
+         label_color="Black"
+         left="0"
+         name="Unread IM messages"
+         tool_tip="Conversations"
+         width="34">
+          <init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="im_well_window" />
+        </button>
+      </chiclet_im_well>
+    </layout_panel>
+    <layout_panel
+     auto_resize="false"
+     follows="right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="37"
+     name="notification_well_panel"
+     top="0"
+     user_resize="false"
+     width="37">
+      <chiclet_notification
+       follows="right"
+       height="23"
+       layout="topleft"
+       left="0"
+       max_displayed_count="99"
+       name="notification_well"
+       top="5"
+       width="35">
+        <button
+         auto_resize="true"
+         bottom_pad="3"
+         follows="right"
+         halign="center"
+         height="23"
+         image_overlay="Notices_Unread"
+         image_overlay_alignment="center"
+         image_pressed="WellButton_Lit"
+         image_pressed_selected="WellButton_Lit_Selected"
+         image_selected="PushButton_Press"
+         label_color="Black"
+         left="0"
+         name="Unread"
+         tool_tip="Notifications"
+         width="34">
+          <init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="notification_well_window" />
+        </button>
+      </chiclet_notification>
+    </layout_panel>
+    <layout_panel
+       auto_resize="false"
+       user_resize="false"
+       min_width="4"
+       name="DUMMY2"
+       width="8" />
+  </layout_stack>
 </panel>