diff --git a/src/styles/index.scss b/src/styles/index.scss
index 7aa8376e63ac1f5e71efd5a2314659b49e2e41f7..a1259b8ca851625d7e2708210338d3f33f8e598c 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -117,22 +117,22 @@
   }
 
   /* Background when an emoji is hover*/
-  .chatbox converse-emoji-picker {
-
-    .emoji-picker__header ul li.emoji-category:hover,
-    .emoji-picker li.insert-emoji a:hover {
-      background: var(--chat-head-color);
-    }
-  }
+  //.chatbox converse-emoji-picker {
+  //
+  //  .emoji-picker__header ul li.emoji-category:hover,
+  //  .emoji-picker li.insert-emoji a:hover {
+  //    background: var(--chat-head-color);
+  //  }
+  //}
 
   /* underline underneath emoji in the emoji picker removed */
-  .chatbox converse-emoji-picker {
-
-    .emoji-picker__header ul li.emoji-category a,
-    .emoji-picker li.insert-emoji a {
-      text-decoration: none;
-    }
-  }
+  //.chatbox converse-emoji-picker {
+  //
+  //  .emoji-picker__header ul li.emoji-category a,
+  //  .emoji-picker li.insert-emoji a {
+  //    text-decoration: none;
+  //  }
+  //}
 
   /* Outline when the emoji button is selected */
   .chatbox converse-chat-toolbar button:focus {
@@ -140,10 +140,10 @@
   }
 
   /* Modal when the connection is lost*/
-  #alert-modal>.modal-dialog>.modal-content {
+  #alert-modal > .modal-dialog > .modal-content {
     top: 47px;
 
-    >div.modal-body>p {
+    > div.modal-body > p {
       color: var(--color-chat-grey-1);
     }
   }
@@ -154,7 +154,7 @@
   }
 
   /* To hide the trash icon because you can't remove a message for now */
-  >.converse-chatboxes .chat-body .chat-msg__actions>button.chat-msg__action.fa-trash-alt {
+  > .converse-chatboxes .chat-body .chat-msg__actions > button.chat-msg__action.fa-trash-alt {
     display: none;
   }
 
@@ -571,7 +571,7 @@
   }
 
   .suggestion-box .suggestion-box__results,
-  .suggestion-box>ul {
+  .suggestion-box > ul {
     box-shadow: 0 0 5px 0 rgba(133, 140, 148, 0.09);
   }
 
@@ -598,7 +598,7 @@
   converse-chat-toolbar .far:hover svg,
   converse-chat-toolbar .fas svg,
   converse-chat-toolbar .fas:hover svg {
-    fill: var(--color-secondary)!important;
+    fill: var(--color-secondary) !important;
   }
 
   .chatroom .toggle-smiley .emoji-picker.toolbar-menu .emoji-picker__container .emoji-skintone-picker,
@@ -607,14 +607,20 @@
   }
 
   &.converse-fullscreen converse-emoji-dropdown .dropdown-menu {
-    min-width: 80vw;
+    min-width: unset;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    border-radius: 3px;
   }
 
-  @media (min-width: 600px) {
-    &.converse-fullscreen converse-emoji-dropdown .dropdown-menu {
-      min-width: 25vw;
-    }
-  }
+  //&.converse-fullscreen converse-emoji-dropdown .dropdown-menu {
+  //  min-width: 80vw;
+  //}
+  //
+  //@media (min-width: 600px) {
+  //  &.converse-fullscreen converse-emoji-dropdown .dropdown-menu {
+  //    min-width: 25vw;
+  //  }
+  //}
 
   &.converse-fullscreen .chatroom .sendXMPPMessage .chat-toolbar .fa,
   &.converse-fullscreen .chatroom .sendXMPPMessage .chat-toolbar .fa:hover,
@@ -821,7 +827,7 @@
     background: var(--hd-hightlight-color);
   }
 
-  .suggestion-box>ul>li[aria-selected=true] {
+  .suggestion-box > ul > li[aria-selected=true] {
     background: transparent;
     color: var(--chat-suggestion-selected-true) !important;
   }