diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index eade4c462..ac39fb4b0 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -47,9 +47,14 @@ const messages = defineMessages({
   reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
   cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
+<<<<<<< HEAD
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   cannot_quote: { id: 'status.cannot_quote', defaultMessage: 'This post cannot be quoted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
+=======
+  favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
+  emojiReaction: { id: 'status.emoji_reaction', defaultMessage: 'Emoji Reaction' },
+>>>>>>> 5267c8e4ca (Fix browser error (IconButton title))
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
   removeBookmark: { id: 'status.remove_bookmark', defaultMessage: 'Remove bookmark' },
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
@@ -412,6 +417,10 @@ class StatusActionBar extends ImmutablePureComponent {
     );
 
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
+    
+    const emojiPickerButton = (
+      <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.emojiReaction)} icon='smile-o' />
+    );
 
     return (
       <div className='status__action-bar'>