diff --git a/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml b/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml
index d0a6087a2f..e056fff42b 100644
--- a/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_fs_im_session.xml
@@ -449,7 +449,7 @@
        top="0"
        left_delta="5"
        name="FSSupportGroupChatPrefix_toggle"
-       tool_tip="Adds your current viewer version and skin information to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions"
+       tool_tip="Adds current viewer version, viewer skin, operating system and RLVa status to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions"
        width="110" />
   </layout_panel>
     <layout_panel
@@ -470,7 +470,7 @@
        top="0"
        left_delta="5"
        name="FSSupportGroupChatPrefixTesting_toggle"
-       tool_tip="Adds your current viewer build and skin information to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions. (This is seperate from the support groups)"
+       tool_tip="Adds current viewer version, viewer skin, operating system and RLVa status to the front of messages sent by you to this group which will assist support staff in correctly diagnosing your issues and improve accuracy in answering your questions. (This is seperate from the support groups)"
        width="110" />
   </layout_panel>
   <!-- END: FS Prefix -->
@@ -603,6 +603,44 @@
               right="-2"
               wrap="true" />
             </layout_panel>
+            <layout_panel
+              visibility_control="FSShowEmojiButton"
+              auto_resize="false"
+              user_resize="false"
+              name="emoji_button_layout_panel"
+              width="35"
+              top="0"
+              bottom="-1">
+              <button
+               follows="right|bottom"
+               bottom="23"
+               height="22"
+               use_font_color="true"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Emoji_Picker_Icon"
+               right="-11"
+               name="emoji_picker_toggle_btn"
+               tool_tip="Show emoji panel"
+               width="24"/>
+              <button
+               follows="right|bottom"
+               bottom="23"
+               height="22"
+               use_font_color="true"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Arrow_Down"
+               right="-1"
+               name="emoji_recent_panel_toggle_btn"
+               tool_tip="Shows/hides recent emojis"
+               left_pad="0"
+               width="10"/>
+            </layout_panel>
             <layout_panel
               visibility_control="FSShowIMSendButton"
               auto_resize="false"
@@ -624,6 +662,31 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel
+         name="emoji_recent_layout_panel"
+         height="28"
+         auto_resize="false">
+            <text
+             name="emoji_recent_empty_text"
+             follows="top|left|right"
+             layout="topleft"
+             h_pad="20"
+             v_pad="5"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"
+            >Recently used emojis will appear here</text>
+            <emoji_complete
+             name="emoji_recent_icons_ctrl"
+             follows="top|left|right"
+             layout="topleft"
+             max_visible="20"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"/>
+        </layout_panel>
       </layout_stack>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml
index 42e10cf146..d756c87547 100644
--- a/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_fs_nearby_chat.xml
@@ -252,6 +252,41 @@
                right="-4"
                wrap="true" />
             </layout_panel>
+            <layout_panel
+              visibility_control="FSShowEmojiButton"
+              auto_resize="false"
+              user_resize="false"
+              name="emoji_button_layout_panel"
+              width="35">
+              <button
+               follows="right|bottom"
+               bottom="-1"
+               height="22"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Emoji_Picker_Icon"
+               right="-11"
+               name="emoji_picker_toggle_btn"
+               tool_tip="Show emoji panel"
+               width="24"/>
+              <button
+               follows="right|bottom"
+               bottom="-1"
+               height="22"
+               use_font_color="true"
+               font="EmojiLarge"
+               image_hover_unselected="Toolbar_Middle_Over"
+               image_selected="Toolbar_Middle_Selected"
+               image_unselected="Toolbar_Middle_Off"
+               image_overlay="Arrow_Down"
+               right="-1"
+               name="emoji_recent_panel_toggle_btn"
+               tool_tip="Shows/hides recent emojis"
+               left_pad="0"
+               width="10"/>
+            </layout_panel>
             <layout_panel
               visibility_control="FSShowChatChannel"
               auto_resize="false"
@@ -346,6 +381,31 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel
+         name="emoji_recent_layout_panel"
+         height="28"
+         auto_resize="false">
+            <text
+             name="emoji_recent_empty_text"
+             follows="top|left|right"
+             layout="topleft"
+             h_pad="20"
+             v_pad="5"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"
+             >Recently used emojis will appear here</text>
+            <emoji_complete
+             name="emoji_recent_icons_ctrl"
+             follows="top|left|right"
+             layout="topleft"
+             max_visible="20"
+             top="0"
+             left="5"
+             right="-1"
+             height="25"/>
+        </layout_panel>
       </layout_stack>
     </layout_panel>
   </layout_stack>