diff --git a/emoji/ubuntu.png b/emoji/ubuntu.png
index cbc36c64b..1e75c53a7 100644
Binary files a/emoji/ubuntu.png and b/emoji/ubuntu.png differ
diff --git a/webinterface.py b/webinterface.py
index fc7ac7f72..5ec1d45e9 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1743,9 +1743,10 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
 
     displayName=getDisplayName(postJsonObject['actor'],personCache)
     if displayName:
-        displayName= \
-            addHtmlTags(baseDir,httpPrefix, \
-                        nickname,domain,displayName,[],{})
+        if ':' in displayName:
+            displayName= \
+                addHtmlTags(baseDir,httpPrefix, \
+                            nickname,domain,displayName,[],{})
         titleStr+='<a href="'+messageId+'">'+displayName+'</a>'
     else:
         titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>'
@@ -1868,9 +1869,10 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
         if avatarUrl2:
             avatarUrl=avatarUrl2
         if displayName:
-            displayName= \
-                addHtmlTags(baseDir,httpPrefix, \
-                            nickname,domain,displayName,[],{})
+            if ':' in displayName:
+                displayName= \
+                    addHtmlTags(baseDir,httpPrefix, \
+                                nickname,domain,displayName,[],{})
             titleStr=displayName+' '+titleStr
 
     avatarImageInPost= \