diff --git a/static/emoji/custom/MiiVerse_blehhh.png b/static/emoji/MiiVerse/MiiVerse_blehhh.png
similarity index 100%
rename from static/emoji/custom/MiiVerse_blehhh.png
rename to static/emoji/MiiVerse/MiiVerse_blehhh.png
diff --git a/static/emoji/MiiVerse/MiiVerse_happy.png b/static/emoji/MiiVerse/MiiVerse_happy.png
new file mode 100644
index 00000000..a39b8106
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_happy.png differ
diff --git a/static/emoji/MiiVerse/MiiVerse_laugh.png b/static/emoji/MiiVerse/MiiVerse_laugh.png
new file mode 100644
index 00000000..8bd8d4fa
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_laugh.png differ
diff --git a/static/emoji/MiiVerse/MiiVerse_neutral.png b/static/emoji/MiiVerse/MiiVerse_neutral.png
new file mode 100644
index 00000000..a080586a
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_neutral.png differ
diff --git a/static/emoji/custom/MiiVerse_no.png b/static/emoji/MiiVerse/MiiVerse_no.png
similarity index 100%
rename from static/emoji/custom/MiiVerse_no.png
rename to static/emoji/MiiVerse/MiiVerse_no.png
diff --git a/static/emoji/MiiVerse/MiiVerse_sad.png b/static/emoji/MiiVerse/MiiVerse_sad.png
new file mode 100644
index 00000000..80516497
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_sad.png differ
diff --git a/static/emoji/MiiVerse/MiiVerse_shock.png b/static/emoji/MiiVerse/MiiVerse_shock.png
new file mode 100644
index 00000000..9e45eedd
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_shock.png differ
diff --git a/static/emoji/custom/MiiVerse_uhh.png b/static/emoji/MiiVerse/MiiVerse_uhh.png
similarity index 100%
rename from static/emoji/custom/MiiVerse_uhh.png
rename to static/emoji/MiiVerse/MiiVerse_uhh.png
diff --git a/static/emoji/MiiVerse/MiiVerse_upset.png b/static/emoji/MiiVerse/MiiVerse_upset.png
new file mode 100644
index 00000000..6fe9cd54
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_upset.png differ
diff --git a/static/emoji/MiiVerse/MiiVerse_wink.png b/static/emoji/MiiVerse/MiiVerse_wink.png
new file mode 100644
index 00000000..f90c8001
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_wink.png differ
diff --git a/static/emoji/MiiVerse/MiiVerse_woozy.png b/static/emoji/MiiVerse/MiiVerse_woozy.png
new file mode 100644
index 00000000..13ad3f89
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_woozy.png differ
diff --git a/static/emoji/MiiVerse/MiiVerse_yeah.png b/static/emoji/MiiVerse/MiiVerse_yeah.png
new file mode 100644
index 00000000..ceb90d0d
Binary files /dev/null and b/static/emoji/MiiVerse/MiiVerse_yeah.png differ
diff --git a/static/emoji/MiiVerse/emoji.txt b/static/emoji/MiiVerse/emoji.txt
new file mode 100644
index 00000000..442cda79
--- /dev/null
+++ b/static/emoji/MiiVerse/emoji.txt
@@ -0,0 +1,12 @@
+MiiVerse_blehhh, /emoji/MiiVerse/MiiVerse_blehhh.png
+MiiVerse_happy, /emoji/MiiVerse/MiiVerse_happy.png
+MiiVerse_laugh, /emoji/MiiVerse/MiiVerse_laugh.png
+MiiVerse_neutral, /emoji/MiiVerse/MiiVerse_neutral.png
+MiiVerse_no, /emoji/MiiVerse/MiiVerse_no.png
+MiiVerse_sad, /emoji/MiiVerse/MiiVerse_sad.png
+MiiVerse_shock, /emoji/MiiVerse/MiiVerse_shock.png
+MiiVerse_uhh, /emoji/MiiVerse/MiiVerse_uhh.png
+MiiVerse_upset, /emoji/MiiVerse/MiiVerse_upset.png
+MiiVerse_wink, /emoji/MiiVerse/MiiVerse_wink.png
+MiiVerse_woozy, /emoji/MiiVerse/MiiVerse_woozy.png
+MiiVerse_yeah, /emoji/MiiVerse/MiiVerse_yeah.png
diff --git a/static/emoji/custom/MiiVerse_yeah.png b/static/emoji/custom/MiiVerse_yeah.png
deleted file mode 100644
index 5d1d3837..00000000
Binary files a/static/emoji/custom/MiiVerse_yeah.png and /dev/null differ
diff --git a/static/emoji/custom/emoji.txt b/static/emoji/custom/emoji.txt
index 165ca298..bdf07f55 100644
--- a/static/emoji/custom/emoji.txt
+++ b/static/emoji/custom/emoji.txt
@@ -217,10 +217,6 @@ meditating, /emoji/custom/meditating.gif
 mega, /emoji/custom/mega.gif
 meow, /emoji/custom/meow.gif
 metal2, /emoji/custom/metal2.gif
-MiiVerse_blehhh, /emoji/custom/MiiVerse_blehhh.png
-MiiVerse_no, /emoji/custom/MiiVerse_no.png
-MiiVerse_uhh, /emoji/custom/MiiVerse_uhh.png
-MiiVerse_yeah, /emoji/custom/MiiVerse_yeah.png
 mim_cat, /emoji/custom/mim_cat.gif
 minion_wave, /emoji/custom/minion_wave.png
 monkey, /emoji/custom/monkey.gif