diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index d5b581b3..cbd0e5f6 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -65,34 +65,29 @@
 
   .additional-tabs,
   .emoji-tabs {
-    display: block;
-    min-width: 0;
-    flex-basis: auto;
-    flex-shrink: 1;
-
-    white-space: nowrap;
-    align-items: center;
-    justify-content: center;
-
+    display: flex;
+    flex-wrap: nowrap;
+    width: 100%;
     overflow-x: scroll;
-    overflow-y: hidden;
-    // -ms-overflow-style: none;
-    // scrollbar-width: none;
-    // &::-webkit-scrollbar {
-    //   display: none;
-    // }
 
     &-item {
-      padding: 0 7px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+      width: 32px;
+      height: 32px;
+      padding: .4em;
       cursor: pointer;
-      font-size: 1.85em;
 
       img {
-        width: 32px;
-        height: 32px;
-        object-fit: contain;
         max-width: 100%;
         max-height: 100%;
+        object-fit: contain;
+      }
+
+      span {
+        font-size: 1.9em;
       }
 
       &.disabled {