diff --git a/css/converse.css b/css/converse.css
index d9d3fb790..d26219239 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -1697,6 +1697,9 @@
         color: #818479;
         text-decoration: none;
         text-shadow: none; }
+      #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar .emoji-picker,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .emoji-picker {
+        margin-bottom: 30px; }
       #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar .toolbar-picker-panel a,
       #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toolbar-picker-panel a {
         color: #578EA9; }
diff --git a/css/inverse.css b/css/inverse.css
index 809411203..a6d848c9c 100644
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -1743,6 +1743,9 @@ body {
         color: #818479;
         text-decoration: none;
         text-shadow: none; }
+      #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar .emoji-picker,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .emoji-picker {
+        margin-bottom: 34px; }
       #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar .toolbar-picker-panel a,
       #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toolbar-picker-panel a {
         color: #578EA9; }
diff --git a/sass/_chatbox.scss b/sass/_chatbox.scss
index bee6006a2..858c57bd4 100644
--- a/sass/_chatbox.scss
+++ b/sass/_chatbox.scss
@@ -272,6 +272,9 @@
                     text-decoration: none;
                     text-shadow: none;
                 }
+                .emoji-picker {
+                    margin-bottom: $toolbar-height + 5px;
+                }
                 .toolbar-picker-panel {
                     a {
                         color: $link-color;
diff --git a/src/utils.js b/src/utils.js
index c1228bac1..2c02e0d7d 100755
--- a/src/utils.js
+++ b/src/utils.js
@@ -522,7 +522,9 @@
             _.forEach(categories, function (cat) {
                 var list = _.sortBy(_.filter(emojis, ['category', cat]), ['uc_base']);
                 list = _.filter(list, function (item) {
-                    return !_.includes(tones, item._shortname);
+                    return !_.includes(tones, item._shortname) &&
+                        !item._shortname.startsWith(':woman_') &&
+                            !item._shortname.startsWith(':man_');
                 });
                 if (cat === 'people') {
                     var idx = _.findIndex(list, ['uc_base', '1f600']);