diff --git a/src/core/render/emojify.js b/src/core/render/emojify.js
index 81748414c..376c55a60 100644
--- a/src/core/render/emojify.js
+++ b/src/core/render/emojify.js
@@ -12,11 +12,9 @@ function replace(m, $1) {
 
 export function emojify(text) {
   return text
-    .replace(/:\+1:/g, ':thumbsup:')
-    .replace(/:-1:/g, ':thumbsdown:')
     .replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g, m =>
       m.replace(/:/g, '__colon__')
     )
-    .replace(/:(\w+?):/gi, (inBrowser && window.emojify) || replace)
+    .replace(/:([a-z0-9_\-\+]+?):/g, (inBrowser && window.emojify) || replace)
     .replace(/__colon__/g, ':');
 }