diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
index 2008ae0c5e5247aa1a2753aef2740035537ffdde..105ca58d08d920e71c36225b2989b7c244be0fce 100755
--- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css
+++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css
@@ -896,13 +896,15 @@ PollChoicesModal {
 EmojiGrid {
 	backgroundColor: #ffffff;
 	horizontalAlign: center;
+	paddingRight: 10;
+	paddingTop: 10;
 }
 
 .emojiGridTile {
 	paddingBottom: 10;
 	paddingLeft: 10;
-	paddingRight: 10;
-	paddingTop: 10;
+	paddingRight: 4;
+	paddingTop: 4;
 	verticalGap: 6;
 	horizontalGap: 6;
 }
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 8228d733fc2230134832711a5abddb44ae6ec013..08c4f4d771f9e71b0b7127fc1db61aab3bcca923 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
@@ -45,7 +45,7 @@ package org.bigbluebutton.modules.users.views {
 			this.horizontalScrollPolicy = ScrollPolicy.OFF;
 			this.verticalScrollPolicy = ScrollPolicy.OFF;
 			width = 140;
-			maxHeight = 80;
+			minHeight = 80;
 			drawEmoji();
 			if (UserManager.getInstance().getConference().myEmojiStatus != "none") {
 				addRemoveEmoji();
@@ -77,9 +77,11 @@ package org.bigbluebutton.modules.users.views {
 		private function addRemoveEmoji():void {
 			var button:Button = new Button();
 			button.id = "btnnone";
+			button.height = 64;
+			button.height = 24;
 			button.label = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.remove');
-			addEventListener(MouseEvent.CLICK, buttonMouseEventHandler);
-			addChild(button);
+			button.addEventListener(MouseEvent.CLICK, buttonMouseEventHandler);
+			this.addChild(button);
 		}
 		
 		protected function buttonMouseEventHandler(event:MouseEvent):void {