diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 98dacb581c8..3da22d38c16 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -93,11 +93,6 @@ class PluginApi {
         if (result.icon) {
           iconBody = iconNode(result.icon);
         } else if (result.emoji) {
-          iconBody = result.emoji.split('|').map(emoji => {
-            const src = emojiUrlFor(emoji);
-            return dec.h('img', { className: 'emoji', attributes: { src } });
-          });
-
           iconBody = result.emoji.split('|').map(name => dec.attach('emoji', { name }));
         }
 
diff --git a/app/assets/javascripts/discourse/widgets/emoji.js.es6 b/app/assets/javascripts/discourse/widgets/emoji.js.es6
index 5550af6a2e6..8060db39358 100644
--- a/app/assets/javascripts/discourse/widgets/emoji.js.es6
+++ b/app/assets/javascripts/discourse/widgets/emoji.js.es6
@@ -11,6 +11,6 @@ export default createWidget('emoji', {
   tagName: 'img.emoji',
 
   buildAttributes(attrs) {
-    return { src: emojiUrlFor(attrs.name) };
+    return { src: emojiUrlFor(attrs.name), title: attrs.name, alt: `:${attrs.name}:` };
   },
 });