diff --git a/package.json b/package.json
index 1c19528e09..5de37f8012 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
 		"multer": "1.3.0",
 		"nprogress": "0.2.0",
 		"page": "1.7.1",
+		"pictograph": "2.0.0",
 		"prominence": "0.2.0",
 		"pug": "2.0.0-rc.1",
 		"ratelimiter": "3.0.3",
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js
index 1743a549aa..0a9b8022df 100644
--- a/src/web/app/common/scripts/text-compiler.js
+++ b/src/web/app/common/scripts/text-compiler.js
@@ -1,5 +1,5 @@
 import * as riot from 'riot';
-//const emojinize = require('emojinize');
+const pictograph = require('pictograph');
 import CONFIG from './config';
 
 const escape = text =>
@@ -34,8 +34,7 @@ export default (tokens, shouldBreak) => {
 			case 'inline-code':
 				return `<code>${token.html}</code>`;
 			case 'emoji':
-				return `<i>${token.content}</i>`;
-				//return emojinize.encode(token.content)
+				return pictograph.dic[token.emoji] || token.content;
 		}
 	}).join('');