diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 14ca7426c2f..aea08ecce3e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -236,7 +236,7 @@ class ProjectsController < ApplicationController
       Emoji.emojis.map do |name, emoji|
         {
           name: name,
-          path: view_context.image_url("emoji/#{emoji["unicode"]}.png")
+          path: view_context.image_url("#{emoji["unicode"]}.png")
         }
       end
     end
diff --git a/config/application.rb b/config/application.rb
index 1e9ec74cdbf..04d0b23d82d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,8 +43,8 @@ module Gitlab
 
     # Enable the asset pipeline
     config.assets.enabled = true
-    config.assets.paths << Emoji.images_path
-    config.assets.precompile << "emoji/*.png"
+    config.assets.paths << Gemojione.index.images_path
+    config.assets.precompile << "*.png"
     config.assets.precompile << "print.css"
 
     # Version of your assets, change this if you want to expire all your assets
diff --git a/lib/banzai/filter/emoji_filter.rb b/lib/banzai/filter/emoji_filter.rb
index 5952a031626..207437ba7cf 100644
--- a/lib/banzai/filter/emoji_filter.rb
+++ b/lib/banzai/filter/emoji_filter.rb
@@ -45,7 +45,8 @@ module Banzai
       private
 
       def emoji_url(name)
-        emoji_path = "emoji/#{emoji_filename(name)}"
+        emoji_path = emoji_filename(name)
+
         if context[:asset_host]
           # Asset host is specified.
           url_to_image(emoji_path)