diff --git a/bigbluebutton-html5/client/stylesheets/bbb-icons.css b/bigbluebutton-html5/client/stylesheets/bbb-icons.css
index d990c5ecf71d7eb8eda424bf1af063f2a52aa8c1..0cbb5e007996546a57cbb8b5343f0f41c1fb798f 100755
--- a/bigbluebutton-html5/client/stylesheets/bbb-icons.css
+++ b/bigbluebutton-html5/client/stylesheets/bbb-icons.css
@@ -53,10 +53,10 @@
 .icon-bbb-up-arrow:before {
     content: "\e907";
 }
-.icon-bbb-undecided:before {
+.icon-bbb-neutral:before {
     content: "\e908";
 }
-.icon-bbb-time:before {
+.icon-bbb-away:before {
     content: "\e909";
 }
 .icon-bbb-sad:before {
@@ -77,7 +77,7 @@
 .icon-bbb-happy:before {
     content: "\e90f";
 }
-.icon-bbb-hand:before {
+.icon-bbb-raiseHand:before {
     content: "\e910";
 }
 .icon-bbb-group-chat:before {
@@ -89,7 +89,7 @@
 .icon-bbb-close:before {
     content: "\e913";
 }
-.icon-bbb-clear-status:before {
+.icon-bbb-none:before {
     content: "\e914";
 }
 .icon-bbb-circle:before {
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
index c442be6f9f78e71105d051a435f2943201c368e2..9a3636e0292ae3a5fb5ba6380dcafc8bffe3367a 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx
@@ -33,7 +33,7 @@ class EmojiMenu extends Component {
           <Button
             role="button"
             label={intl.formatMessage(intlMessages.statusTriggerLabel)}
-            icon="hand"
+            icon="raiseHand"
             ghost={false}
             circle={true}
             hideLabel={false}
@@ -48,22 +48,22 @@ class EmojiMenu extends Component {
         <DropdownContent placement="top left">
           <DropdownList>
             <DropdownListItem
-              icon="time"
+              icon="away"
               label={intl.formatMessage(intlMessages.awayLabel)}
               description={intl.formatMessage(intlMessages.awayDesc)}
-              onClick={() => actions.setEmojiHandler('time')}
+              onClick={() => actions.setEmojiHandler('away')}
             />
             <DropdownListItem
-              icon="hand"
+              icon="raiseHand"
               label={intl.formatMessage(intlMessages.raiseLabel)}
               description={intl.formatMessage(intlMessages.raiseDesc)}
-              onClick={() => actions.setEmojiHandler('hand')}
+              onClick={() => actions.setEmojiHandler('raiseHand')}
             />
             <DropdownListItem
-              icon="undecided"
+              icon="neutral"
               label={intl.formatMessage(intlMessages.undecidedLabel)}
               description={intl.formatMessage(intlMessages.undecidedDesc)}
-              onClick={() => actions.setEmojiHandler('undecided')}
+              onClick={() => actions.setEmojiHandler('neutral')}
 
             />
             <DropdownListItem
@@ -86,10 +86,10 @@ class EmojiMenu extends Component {
             />
             <DropdownListSeparator/>
             <DropdownListItem
-              icon="clear-status"
+              icon="none"
               label={intl.formatMessage(intlMessages.clearLabel)}
               description={intl.formatMessage(intlMessages.clearDesc)}
-              onClick={() => actions.setEmojiHandler('clear-status')}
+              onClick={() => actions.setEmojiHandler('none')}
             />
           </DropdownList>
         </DropdownContent>
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/service.js b/bigbluebutton-html5/imports/ui/components/user-list/service.js
index 568b3f79d1e0123a49bc50900f5b4c281999353b..1854486602031e38ffce98c71ed0857b21d332d7 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/service.js
+++ b/bigbluebutton-html5/imports/ui/components/user-list/service.js
@@ -72,7 +72,7 @@ const sortUsersByEmoji = (a, b) => {
 
 const sortUsersByModerator = (a, b) => {
   if (a.isModerator && b.isModerator) {
-    return sortUsersByName(a, b);
+    return sortUsersByEmoji(a, b);
   } else if (a.isModerator) {
     return -1;
   } else if (b.isModerator) {
@@ -95,10 +95,10 @@ const sortUsersByPhoneUser = (a, b) => {
 };
 
 const sortUsers = (a, b) => {
-  let sort = sortUsersByEmoji(a, b);
+  let sort = sortUsersByModerator(a, b);
 
   if (sort === 0) {
-    sort = sortUsersByModerator(a, b);
+    sort = sortUsersByEmoji(a, b);
   }
 
   if (sort === 0) {
diff --git a/bigbluebutton-html5/imports/utils/statuses.js b/bigbluebutton-html5/imports/utils/statuses.js
index ea7e84bee162577c61182cabe2d3b8c241a45638..15d060cbf7c523decdc99bcc5f541f349e88c9c0 100755
--- a/bigbluebutton-html5/imports/utils/statuses.js
+++ b/bigbluebutton-html5/imports/utils/statuses.js
@@ -1,3 +1,3 @@
-const EMOJI_STATUSES = ['time', 'hand', 'undecided', 'confused', 'sad', 'happy', 'clear-status'];
+const EMOJI_STATUSES = ['away', 'raiseHand', 'neutral', 'confused', 'sad', 'happy'];
 
 export { EMOJI_STATUSES };