diff --git a/Base/res/emoji/U+1F1EF U+1F1F4.png b/Base/res/emoji/U+1F1EF_U+1F1F4.png
similarity index 100%
rename from Base/res/emoji/U+1F1EF U+1F1F4.png
rename to Base/res/emoji/U+1F1EF_U+1F1F4.png
diff --git a/Base/res/emoji/U+1F3F3+U+FE0F.png b/Base/res/emoji/U+1F3F3.png
similarity index 100%
rename from Base/res/emoji/U+1F3F3+U+FE0F.png
rename to Base/res/emoji/U+1F3F3.png
diff --git a/Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+1F308.png b/Base/res/emoji/U+1F3F3_U+200D_U+1F308.png
similarity index 100%
rename from Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+1F308.png
rename to Base/res/emoji/U+1F3F3_U+200D_U+1F308.png
diff --git a/Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+1F41E.png b/Base/res/emoji/U+1F3F3_U+200D_U+1F41E.png
similarity index 100%
rename from Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+1F41E.png
rename to Base/res/emoji/U+1F3F3_U+200D_U+1F41E.png
diff --git a/Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+1F596.png b/Base/res/emoji/U+1F3F3_U+200D_U+1F596.png
similarity index 100%
rename from Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+1F596.png
rename to Base/res/emoji/U+1F3F3_U+200D_U+1F596.png
diff --git a/Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+26A7_U+FE0F.png b/Base/res/emoji/U+1F3F3_U+200D_U+26A7.png
similarity index 100%
rename from Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+26A7_U+FE0F.png
rename to Base/res/emoji/U+1F3F3_U+200D_U+26A7.png
diff --git a/Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+F8FF.png b/Base/res/emoji/U+1F3F3_U+200D_U+F8FF.png
similarity index 100%
rename from Base/res/emoji/U+1F3F3_U+FE0F_U+200D_U+F8FF.png
rename to Base/res/emoji/U+1F3F3_U+200D_U+F8FF.png
diff --git a/Base/res/emoji/U+1F3F3_U+FE0F.png b/Base/res/emoji/U+1F3F3_U+FE0F.png
deleted file mode 100644
index a0dee9a828..0000000000
Binary files a/Base/res/emoji/U+1F3F3_U+FE0F.png and /dev/null differ
diff --git a/Base/res/emoji/U+1F3F4_U+200D_U+2620_U+FE0F.png b/Base/res/emoji/U+1F3F4_U+200D_U+2620.png
similarity index 100%
rename from Base/res/emoji/U+1F3F4_U+200D_U+2620_U+FE0F.png
rename to Base/res/emoji/U+1F3F4_U+200D_U+2620.png
diff --git a/Base/res/emoji/U+1F590_U+FE0F.png b/Base/res/emoji/U+1F590.png
similarity index 100%
rename from Base/res/emoji/U+1F590_U+FE0F.png
rename to Base/res/emoji/U+1F590.png
diff --git a/Base/res/emoji/U+1F636_U+200D_U+1F32B_U+FE0F.png b/Base/res/emoji/U+1F636_U+200D_U+1F32B.png
similarity index 100%
rename from Base/res/emoji/U+1F636_U+200D_U+1F32B_U+FE0F.png
rename to Base/res/emoji/U+1F636_U+200D_U+1F32B.png
diff --git a/Base/res/emoji/U+2639_U+FE0F.png b/Base/res/emoji/U+2639.png
similarity index 100%
rename from Base/res/emoji/U+2639_U+FE0F.png
rename to Base/res/emoji/U+2639.png
diff --git a/Base/res/emoji/U+263A_U+FE0F.png b/Base/res/emoji/U+263A.png
similarity index 100%
rename from Base/res/emoji/U+263A_U+FE0F.png
rename to Base/res/emoji/U+263A.png
diff --git a/Base/res/emoji/U+270C_U+FE0F.png b/Base/res/emoji/U+270C.png
similarity index 100%
rename from Base/res/emoji/U+270C_U+FE0F.png
rename to Base/res/emoji/U+270C.png
diff --git a/Base/res/emoji/U+270D_U+FE0F.png b/Base/res/emoji/U+270D.png
similarity index 100%
rename from Base/res/emoji/U+270D_U+FE0F.png
rename to Base/res/emoji/U+270D.png