diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 928e2bf7ef..5e90fbe631 100755
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -604,6 +604,7 @@ BOOL LLBottomTray::postBuild()
 	mListener.reset(new LLNearbyChatBarListener(*mNearbyChatBar));
 
 	mChatBarContainer = getChild<LLLayoutPanel>("chat_bar_layout_panel");
+	mChatbarWidth = mChatBarContainer->getRect().getWidth();
 	mNearbyCharResizeHandlePanel = getChild<LLPanel>("chat_bar_resize_handle_panel");
 
 	mToolbarStack = getChild<LLLayoutStack>("toolbar_stack");
@@ -682,12 +683,15 @@ void LLBottomTray::onAutohideChatBarChanged()
 {
 	if(gSavedSettings.getBOOL("AutohideChatBar"))
 	{
-		mChatBarContainer->setVisible(FALSE);
+		mChatbarWidth = mChatBarContainer->getRect().getWidth();
+		mChatBarContainer->reshape(30,mChatBarContainer->getRect().getHeight());
+		//mChatBarContainer->setVisible(FALSE);
 		mNearbyCharResizeHandlePanel->setVisible(FALSE);
 	}
 	else
 	{
-		mChatBarContainer->setVisible(TRUE);
+		mChatBarContainer->reshape(mChatbarWidth,mChatBarContainer->getRect().getHeight());
+		//mChatBarContainer->setVisible(TRUE);
 		mNearbyCharResizeHandlePanel->setVisible(TRUE);
 	}
 }
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index b076244c21..431aabde84 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -556,6 +556,7 @@ protected:
 	LLBottomTrayLite*   mPopupChatBar;
 	LLButton*			mAOToggleButton;			// ## Zi: Animation Overrider
 	bool                mIsInLiteMode;
+	U32					mChatbarWidth;
 
 	// Drag'n'Drop
 
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index fa8cb9563f..93d108c118 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -24,7 +24,7 @@
      text_pad_right="25"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
      top="2"
-     width="283" />
+     width="303" />
     <output_monitor
      auto_update="true"
      follows="right"
@@ -37,23 +37,4 @@
      top="6"
      visible="true"
      width="20" />
-    <button
-     follows="right"
-     is_toggle="true"
-     width="20"
-     top="2"
-     layout="topleft"
-     left_pad="4"
-     image_disabled="ComboButton_UpOff"
-     image_unselected="ComboButton_UpOff"
-     image_selected="ComboButton_On"
-     image_pressed="ComboButton_UpSelected"
-     image_pressed_selected="ComboButton_Selected"
-     height="23"
-     name="show_nearby_chat"
-     tool_tip="Shows/hides nearby chat log">
-        <button.init_callback
-           function="Button.SetFloaterToggle"
-           parameter="nearby_chat" />
-    </button>
 </panel>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
index e80a0b62f6..a5ef2ae460 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
@@ -12,22 +12,7 @@
  name="bottom_tray"
  top="28"
  width="1310">
-<button
- name="conversations_btn"
- control_name="floater_vis_imcontacts"
- image_overlay="conversations_18"
- image_pressed="PushButton_Press"
- image_pressed_selected="PushButton_Selected_Press"
- image_selected="PushButton_Selected_Press"
- left="0"
- top="5"
- width="36"
- height="23"
- follows="top|left">
-<commit_callback
- function="Floater.Toggle"
- parameter="im_container" />
-</button>
+
   <string
    name="DragIndicationImageName"
    value="Accordion_ArrowOpened_Off" />
@@ -38,40 +23,59 @@
    name="VoiceControlBtnToolTip"
    value="Shows/hides voice control panel" />
 
-  <!-- Do not try to use left_pad here, it creates strange results -Zi -->
   <layout_stack
    border_size="0"
    clip="false"
    follows="all"
    height="28"
    layout="topleft"
-   left="40"
+   left="2"
    mouse_opaque="false"
    name="toolbar_stack"
    orientation="horizontal"
    top="0"
    width="1270">
     <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="310"
-        top="0"
-        mouse_opaque="false"
-        follows="left|right"
+         auto_resize="false"
+         layout="topleft"
+         max_width="284"
+         min_width="34"
+         height="28" 
+         mouse_opaque="false"
+		 name="chat_bar_layout_panel"
+         user_resize="true"
+     width="284" >
+
+          <panel
+            name="chat_bar"
+            filename="panel_nearby_chat_bar.xml"
+            left="0"
+            height="28"
+        	width="252"
+            top="0"
+            mouse_opaque="false"
+            follows="left|right"
           />
-    </layout_panel>
+          
+          <button
+			 name="conversations_btn"
+			 control_name="floater_vis_imcontacts"
+			 image_overlay="conversations_18"
+			 image_pressed="PushButton_Press"
+			 image_pressed_selected="PushButton_Selected_Press"
+			 image_selected="PushButton_Selected_Press"
+			 right="280"
+			 top="5"
+			 width="30"
+			 min_width="30"
+			 height="23"
+			 follows="right">
+			<commit_callback
+			 function="Floater.Toggle"
+			 parameter="im_container" />
+			</button>
+          
+        </layout_panel>
 
     <!--
          This 5px Panel is an indicator of where the resize handle is.
@@ -131,46 +135,49 @@
       </gesture_combo_list>
     </layout_panel>
 
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="79"
-     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>
-        <bottomtray_button follows="left"
-            left_delta="2"
-            bottom="-3"
-            width="16"
-            height="16"
-            is_toggle="true"
-            image_selected="ptt_lock_on.tga"
-            image_unselected="ptt_lock_off.tga"
-            label=""
-            name="ptt_lock"
-            scale_image="true"
-            control_name="PushToTalkToggle">
-        </bottomtray_button>
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         left_delta="0"
+         mouse_opaque="false"
+         name="speak_panel"
+         top_delta="0"
+         user_resize="true"
+         min_width="68"
+         width="68">
+            <talk_button
+             follows="left|right"
+             height="23"
+             layout="topleft"
+             left="0"
+             name="talk"
+             top="5"
+             width="64">
+                <show_button
+                 tab_stop="true">
+                    <init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="voice_controls" />
+                </show_button>
+            </talk_button>
+            <bottomtray_button follows="left"
+                left="6"
+                bottom="-3"
+                width="16"
+                height="16"
+                is_toggle="true"
+                image_selected="ptt_lock_on.tga"
+                image_unselected="ptt_lock_off.tga"
+                label=""
+                name="ptt_lock"
+                scale_image="true"
+                control_name="PushToTalkToggle">
+            </bottomtray_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"
@@ -179,7 +186,7 @@
             pad_right="20"
             tab_stop="true"
             use_ellipses="true" />
-    </layout_panel>
+        </layout_panel>
 
 
     <layout_panel
diff --git a/indra/newview/skins/firestorm/xui/en/widgets/talk_button.xml b/indra/newview/skins/firestorm/xui/en/widgets/talk_button.xml
deleted file mode 100644
index e97aae343f..0000000000
--- a/indra/newview/skins/firestorm/xui/en/widgets/talk_button.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Derives from LLUICtrl -->
-<talk_button>
-  <!-- To make speak button look green when selected set:
-    image_selected="SegmentedBtn_Left_Selected"
-    image_unselected="SegmentedBtn_Left_Off"
-  -->
-  <speak_button
-    follows="left|right" 
-                 image_selected="SpeakBtn_Left_Selected_Press"
-                 image_unselected="SpeakBtn_Left_Off"
-		 image_pressed="SpeakBtn_Left_Selected_Press"
-		 image_pressed_selected="SpeakBtn_Left_Selected_Press"
-    tab_stop="false"
-    />
-  <show_button
-    follows="right" 
-    name="speak_flyout_btn"
-    label=""
-    left="0"
-    top="0"
-    right="20"
-    bottom="0"
-    tab_stop="false"
-    is_toggle="true"
-    image_disabled="ComboButton_UpOff"
-    image_unselected="ComboButton_UpOff"
-    image_selected="ComboButton_On"
-    image_pressed="ComboButton_UpSelected"
-    image_pressed_selected="ComboButton_Selected"
-    />
-  <monitor
-    follows="right" 
-    name="monitor"
-    left="0"
-    top="18"
-    right="28"
-    bottom="0"
-    />
-</talk_button>