diff --git a/Base/res/emoji/U+1F468.png b/Base/res/emoji/U+1F468.png
index 648f493877..8c7033a0cb 100644
Binary files a/Base/res/emoji/U+1F468.png and b/Base/res/emoji/U+1F468.png differ
diff --git a/Base/res/emoji/U+1F468_U+200D_U+1F52C.png b/Base/res/emoji/U+1F468_U+200D_U+1F52C.png
index 23fcde43dc..e7a70685eb 100644
Binary files a/Base/res/emoji/U+1F468_U+200D_U+1F52C.png and b/Base/res/emoji/U+1F468_U+200D_U+1F52C.png differ
diff --git a/Base/res/emoji/U+1F468_U+200D_U+1F9B0.png b/Base/res/emoji/U+1F468_U+200D_U+1F9B0.png
index 690c176d2f..a650231c1c 100644
Binary files a/Base/res/emoji/U+1F468_U+200D_U+1F9B0.png and b/Base/res/emoji/U+1F468_U+200D_U+1F9B0.png differ
diff --git a/Base/res/emoji/U+1F468_U+200D_U+1F9B1.png b/Base/res/emoji/U+1F468_U+200D_U+1F9B1.png
index 94ca3df501..04da184b4c 100644
Binary files a/Base/res/emoji/U+1F468_U+200D_U+1F9B1.png and b/Base/res/emoji/U+1F468_U+200D_U+1F9B1.png differ
diff --git a/Base/res/emoji/U+1F468_U+200D_U+1F9B3.png b/Base/res/emoji/U+1F468_U+200D_U+1F9B3.png
index 486a0af1fa..b979cfd7f5 100644
Binary files a/Base/res/emoji/U+1F468_U+200D_U+1F9B3.png and b/Base/res/emoji/U+1F468_U+200D_U+1F9B3.png differ
diff --git a/Base/res/emoji/U+1F468_U+200D_U+2695_U+FE0F.png b/Base/res/emoji/U+1F468_U+200D_U+2695.png
similarity index 100%
rename from Base/res/emoji/U+1F468_U+200D_U+2695_U+FE0F.png
rename to Base/res/emoji/U+1F468_U+200D_U+2695.png
diff --git a/Base/res/emoji/U+1F468_U+200D_U+2696_U+FE0F.png b/Base/res/emoji/U+1F468_U+200D_U+2696.png
similarity index 100%
rename from Base/res/emoji/U+1F468_U+200D_U+2696_U+FE0F.png
rename to Base/res/emoji/U+1F468_U+200D_U+2696.png
diff --git a/Base/res/emoji/U+1F469.png b/Base/res/emoji/U+1F469.png
index 7e2c5b198a..2e7f638e88 100644
Binary files a/Base/res/emoji/U+1F469.png and b/Base/res/emoji/U+1F469.png differ
diff --git a/Base/res/emoji/U+1F469_U+200D_U+1F52C.png b/Base/res/emoji/U+1F469_U+200D_U+1F52C.png
index 12ead2c630..f9a98d66a0 100644
Binary files a/Base/res/emoji/U+1F469_U+200D_U+1F52C.png and b/Base/res/emoji/U+1F469_U+200D_U+1F52C.png differ
diff --git a/Base/res/emoji/U+1F469_U+200D_U+1F9B0.png b/Base/res/emoji/U+1F469_U+200D_U+1F9B0.png
index 175c31bf8e..37377f3158 100644
Binary files a/Base/res/emoji/U+1F469_U+200D_U+1F9B0.png and b/Base/res/emoji/U+1F469_U+200D_U+1F9B0.png differ
diff --git a/Base/res/emoji/U+1F469_U+200D_U+1F9B1.png b/Base/res/emoji/U+1F469_U+200D_U+1F9B1.png
index fec0829436..8b90b127db 100644
Binary files a/Base/res/emoji/U+1F469_U+200D_U+1F9B1.png and b/Base/res/emoji/U+1F469_U+200D_U+1F9B1.png differ
diff --git a/Base/res/emoji/U+1F469_U+200D_U+1F9B3.png b/Base/res/emoji/U+1F469_U+200D_U+1F9B3.png
index de8ddea0b1..39facc27ce 100644
Binary files a/Base/res/emoji/U+1F469_U+200D_U+1F9B3.png and b/Base/res/emoji/U+1F469_U+200D_U+1F9B3.png differ
diff --git a/Base/res/emoji/U+1F469_U+200D_U+2695_U+FE0F.png b/Base/res/emoji/U+1F469_U+200D_U+2695.png
similarity index 100%
rename from Base/res/emoji/U+1F469_U+200D_U+2695_U+FE0F.png
rename to Base/res/emoji/U+1F469_U+200D_U+2695.png
diff --git a/Base/res/emoji/U+1F469_U+200D_U+2696_U+FE0F.png b/Base/res/emoji/U+1F469_U+200D_U+2696.png
similarity index 100%
rename from Base/res/emoji/U+1F469_U+200D_U+2696_U+FE0F.png
rename to Base/res/emoji/U+1F469_U+200D_U+2696.png
diff --git a/Base/res/emoji/U+1F471.png b/Base/res/emoji/U+1F471.png
index 06902d8f2e..6de759df91 100644
Binary files a/Base/res/emoji/U+1F471.png and b/Base/res/emoji/U+1F471.png differ
diff --git a/Base/res/emoji/U+1F471_U+200D_U+2640.png b/Base/res/emoji/U+1F471_U+200D_U+2640.png
new file mode 100644
index 0000000000..c94cde5296
Binary files /dev/null and b/Base/res/emoji/U+1F471_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F471_U+200D_U+2640_U+FE0F.png b/Base/res/emoji/U+1F471_U+200D_U+2640_U+FE0F.png
deleted file mode 100644
index 68e22cff1b..0000000000
Binary files a/Base/res/emoji/U+1F471_U+200D_U+2640_U+FE0F.png and /dev/null differ
diff --git a/Base/res/emoji/U+1F471_U+200D_U+2642.png b/Base/res/emoji/U+1F471_U+200D_U+2642.png
new file mode 100644
index 0000000000..ee6e501643
Binary files /dev/null and b/Base/res/emoji/U+1F471_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F471_U+200D_U+2642_U+FE0F.png b/Base/res/emoji/U+1F471_U+200D_U+2642_U+FE0F.png
deleted file mode 100644
index c9a3a03ab7..0000000000
Binary files a/Base/res/emoji/U+1F471_U+200D_U+2642_U+FE0F.png and /dev/null differ
diff --git a/Base/res/emoji/U+1F473_U+200D_U+2640_U+FE0F.png b/Base/res/emoji/U+1F473_U+200D_U+2640.png
similarity index 100%
rename from Base/res/emoji/U+1F473_U+200D_U+2640_U+FE0F.png
rename to Base/res/emoji/U+1F473_U+200D_U+2640.png
diff --git a/Base/res/emoji/U+1F473_U+200D_U+2642_U+FE0F.png b/Base/res/emoji/U+1F473_U+200D_U+2642.png
similarity index 100%
rename from Base/res/emoji/U+1F473_U+200D_U+2642_U+FE0F.png
rename to Base/res/emoji/U+1F473_U+200D_U+2642.png
diff --git a/Base/res/emoji/U+1F481.png b/Base/res/emoji/U+1F481.png
new file mode 100644
index 0000000000..ac6c386387
Binary files /dev/null and b/Base/res/emoji/U+1F481.png differ
diff --git a/Base/res/emoji/U+1F481_U+200D_U+2640.png b/Base/res/emoji/U+1F481_U+200D_U+2640.png
new file mode 100644
index 0000000000..736acf6cf4
Binary files /dev/null and b/Base/res/emoji/U+1F481_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F481_U+200D_U+2642.png b/Base/res/emoji/U+1F481_U+200D_U+2642.png
new file mode 100644
index 0000000000..037ade60d4
Binary files /dev/null and b/Base/res/emoji/U+1F481_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F486.png b/Base/res/emoji/U+1F486.png
new file mode 100644
index 0000000000..ddc6ed1033
Binary files /dev/null and b/Base/res/emoji/U+1F486.png differ
diff --git a/Base/res/emoji/U+1F486_U+200D_U+2640.png b/Base/res/emoji/U+1F486_U+200D_U+2640.png
new file mode 100644
index 0000000000..5ce307194a
Binary files /dev/null and b/Base/res/emoji/U+1F486_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F486_U+200D_U+2642.png b/Base/res/emoji/U+1F486_U+200D_U+2642.png
new file mode 100644
index 0000000000..17200761dd
Binary files /dev/null and b/Base/res/emoji/U+1F486_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F487.png b/Base/res/emoji/U+1F487.png
new file mode 100644
index 0000000000..a78d67ab24
Binary files /dev/null and b/Base/res/emoji/U+1F487.png differ
diff --git a/Base/res/emoji/U+1F487_U+200D_U+2640.png b/Base/res/emoji/U+1F487_U+200D_U+2640.png
new file mode 100644
index 0000000000..1a08e0039d
Binary files /dev/null and b/Base/res/emoji/U+1F487_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F487_U+200D_U+2642.png b/Base/res/emoji/U+1F487_U+200D_U+2642.png
new file mode 100644
index 0000000000..3d605377cd
Binary files /dev/null and b/Base/res/emoji/U+1F487_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F645.png b/Base/res/emoji/U+1F645.png
new file mode 100644
index 0000000000..e975c94d4b
Binary files /dev/null and b/Base/res/emoji/U+1F645.png differ
diff --git a/Base/res/emoji/U+1F645_U+200D_U+2640.png b/Base/res/emoji/U+1F645_U+200D_U+2640.png
new file mode 100644
index 0000000000..6e3a7cb101
Binary files /dev/null and b/Base/res/emoji/U+1F645_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F645_U+200D_U+2642.png b/Base/res/emoji/U+1F645_U+200D_U+2642.png
new file mode 100644
index 0000000000..954c697a87
Binary files /dev/null and b/Base/res/emoji/U+1F645_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F646.png b/Base/res/emoji/U+1F646.png
new file mode 100644
index 0000000000..ae02b4b81f
Binary files /dev/null and b/Base/res/emoji/U+1F646.png differ
diff --git a/Base/res/emoji/U+1F646_U+200D_U+2640.png b/Base/res/emoji/U+1F646_U+200D_U+2640.png
new file mode 100644
index 0000000000..6abaa8b038
Binary files /dev/null and b/Base/res/emoji/U+1F646_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F646_U+200D_U+2642.png b/Base/res/emoji/U+1F646_U+200D_U+2642.png
new file mode 100644
index 0000000000..d5723b9e1c
Binary files /dev/null and b/Base/res/emoji/U+1F646_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F647.png b/Base/res/emoji/U+1F647.png
new file mode 100644
index 0000000000..df127fec64
Binary files /dev/null and b/Base/res/emoji/U+1F647.png differ
diff --git a/Base/res/emoji/U+1F647_U+200D_U+2640.png b/Base/res/emoji/U+1F647_U+200D_U+2640.png
new file mode 100644
index 0000000000..cf9c994bc0
Binary files /dev/null and b/Base/res/emoji/U+1F647_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F647_U+200D_U+2642.png b/Base/res/emoji/U+1F647_U+200D_U+2642.png
new file mode 100644
index 0000000000..41821f3cda
Binary files /dev/null and b/Base/res/emoji/U+1F647_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F64B.png b/Base/res/emoji/U+1F64B.png
new file mode 100644
index 0000000000..1f503d5329
Binary files /dev/null and b/Base/res/emoji/U+1F64B.png differ
diff --git a/Base/res/emoji/U+1F64B_U+200D_U+2640.png b/Base/res/emoji/U+1F64B_U+200D_U+2640.png
new file mode 100644
index 0000000000..f29381147d
Binary files /dev/null and b/Base/res/emoji/U+1F64B_U+200D_U+2640.png differ
diff --git a/Base/res/emoji/U+1F64B_U+200D_U+2642.png b/Base/res/emoji/U+1F64B_U+200D_U+2642.png
new file mode 100644
index 0000000000..4d6245505d
Binary files /dev/null and b/Base/res/emoji/U+1F64B_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F9CD_U+200D_U+2642.png b/Base/res/emoji/U+1F9CD_U+200D_U+2642.png
index 7a892a5f19..8bdbbd73c1 100644
Binary files a/Base/res/emoji/U+1F9CD_U+200D_U+2642.png and b/Base/res/emoji/U+1F9CD_U+200D_U+2642.png differ
diff --git a/Base/res/emoji/U+1F9D1.png b/Base/res/emoji/U+1F9D1.png
index c87316f092..6d7ff6de8d 100644
Binary files a/Base/res/emoji/U+1F9D1.png and b/Base/res/emoji/U+1F9D1.png differ
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+1F52C.png b/Base/res/emoji/U+1F9D1_U+200D_U+1F52C.png
index 23fcde43dc..76639b9be8 100644
Binary files a/Base/res/emoji/U+1F9D1_U+200D_U+1F52C.png and b/Base/res/emoji/U+1F9D1_U+200D_U+1F52C.png differ
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+1F682.png b/Base/res/emoji/U+1F9D1_U+200D_U+1F692.png
similarity index 100%
rename from Base/res/emoji/U+1F9D1_U+200D_U+1F682.png
rename to Base/res/emoji/U+1F9D1_U+200D_U+1F692.png
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+1F9B0.png b/Base/res/emoji/U+1F9D1_U+200D_U+1F9B0.png
index 2d76a6ca59..516e1ae646 100644
Binary files a/Base/res/emoji/U+1F9D1_U+200D_U+1F9B0.png and b/Base/res/emoji/U+1F9D1_U+200D_U+1F9B0.png differ
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+1F9B1.png b/Base/res/emoji/U+1F9D1_U+200D_U+1F9B1.png
index e1ea884877..157c5efd1f 100644
Binary files a/Base/res/emoji/U+1F9D1_U+200D_U+1F9B1.png and b/Base/res/emoji/U+1F9D1_U+200D_U+1F9B1.png differ
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+1F9B3.png b/Base/res/emoji/U+1F9D1_U+200D_U+1F9B3.png
index a2c9312bef..8171e6f9e0 100644
Binary files a/Base/res/emoji/U+1F9D1_U+200D_U+1F9B3.png and b/Base/res/emoji/U+1F9D1_U+200D_U+1F9B3.png differ
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+2695_U+FE0F.png b/Base/res/emoji/U+1F9D1_U+200D_U+2695.png
similarity index 100%
rename from Base/res/emoji/U+1F9D1_U+200D_U+2695_U+FE0F.png
rename to Base/res/emoji/U+1F9D1_U+200D_U+2695.png
diff --git a/Base/res/emoji/U+1F9D1_U+200D_U+2696_U+FE0F.png b/Base/res/emoji/U+1F9D1_U+200D_U+2696.png
similarity index 100%
rename from Base/res/emoji/U+1F9D1_U+200D_U+2696_U+FE0F.png
rename to Base/res/emoji/U+1F9D1_U+200D_U+2696.png