diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 2094ab624..106c57ab2 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -108,17 +108,19 @@ h6 {
     padding-top: .65001rem;
 }
 
-a:not(.btn) {
-    cursor: pointer;
-    color: @cp-link;
+p {
+    a:not(.btn) {
+        cursor: pointer;
+        color: @cp-link;
 
-    text-decoration: none;
+        text-decoration: none;
 
-    &:hover {
-        color: @cp-link-hover;
-    }
-    &:visited {
-        color: @cp-link-visited;
+        &:hover {
+            color: @cp-link-hover;
+        }
+        &:visited {
+            color: @cp-link-visited;
+        }
     }
 }
 a.btn {
diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less
index 298c93669..9f76cec05 100644
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -138,7 +138,15 @@ body .userlist-drawer {
                 color: black;
                 font-size: 40px;
             }
+            .name {
+                flex: 1;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
             media-tag {
+                min-height: 50px;
+                min-width: 50px;
                 max-height: 50px;
                 max-width: 50px;
                 img {
diff --git a/customize.dist/src/less/topbar.less b/customize.dist/src/less/topbar.less
index a394c4eeb..3e8812ddd 100644
--- a/customize.dist/src/less/topbar.less
+++ b/customize.dist/src/less/topbar.less
@@ -72,7 +72,7 @@
                 }
             }
         }
-        a {
+        &.link a {
             font-weight: 500;
             font-size: 0.75em;
             color: @cp-link;
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f511b5c5e..4eab01ea3 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1194,6 +1194,27 @@ define([
         return button;
     };
 
+
+    var emoji_patt = /([\uD800-\uDBFF][\uDC00-\uDFFF])/;
+    var isEmoji = function (str) {
+      return emoji_patt.test(str);
+    };
+    var emojiStringToArray = function (str) {
+      var split = str.split(emoji_patt);
+      var arr = [];
+      for (var i=0; i<split.length; i++) {
+        var char = split[i];
+        if (char !== "") {
+          arr.push(char);
+        }
+      }
+      return arr;
+    };
+    var getFirstEmojiOrCharacter = function (str) {
+      if (!str || !str.trim()) { return '?'; }
+      var emojis = emojiStringToArray(str);
+      return isEmoji(emojis[0])? emojis[0]: str[0];
+    };
     $(window.document).on('decryption', function (e) {
         var decrypted = e.originalEvent;
         if (decrypted.callback) {
@@ -1242,7 +1263,7 @@ define([
     common.displayAvatar = function ($container, href, name, cb) {
         var MutationObserver = window.MutationObserver;
         var displayDefault = function () {
-            var text = name.trim().length ? name.trim().slice(0,1) : '?';
+            var text = getFirstEmojiOrCharacter(name);
             var $avatar = $('<span>', {'class': 'default'}).text(text);
             $container.append($avatar);
             if (cb) { cb(); }
diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index 246a98688..78f4bf946 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -206,6 +206,7 @@ define([
         // Editors
         editUsersNames.forEach(function (data) {
             var name = data.name || Messages.anonymous;
+            var $name = $('<span>', {'class': 'name'}).text(name);
             var $span = $('<span>', {'title': name});
             if (data.profile) {
                 $span.addClass('clickable');
@@ -215,13 +216,13 @@ define([
             }
             if (data.avatar && avatars[data.avatar]) {
                 $span.append(avatars[data.avatar]);
-                $span.append(name);
+                $span.append($name);
             } else {
                 Cryptpad.displayAvatar($span, data.avatar, name, function ($img) {
                     if (data.avatar && $img) {
                         avatars[data.avatar] = $img[0].outerHTML;
                     }
-                    $span.append(name);
+                    $span.append($name);
                 });
             }
             $span.data('uid', data.uid);
diff --git a/www/drive/main.js b/www/drive/main.js
index b67d11c74..d31c701a6 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1170,7 +1170,7 @@ define([
             var element = filesOp.find(newPath);
             var $icon = !isFolder ? getFileIcon(element) : undefined;
             var ro = filesOp.isReadOnlyFile(element);
-            // ro undefined mens it's an old hash which doesn't support read-only
+            // ro undefined means it's an old hash which doesn't support read-only
             var roClass = typeof(ro) === 'undefined' ? ' noreadonly' : ro ? ' readonly' : '';
             var liClass = 'file-item file-element element' + roClass;
             if (isFolder) {
@@ -2140,6 +2140,7 @@ define([
             $trashContextMenu.hide();
             $contentContextMenu.hide();
             $defaultContextMenu.hide();
+            $iframe.find('.cryptpad-dropdown').hide();
         };
 
         var stringifyPath = function (path) {