diff --git a/bower.json b/bower.json
index df38ce9f63c..3daa879c967 100644
--- a/bower.json
+++ b/bower.json
@@ -36,12 +36,11 @@
     "jquery-colorbox": "1.4.36",
     "jquery-ui": "1.10.3",
     "jquery.cookie": "1.4.0",
-    "js-emoji": "snicker/js-emoji#f25d8a303f",
     "ngInfiniteScroll": "1.0.0",
     "pnotify": "1.3.1",
     "sticky": "*",
     "swagger-ui": "wordnik/swagger-ui#v2.0.24",
-    "habitica-markdown": "^1.0.0"
+    "habitica-markdown": "habitrpg/habitica-markdown#emoji"
   },
   "devDependencies": {
     "angular-mocks": "1.3.9"
diff --git a/common/script/public/directives.js b/common/script/public/directives.js
index 874b194fc1e..cd43ccb67c3 100644
--- a/common/script/public/directives.js
+++ b/common/script/public/directives.js
@@ -7,15 +7,11 @@
   var md = function () {
     var mdown = window.habiticaMarkdown;
 
-    emoji.img_path = 'common/img/emoji/unicode/';
-
     var toHtml = function (markdown) {
       if (markdown == undefined)
         return '';
 
       markdown = mdown.render(markdown);
-      markdown = emoji.replace_colons(markdown);
-      markdown = emoji.replace_unified(markdown);
 
       return markdown;
     };
diff --git a/karma.conf.js b/karma.conf.js
index bab5e0c186d..2ae3a52a9d4 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -32,7 +32,6 @@ module.exports = function karmaConfig (config) {
       'website/public/bower_components/select2/select2.js',
       'website/public/bower_components/angular-ui-select2/src/select2.js',
       'website/public/bower_components/habitica-markdown/dist/habitica-markdown.min.js',
-      'website/public/bower_components/js-emoji/emoji.js',
       'common/dist/scripts/habitrpg-shared.js',
 
       'test/spec/mocks/**/*.js',
diff --git a/test/spec/services/notificationServicesSpec.js b/test/spec/services/notificationServicesSpec.js
index f64cf74b817..101d790e47c 100644
--- a/test/spec/services/notificationServicesSpec.js
+++ b/test/spec/services/notificationServicesSpec.js
@@ -154,7 +154,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('info');
-    expect(arg.text).to.eql('<p><span class="emoji" style="background-image:url(common/img/emoji/unicode/1f604.png)">:smile:</span> - task name</p>\n');
+    expect(arg.text).to.eql('<p><img class="habitica-emoji" style="height: 1.5em; width: 1.5em" src="https://s3.amazonaws.com/habitica-assets/cdn/emoji/smile.png" alt="smile"> - task name</p>\n');
     expect(arg.icon).to.eql(false);
   });
 
diff --git a/website/public/css/index.styl b/website/public/css/index.styl
index d3818db4538..2ea7aae839c 100644
--- a/website/public/css/index.styl
+++ b/website/public/css/index.styl
@@ -5,7 +5,6 @@
 // Import only styles that do not have urls to images! Include them directly in the page!
 @import "../bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css"
 @import "../bower_components/angular-loading-bar/build/loading-bar.css"
-@import "../bower_components/js-emoji/emoji.css"
 @import "../bower_components/select2/select2.css"
 
 // Custom includes
@@ -201,5 +200,5 @@ a.label
 *
   image-rendering: pixelated
 
-.img-rendering-auto, .img-rendering-auto *, .emoji
+.img-rendering-auto, .img-rendering-auto *, .habitica-emoji
   image-rendering: auto
diff --git a/website/public/css/tasks.styl b/website/public/css/tasks.styl
index 0047119b733..905c472f3d4 100644
--- a/website/public/css/tasks.styl
+++ b/website/public/css/tasks.styl
@@ -234,12 +234,6 @@ for $stage in $stages
   markdown > ul > li // Otherwise, + gets turned into a bullet and gets masked by buttons
     margin-left:20px
 
-  span.emoji
-    width:1.5em
-    height:1.5em
-    background-size:1.5em
-    vertical-align: middle
-
 // when a task is being dragged
 .task.ui-sortable-helper
   box-shadow: 0 0 3px rgba(0,0,0,0.15), 0 0 5px rgba(0,0,0,0.1)
diff --git a/website/public/manifest.json b/website/public/manifest.json
index 68dccb39442..ad64741a2e8 100644
--- a/website/public/manifest.json
+++ b/website/public/manifest.json
@@ -15,7 +15,6 @@
             "bower_components/angular-loading-bar/build/loading-bar.js",
             "bower_components/Angular-At-Directive/src/at.js",
             "bower_components/Angular-At-Directive/src/caret.js",
-            "bower_components/js-emoji/emoji.js",
             "bower_components/sticky/jquery.sticky.js",
             "bower_components/ngInfiniteScroll/build/ng-infinite-scroll.min.js",
             "bower_components/select2/select2.js",
diff --git a/website/src/server.js b/website/src/server.js
index 86349fcdcd0..7271d855798 100644
--- a/website/src/server.js
+++ b/website/src/server.js
@@ -148,7 +148,6 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
   oldApp.use(passport.session());
 
   var maxAge = isProd ? 31536000000 : 0;
-  // Cache emojis without copying them to build, they are too many
   oldApp.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge }));
   oldApp.use('/common/dist', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge }));
   oldApp.use('/common/audio', express['static'](publicDir + "/../../common/audio", { maxAge: maxAge }));