diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index a1970ef47..81fd61d50 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -3682,13 +3682,15 @@ footer {
 
 .tokenfield .token {
   padding: 0 0 0 10px;
-  margin: -1px 5px 8px 0;
+  margin: 0 5px 8px 0;
   height: 26px;
   line-height: 27px;
   color: white;
   background: hsl(198,19%,72%);
   border: none;
   float: none;
+  display: inline-flex;
+  align-items: center;
 }
 
   .tokenfield .token-input {
@@ -3707,7 +3709,7 @@ footer {
 
   .tokenfield .token .close {
     margin: 0;
-    padding: 0 10px 0 5px;
+    padding: 0 9px 0 5px;
     font-family: inherit;
     font-weight: 300;
     font-size: 30px;
@@ -3716,6 +3718,7 @@ footer {
     text-shadow: none;
     opacity: .3;
     outline: none;
+    height: auto;
   }
 
   .tokenfield .token .close:hover {
diff --git a/extras/icon_authors/list.json b/extras/icon_authors/list.json
index b8132a922..61f68a4fc 100644
--- a/extras/icon_authors/list.json
+++ b/extras/icon_authors/list.json
@@ -7,14 +7,13 @@
     "checkbox.svg": "Felix Niklas",
     "checkmark.svg": "Felix Niklas",
     "clock.svg": "",
-    "close.svg": "Felix Niklas",
     "cloud.svg": "Felix Niklas",
     "cog.svg": "",
     "dashboard.svg": "",
     "diagonal-cross.svg": "Felix Niklas",
     "download.svg": "Felix Niklas",
     "email.svg": "",
-    "facebook.svg": "Global Domain",
+    "facebook.svg": "Facebook",
     "group.svg": "",
     "help.svg": "Felix Niklas",
     "important.svg": "",
@@ -28,11 +27,11 @@
     "magnifier.svg": "Felix Niklas",
     "marker.svg": "Felix Niklas",
     "message.svg": "Felix Niklas",
-    "mood-bad.svg": "",
-    "mood-good.svg": "",
-    "mood-ok.svg": "",
-    "mood-super-bad.svg": "",
-    "mood-supergood.svg": "",
+    "mood-bad.svg": "Zammad",
+    "mood-good.svg": "Zammad",
+    "mood-ok.svg": "Zammad",
+    "mood-super-bad.svg": "Zammad",
+    "mood-supergood.svg": "Zammad",
     "note.svg": "",
     "one-ticket.svg": "",
     "organization.svg": "",