diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
index 105ca58d08d920e71c36225b2989b7c244be0fce..b847dd64e5f74aca972e4d8351047d054ea45226 100755
--- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css
+++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
@@ -896,8 +896,7 @@ PollChoicesModal {
 EmojiGrid {
 	backgroundColor: #ffffff;
 	horizontalAlign: center;
-	paddingRight: 10;
-	paddingTop: 10;
+	paddingBottom: 10;
 }
 
 .emojiGridTile {
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 982d51bf2388db82a13097b07a0824962de52faa..e642345308332c2590ff29b18e2a07d5429a2f94 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -130,8 +130,8 @@ bbb.users.settings.webcamSettings = Webcam Settings
 bbb.users.settings.muteAll = Mute All Users
 bbb.users.settings.muteAllExcept = Mute All Users Except Presenter
 bbb.users.settings.unmuteAll = Unmute All Users
-bbb.users.settings.resetAllStatuses = Resets All Statuses
-bbb.users.emojiStatusBtn.toolTip = Update my emoji status
+bbb.users.settings.clearAllStatus = Clear all status icons
+bbb.users.emojiStatusBtn.toolTip = Update my status icon
 bbb.users.roomMuted.text = Viewers Muted
 bbb.users.roomLocked.text = Viewers Locked
 bbb.users.pushToTalk.toolTip = Talk
@@ -153,6 +153,7 @@ bbb.users.usersGrid.statusItemRenderer.happy = Happy
 bbb.users.usersGrid.statusItemRenderer.smile = Smiling
 bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
 bbb.users.usersGrid.statusItemRenderer.confused = Confused
+bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
 bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
 bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
 bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.
@@ -169,7 +170,7 @@ bbb.users.usersGrid.mediaItemRenderer.webcam = Webcam shared
 bbb.users.usersGrid.mediaItemRenderer.micOff = Microphone off
 bbb.users.usersGrid.mediaItemRenderer.micOn = Microphone on
 bbb.users.usersGrid.mediaItemRenderer.noAudio = Not in audio conference
-bbb.users.emojiStatus.remove = Remove
+bbb.users.emojiStatus.clear = Clear
 bbb.users.emojiStatus.raiseHand = Raise hand
 bbb.users.emojiStatus.happy = Happy
 bbb.users.emojiStatus.smile = Smile
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
index bee39df850a92beb79b00bd2a083aacd8e0c0c3e..f0920723695aa6143f95be6adca748d7cfd456f2 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
@@ -79,7 +79,7 @@ package org.bigbluebutton.modules.users.views {
 			button.id = "btnnone";
 			button.height = 64;
 			button.height = 24;
-			button.label = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.remove');
+			button.label = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.clear');
 			button.addEventListener(MouseEvent.CLICK, buttonMouseEventHandler);
 			this.addChild(button);
 		}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
index 39ee15188f20fe9ba4e6db489c110a90af54d44d..1c2e97a68e9fb95ba465de691e3f7727e3165f2f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
@@ -126,7 +126,7 @@
 			private function updateEmojiComponents() : void {
 				if (rolledOver && data.hasEmojiStatus) {
 					emojiBtn.setStyle("icon", images["emoji_" + data.emojiStatus]);
-					emojiBtn.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.lowerHand') + " - " + data.emojiStatusTime.hours + ":" + data.emojiStatusTime.minutes + ":" + data.emojiStatusTime.seconds;
+					emojiBtn.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.clearStatus') + " - " + data.emojiStatusTime.hours + ":" + data.emojiStatusTime.minutes + ":" + data.emojiStatusTime.seconds;
 					emojiImg.visible = false;
 					emojiBtn.visible = true;
 					emojiBtn.enabled = true;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
index b573ab0cb183561f711d0d63c518f0721b28e749..e828765d0a67c76d226556c4ec8d1b981ff07175 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
@@ -232,7 +232,7 @@
 			
 			private function openSettings():void {
 				paramsMenuData = [];
-				paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.resetAllStatuses'), icon: images.cancel, handler:resetEmojiStatuses});
+				paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.clearAllStatus'), handler:resetEmojiStatuses});
 				
 				if (!roomMuted) {
 					paramsMenuData.push({label: ResourceUtil.getInstance().getString('bbb.users.settings.muteAll'), icon: images.audio_muted, handler: muteAll});