diff --git a/content.py b/content.py
index 0a513a96..a3fa40e2 100644
--- a/content.py
+++ b/content.py
@@ -89,12 +89,14 @@ def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji:
         return False
     emojiUrl=httpPrefix+"://"+domain+"/emoji/"+emojiDict[emoji]+'.png'
     postTags[emoji]= {
-        'id': emojiUrl,
+        'icon': {
+            'mediaType': 'image/png',
+            'type': 'Image',
+            'url': emojiUrl
+        },
         'name': ':'+emoji+':',
         'type': 'Emoji'
     }
-    #replaceEmoji[wordStr]= \
-    #    "<img src=\""+emojiUrl+"\" alt=\""+emoji+"\" align=\"middle\" class=\"emoji\"/>"
     return True
 
 def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},recipients: [],tags: {}) -> bool:
diff --git a/webinterface.py b/webinterface.py
index e8f4605d..2178b020 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -944,17 +944,19 @@ def htmlRemplaceEmojiFromTags(content: str,tag: {}) -> str:
     """Uses the tags to replace :emoji: with html image markup
     """
     for tagItem in tag:
-        if not tagItem.get('id'):
-            continue
         if not tagItem.get('type'):
             continue
-        if not tagItem.get('name'):
-            continue
         if tagItem['type']!='Emoji':
             continue
+        if not tagItem.get('name'):
+            continue
+        if not tagItem.get('icon'):
+            continue
+        if not tagItem['icon'].get('url'):
+            continue
         if tagItem['name'] not in content:
             continue
-        emojiHtml="<img src=\""+tagItem['id']+"\" alt=\""+tagItem['name'].replace(':','')+"\" align=\"middle\" class=\"emoji\"/>"
+        emojiHtml="<img src=\""+tagItem['icon']['url']+"\" alt=\""+tagItem['name'].replace(':','')+"\" align=\"middle\" class=\"emoji\"/>"
         content=content.replace(tagItem['name'],emojiHtml)
     return content