diff --git a/emoji/default_emoji.json b/emoji/default_emoji.json
index 85a1c07d4..3db25deea 100644
--- a/emoji/default_emoji.json
+++ b/emoji/default_emoji.json
@@ -773,5 +773,7 @@
     "kde": "kde",
     "ohno": "ohno",
     "lavabit": "lavabit",
-    "libreoffice": "libreoffice"
+    "libreoffice": "libreoffice",
+    "xmpp": "xmpp",
+    "jabber": "xmpp",
 }
diff --git a/emoji/xmpp.png b/emoji/xmpp.png
new file mode 100644
index 000000000..a1d7364dc
Binary files /dev/null and b/emoji/xmpp.png differ