diff --git a/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx b/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx
index 3cb60b924..b24e1793f 100644
--- a/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx
+++ b/internal_packages/composer-emojis/lib/emojis-composer-extension.jsx
@@ -171,15 +171,15 @@ class EmojisComposerExtension extends ContenteditableExtension {
       }
     }
     const WIDTH_PER_CHAR = 8;
-    return (maxLength + 10) * WIDTH_PER_CHAR;
+    return (maxLength + 6) * WIDTH_PER_CHAR;
   }
 
   static _emojiPickerHeight(emojiOptions) {
-    const HEIGHT_PER_EMOJI = 28;
+    const HEIGHT_PER_EMOJI = 25;
     if (emojiOptions.length < 5) {
       return emojiOptions.length * HEIGHT_PER_EMOJI + 20;
     }
-    return 5 * HEIGHT_PER_EMOJI + 20;
+    return 5 * HEIGHT_PER_EMOJI + 23;
   }
 
   static _getTextUntilSpace(node, offset) {
diff --git a/internal_packages/composer-emojis/stylesheets/composer-emojis.less b/internal_packages/composer-emojis/stylesheets/composer-emojis.less
index 98816e2c2..146a103ec 100644
--- a/internal_packages/composer-emojis/stylesheets/composer-emojis.less
+++ b/internal_packages/composer-emojis/stylesheets/composer-emojis.less
@@ -1,17 +1,19 @@
 @import "ui-variables";
+
 .emoji-picker {
-  max-height: 155px !important;
-  padding: 10px 10px 10px 10px !important;
+  max-height: 130px !important;
+  margin: 10px;
   overflow: auto;
-  .btn.btn-icon.emoji-option {
-    background-color: @btn-emphasis-bg-color;
-    color: #FFFFFF;
-    border-radius: 15px;
-  }
-  .btn.btn-icon:hover {
-    background-color: @btn-emphasis-bg-color;
-    color: #FFFFFF;
-    border-radius: 15px;
+  .btn.btn-icon {
+    font-size: 14px !important;
+    padding: 0em 0.5em;
+    &:first-child {
+      padding-left: 0.5em !important;
+    }
+    &.emoji-option, &:hover {
+      background-color: @btn-emphasis-bg-color;
+      color: #FFFFFF;
+      border-radius: 5px;
+    }
   }
 }
-