2 files changed, 16 insertions, 23 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index a89d97d8e9..d21f8c82bc 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -3,33 +3,26 @@
     name="emojipicker"
     title="CHOOSE EMOJI"
     help_topic="emojipicker"
-    positioning="cascading"
-    legacy_header_height="0"
+    single_instance="true"
+    can_minimize="false"
+    can_tear_off="false"
     can_resize="true"
+    auto_close="true"
     layout="topleft"
     min_width="250"
-    height="400"
-    width="250">
+    chrome="true"
+    height="350"
+    width="304">
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
-  <filter_editor
-      name="Filter"
-      label="Start typing to filter"
-      layout="topleft"
-      follows="top|left|right"
-      top="27"
-      left="10"
-      height="23"
-      width="230" />
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
       ignore_arrow_keys="true"
-      top="50"
+      top="25"
       left="0"
-      height="300"
-      width="250">
+      height="275">
     <scrolling_panel_list
         name="EmojiGrid"
         layout="topleft"
@@ -37,8 +30,7 @@
         padding="4"
         spacing="0"
         top="0"
-        left="0"
-        width="250"/>
+        left="0"/>
   </scroll_container>
   <panel
       name="Groups"
@@ -46,8 +38,7 @@
       follows="top|left|right"
       top="0"
       left="0"
-      height="25"
-      width="250">
+      height="25">
     <panel
       name="Badge"
       layout="bottomleft"
@@ -70,6 +61,5 @@
       valign="center"
       bottom="14"
       left="10"
-      height="23"
-      width="230">No emoji selected</text>
+      height="25">No emoji selected</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index eb5d88bba6..94400f6501 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -306,6 +306,7 @@
                          follows="right|bottom"
                          use_font_color="true"
                          font="EmojiLarge"
+                         tab_stop="false"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
@@ -353,17 +354,19 @@
                  name="emoji_recent_icons_ctrl"
                  follows="top|left|right"
                  layout="topleft"
+                 tab_stop="false"
                  max_visible="20"
                  top="0"
                  left="1"
                  right="-65"
                  height="30"/>
                 <button
-                 name="emoji_picker_toggle_btn"
+                 name="emoji_picker_show_btn"
                  label="More"
                  tool_tip="Shows/hides emoji picker"
                  follows="right|bottom"
                  layout="topleft"
+                 tab_stop="false"
                  bottom="-5"
                  right="-3"
                  height="20"