diff --git a/Dockerfile b/Dockerfile
index ce39bd7013..7f947291cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -208,9 +208,7 @@ RUN \
 # Use Ruby on Rails to create Mastodon assets
   OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile; \
 # Cleanup temporary files
-  rm -fr /opt/mastodon/tmp; \
-# TODO(kouhai): fork emoji-mart instead of patching
-  mv ./emoji_data/all.json ./node_modules/emoji-mart/data/all.json
+  rm -fr /opt/mastodon/tmp;
 
 # Prep final Mastodon Ruby layer
 FROM ruby as mastodon
diff --git a/public/emoji/sheet_13.png b/public/emoji/sheet_13.png
index 25b4db5fae..1ba12b6191 100644
Binary files a/public/emoji/sheet_13.png and b/public/emoji/sheet_13.png differ