diff --git a/css/inverse.css b/css/inverse.css
index 8cdcc7bab..41e576e31 100644
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -1263,7 +1263,7 @@
     transform: rotate(359deg); } }
   #converse-embedded-chat .emojione,
   #conversejs .emojione {
-    height: 24px; }
+    height: 22px; }
   #converse-embedded-chat .spinner,
   #conversejs .spinner {
     -webkit-animation: spin 2s infinite, linear;
@@ -1819,7 +1819,7 @@ body {
             #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker li, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-skintone-picker li,
             #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker li,
             #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-skintone-picker li {
-              height: 34px;
+              height: 32px;
               padding: 5px;
               z-index: 98; }
               #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker li.emoji a, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-skintone-picker li.emoji a,
@@ -1921,8 +1921,13 @@ body {
     border-top-right-radius: 7px; }
     #conversejs .chatbox .chat-body .chat-message {
       font-size: 14px;
-      line-height: 20px;
       margin: 0.5em 0; }
+      #conversejs .chatbox .chat-body .chat-message .chat-msg-author {
+        line-height: 22px; }
+      #conversejs .chatbox .chat-body .chat-message .chat-msg-content {
+        line-height: 22px; }
+        #conversejs .chatbox .chat-body .chat-message .chat-msg-content .emojione {
+          margin-bottom: -6px; }
   #conversejs .chatbox .chat-content {
     padding: 0 1em 1em 1em;
     border-top-left-radius: 7px;
diff --git a/sass/inverse/_chatbox.scss b/sass/inverse/_chatbox.scss
index 4bbe25a88..18577d2e3 100644
--- a/sass/inverse/_chatbox.scss
+++ b/sass/inverse/_chatbox.scss
@@ -44,8 +44,16 @@
 
             .chat-message {
                 font-size: $font-size-small;
-                line-height: $line-height-small;
                 margin: 0.5em 0;
+                .chat-msg-author {
+                    line-height: $line-height;
+                }
+                .chat-msg-content {
+                    line-height: $line-height;
+                    .emojione {
+                        margin-bottom: -6px;
+                    }
+                }
             }
         }
         .chat-content {
diff --git a/sass/inverse/_variables.scss b/sass/inverse/_variables.scss
index f12867aa4..621e3122e 100644
--- a/sass/inverse/_variables.scss
+++ b/sass/inverse/_variables.scss
@@ -52,7 +52,8 @@ $send-button-margin: 3px !default;
 
 $message-them-color: $red !default;
 
-$emoji_height : 24px !default;
+$emoji_height: 22px !default;
+$emoji-picker-height: 150px !default;
 
 $roster-height: 194px !default;
 $roster-item-height: 30px !default;
@@ -103,8 +104,6 @@ $legend-font-size: 18px !default;
 $toolbar-height: 29px !default;
 $toolbar-color: $greenish-white !default;
 
-$emoji-picker-height: 150px !default;
-
 $line-height-small:  20px !default;
 $line-height:  22px !default;