diff --git a/static/emoji/custom/emoji.txt b/static/emoji/custom/emoji.txt
index ef9cba85..039382a0 100644
--- a/static/emoji/custom/emoji.txt
+++ b/static/emoji/custom/emoji.txt
@@ -200,6 +200,7 @@ mario, /emoji/custom/mario.gif
 mario_yoshi, /emoji/custom/mario_yoshi.gif
 marvindepressedrobot, /emoji/custom/marvindepressedrobot.png
 marvin, /emoji/custom/marvin.png
+mastodont, /emoji/custom/mastodont.png
 matrix, /emoji/custom/matrix.gif
 meditating, /emoji/custom/meditating.gif
 mega, /emoji/custom/mega.gif
@@ -216,6 +217,7 @@ naruhodo, /emoji/custom/naruhodo.gif
 neckbeard, /emoji/custom/neckbeard.gif
 nemo, /emoji/custom/nemo.gif
 ness, /emoji/custom/ness.png
+nightjar, /emoji/custom/nightjar.png
 ninja, /emoji/custom/ninja.gif
 ninja_fixed, /emoji/custom/ninja_fixed.gif
 nocloud, /emoji/custom/nocloud.png
diff --git a/static/emoji/custom/mastodont.png b/static/emoji/custom/mastodont.png
new file mode 100644
index 00000000..8330a080
Binary files /dev/null and b/static/emoji/custom/mastodont.png differ
diff --git a/static/emoji/custom/nightjar.png b/static/emoji/custom/nightjar.png
new file mode 100644
index 00000000..bbcf5c96
Binary files /dev/null and b/static/emoji/custom/nightjar.png differ