diff --git a/fonts/Blobmoji.ttf b/fonts/Blobmoji.ttf
index b1acca22ce..04df4b61a4 100644
Binary files a/fonts/Blobmoji.ttf and b/fonts/Blobmoji.ttf differ
diff --git a/fonts/BlobmojiCompat.ttf b/fonts/BlobmojiCompat.ttf
index 357ce89309..b583e4172c 100644
Binary files a/fonts/BlobmojiCompat.ttf and b/fonts/BlobmojiCompat.ttf differ
diff --git a/fonts/BlobmojiWindows.ttf b/fonts/BlobmojiWindows.ttf
index fa4ff8128f..e52b068e88 100644
Binary files a/fonts/BlobmojiWindows.ttf and b/fonts/BlobmojiWindows.ttf differ
diff --git a/gender_pre-emoji-5-extra/people with bunny ears light skin tone.svg b/gender_pre-emoji-5-extra/emoji_u1f46f_1f3fb.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/people with bunny ears light skin tone.svg
rename to gender_pre-emoji-5-extra/emoji_u1f46f_1f3fb.svg
diff --git a/gender_pre-emoji-5-extra/people with bunny ears medium-light skin tone.svg b/gender_pre-emoji-5-extra/emoji_u1f46f_1f3fc.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/people with bunny ears medium-light skin tone.svg
rename to gender_pre-emoji-5-extra/emoji_u1f46f_1f3fc.svg
diff --git a/gender_pre-emoji-5-extra/people with bunny ears medium skin tone.svg b/gender_pre-emoji-5-extra/emoji_u1f46f_1f3fd.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/people with bunny ears medium skin tone.svg
rename to gender_pre-emoji-5-extra/emoji_u1f46f_1f3fd.svg
diff --git a/gender_pre-emoji-5-extra/people with bunny ears medium-dark skin tone.svg b/gender_pre-emoji-5-extra/emoji_u1f46f_1f3fe.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/people with bunny ears medium-dark skin tone.svg
rename to gender_pre-emoji-5-extra/emoji_u1f46f_1f3fe.svg
diff --git a/gender_pre-emoji-5-extra/people with bunny ears dark skin tone.svg b/gender_pre-emoji-5-extra/emoji_u1f46f_1f3ff.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/people with bunny ears dark skin tone.svg
rename to gender_pre-emoji-5-extra/emoji_u1f46f_1f3ff.svg
diff --git a/gender_pre-emoji-5-extra/family light skin tone.svg b/svg/emoji_u1f46a_1f3fb.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/family light skin tone.svg
rename to svg/emoji_u1f46a_1f3fb.svg
diff --git a/gender_pre-emoji-5-extra/family medium-light skin tone.svg b/svg/emoji_u1f46a_1f3fc.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/family medium-light skin tone.svg
rename to svg/emoji_u1f46a_1f3fc.svg
diff --git a/gender_pre-emoji-5-extra/family medium skin tone.svg b/svg/emoji_u1f46a_1f3fd.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/family medium skin tone.svg
rename to svg/emoji_u1f46a_1f3fd.svg
diff --git a/gender_pre-emoji-5-extra/family medium-dark skin tone.svg b/svg/emoji_u1f46a_1f3fe.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/family medium-dark skin tone.svg
rename to svg/emoji_u1f46a_1f3fe.svg
diff --git a/gender_pre-emoji-5-extra/family dark skin tone.svg b/svg/emoji_u1f46a_1f3ff.svg
similarity index 100%
rename from gender_pre-emoji-5-extra/family dark skin tone.svg
rename to svg/emoji_u1f46a_1f3ff.svg
diff --git a/svg/people with bunny ears light skin tone.svg b/svg/emoji_u1f46f_1f3fb.svg
similarity index 100%
rename from svg/people with bunny ears light skin tone.svg
rename to svg/emoji_u1f46f_1f3fb.svg
diff --git a/svg/people with bunny ears medium-light skin tone.svg b/svg/emoji_u1f46f_1f3fc.svg
similarity index 100%
rename from svg/people with bunny ears medium-light skin tone.svg
rename to svg/emoji_u1f46f_1f3fc.svg
diff --git a/svg/people with bunny ears medium skin tone.svg b/svg/emoji_u1f46f_1f3fd.svg
similarity index 100%
rename from svg/people with bunny ears medium skin tone.svg
rename to svg/emoji_u1f46f_1f3fd.svg
diff --git a/svg/people with bunny ears medium-dark skin tone.svg b/svg/emoji_u1f46f_1f3fe.svg
similarity index 100%
rename from svg/people with bunny ears medium-dark skin tone.svg
rename to svg/emoji_u1f46f_1f3fe.svg
diff --git a/svg/people with bunny ears dark skin tone.svg b/svg/emoji_u1f46f_1f3ff.svg
similarity index 100%
rename from svg/people with bunny ears dark skin tone.svg
rename to svg/emoji_u1f46f_1f3ff.svg
diff --git a/svg/family dark skin tone.svg b/svg/family dark skin tone.svg
deleted file mode 100644
index 049729dd5c..0000000000
--- a/svg/family dark skin tone.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/svg/family light skin tone.svg b/svg/family light skin tone.svg
deleted file mode 100644
index 91af322bdc..0000000000
--- a/svg/family light skin tone.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/svg/family medium skin tone.svg b/svg/family medium skin tone.svg
deleted file mode 100644
index d3090edf57..0000000000
--- a/svg/family medium skin tone.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/svg/family medium-dark skin tone.svg b/svg/family medium-dark skin tone.svg
deleted file mode 100644
index d4be2e026c..0000000000
--- a/svg/family medium-dark skin tone.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/svg/family medium-light skin tone.svg b/svg/family medium-light skin tone.svg
deleted file mode 100644
index 076cb0437e..0000000000
--- a/svg/family medium-light skin tone.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file