diff --git a/config/emoji.txt b/config/emoji.txt
index 0e668e609..7afacb09f 100644
--- a/config/emoji.txt
+++ b/config/emoji.txt
@@ -1 +1,31 @@
 firefox, /emoji/Firefox.gif
+blank, /emoji/blank.png
+f_00b, /emoji/f_00b.png
+f_00b11b, /emoji/f_00b11b.png
+f_00b33b, /emoji/f_00b33b.png
+f_00h, /emoji/f_00h.png
+f_00t, /emoji/f_00t.png
+f_01b, /emoji/f_01b.png
+f_03b, /emoji/f_03b.png
+f_10b, /emoji/f_10b.png
+f_11b, /emoji/f_11b.png
+f_11b00b, /emoji/f_11b00b.png
+f_11b22b, /emoji/f_11b22b.png
+f_11h, /emoji/f_11h.png
+f_11t, /emoji/f_11t.png
+f_12b, /emoji/f_12b.png
+f_21b, /emoji/f_21b.png
+f_22b, /emoji/f_22b.png
+f_22b11b, /emoji/f_22b11b.png
+f_22b33b, /emoji/f_22b33b.png
+f_22h, /emoji/f_22h.png
+f_22t, /emoji/f_22t.png
+f_23b, /emoji/f_23b.png
+f_30b, /emoji/f_30b.png
+f_32b, /emoji/f_32b.png
+f_33b, /emoji/f_33b.png
+f_33b00b, /emoji/f_33b00b.png
+f_33b22b, /emoji/f_33b22b.png
+f_33h, /emoji/f_33h.png
+f_33t, /emoji/f_33t.png
+
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 92ed8f32e..f714792da 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -22,6 +22,7 @@ server {
     server_name example.tld;
 
     location / {
+        add_header 'Access-Control-Allow-Origin' '*';
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
diff --git a/priv/static/emoji/blank.png b/priv/static/emoji/blank.png
new file mode 100644
index 000000000..175a1d412
Binary files /dev/null and b/priv/static/emoji/blank.png differ
diff --git a/priv/static/emoji/f_00b.png b/priv/static/emoji/f_00b.png
new file mode 100644
index 000000000..8c0f8b7e8
Binary files /dev/null and b/priv/static/emoji/f_00b.png differ
diff --git a/priv/static/emoji/f_00b11b.png b/priv/static/emoji/f_00b11b.png
new file mode 100644
index 000000000..408b8fdd3
Binary files /dev/null and b/priv/static/emoji/f_00b11b.png differ
diff --git a/priv/static/emoji/f_00b33b.png b/priv/static/emoji/f_00b33b.png
new file mode 100644
index 000000000..7926f497c
Binary files /dev/null and b/priv/static/emoji/f_00b33b.png differ
diff --git a/priv/static/emoji/f_00h.png b/priv/static/emoji/f_00h.png
new file mode 100644
index 000000000..a8e26b330
Binary files /dev/null and b/priv/static/emoji/f_00h.png differ
diff --git a/priv/static/emoji/f_00t.png b/priv/static/emoji/f_00t.png
new file mode 100644
index 000000000..5b78986f7
Binary files /dev/null and b/priv/static/emoji/f_00t.png differ
diff --git a/priv/static/emoji/f_01b.png b/priv/static/emoji/f_01b.png
new file mode 100644
index 000000000..13359359e
Binary files /dev/null and b/priv/static/emoji/f_01b.png differ
diff --git a/priv/static/emoji/f_03b.png b/priv/static/emoji/f_03b.png
new file mode 100644
index 000000000..ab95f9b28
Binary files /dev/null and b/priv/static/emoji/f_03b.png differ
diff --git a/priv/static/emoji/f_10b.png b/priv/static/emoji/f_10b.png
new file mode 100644
index 000000000..b57b5b3b2
Binary files /dev/null and b/priv/static/emoji/f_10b.png differ
diff --git a/priv/static/emoji/f_11b.png b/priv/static/emoji/f_11b.png
new file mode 100644
index 000000000..dcdb61ea4
Binary files /dev/null and b/priv/static/emoji/f_11b.png differ
diff --git a/priv/static/emoji/f_11b00b.png b/priv/static/emoji/f_11b00b.png
new file mode 100644
index 000000000..48e487dff
Binary files /dev/null and b/priv/static/emoji/f_11b00b.png differ
diff --git a/priv/static/emoji/f_11b22b.png b/priv/static/emoji/f_11b22b.png
new file mode 100644
index 000000000..a1f09b063
Binary files /dev/null and b/priv/static/emoji/f_11b22b.png differ
diff --git a/priv/static/emoji/f_11h.png b/priv/static/emoji/f_11h.png
new file mode 100644
index 000000000..59a86c98e
Binary files /dev/null and b/priv/static/emoji/f_11h.png differ
diff --git a/priv/static/emoji/f_11t.png b/priv/static/emoji/f_11t.png
new file mode 100644
index 000000000..8a31379b1
Binary files /dev/null and b/priv/static/emoji/f_11t.png differ
diff --git a/priv/static/emoji/f_12b.png b/priv/static/emoji/f_12b.png
new file mode 100644
index 000000000..99481725e
Binary files /dev/null and b/priv/static/emoji/f_12b.png differ
diff --git a/priv/static/emoji/f_21b.png b/priv/static/emoji/f_21b.png
new file mode 100644
index 000000000..d6f6e2131
Binary files /dev/null and b/priv/static/emoji/f_21b.png differ
diff --git a/priv/static/emoji/f_22b.png b/priv/static/emoji/f_22b.png
new file mode 100644
index 000000000..e90a407d9
Binary files /dev/null and b/priv/static/emoji/f_22b.png differ
diff --git a/priv/static/emoji/f_22b11b.png b/priv/static/emoji/f_22b11b.png
new file mode 100644
index 000000000..ca25cf1af
Binary files /dev/null and b/priv/static/emoji/f_22b11b.png differ
diff --git a/priv/static/emoji/f_22b33b.png b/priv/static/emoji/f_22b33b.png
new file mode 100644
index 000000000..ec4760ca1
Binary files /dev/null and b/priv/static/emoji/f_22b33b.png differ
diff --git a/priv/static/emoji/f_22h.png b/priv/static/emoji/f_22h.png
new file mode 100644
index 000000000..c82c9179b
Binary files /dev/null and b/priv/static/emoji/f_22h.png differ
diff --git a/priv/static/emoji/f_22t.png b/priv/static/emoji/f_22t.png
new file mode 100644
index 000000000..2a858a6f3
Binary files /dev/null and b/priv/static/emoji/f_22t.png differ
diff --git a/priv/static/emoji/f_23b.png b/priv/static/emoji/f_23b.png
new file mode 100644
index 000000000..551598a24
Binary files /dev/null and b/priv/static/emoji/f_23b.png differ
diff --git a/priv/static/emoji/f_30b.png b/priv/static/emoji/f_30b.png
new file mode 100644
index 000000000..f2cb32978
Binary files /dev/null and b/priv/static/emoji/f_30b.png differ
diff --git a/priv/static/emoji/f_32b.png b/priv/static/emoji/f_32b.png
new file mode 100644
index 000000000..5646a0fcd
Binary files /dev/null and b/priv/static/emoji/f_32b.png differ
diff --git a/priv/static/emoji/f_33b.png b/priv/static/emoji/f_33b.png
new file mode 100644
index 000000000..86f2a0a0e
Binary files /dev/null and b/priv/static/emoji/f_33b.png differ
diff --git a/priv/static/emoji/f_33b00b.png b/priv/static/emoji/f_33b00b.png
new file mode 100644
index 000000000..9f9a750b0
Binary files /dev/null and b/priv/static/emoji/f_33b00b.png differ
diff --git a/priv/static/emoji/f_33b22b.png b/priv/static/emoji/f_33b22b.png
new file mode 100644
index 000000000..48520a17e
Binary files /dev/null and b/priv/static/emoji/f_33b22b.png differ
diff --git a/priv/static/emoji/f_33h.png b/priv/static/emoji/f_33h.png
new file mode 100644
index 000000000..0b8a333d2
Binary files /dev/null and b/priv/static/emoji/f_33h.png differ
diff --git a/priv/static/emoji/f_33t.png b/priv/static/emoji/f_33t.png
new file mode 100644
index 000000000..0f8812075
Binary files /dev/null and b/priv/static/emoji/f_33t.png differ