diff --git a/static/emoji/gaysper/Gaysper_Androgyne.png b/static/emoji/gaysper/Gaysper_Androgyne.png
new file mode 100644
index 00000000..a9cb9226
Binary files /dev/null and b/static/emoji/gaysper/Gaysper_Androgyne.png differ
diff --git a/static/emoji/gaysper/Gaysper_Femboy.png b/static/emoji/gaysper/Gaysper_Femboy.png
new file mode 100644
index 00000000..c1088daa
Binary files /dev/null and b/static/emoji/gaysper/Gaysper_Femboy.png differ
diff --git a/static/emoji/gaysper/emoji.txt b/static/emoji/gaysper/emoji.txt
index 3bfdb40c..72f3364a 100644
--- a/static/emoji/gaysper/emoji.txt
+++ b/static/emoji/gaysper/emoji.txt
@@ -1,10 +1,12 @@
 Gaysper_Ace, /emoji/gaysper/Gaysper_Ace.png
 Gaysper_Agender, /emoji/gaysper/Gaysper_Agender.png
+Gaysper_Androgyne, /emoji/gaysper/Gaysper_Androgyne.png
 Gaysper_Aromantic, /emoji/gaysper/Gaysper_Aromantic.png
 Gaysper_Autism, /emoji/gaysper/Gaysper_Autism.png
 Gaysper_Bi, /emoji/gaysper/Gaysper_Bi.png
 Gaysper, /emoji/gaysper/Gaysper.png
 Gaysper_Enby, /emoji/gaysper/Gaysper_Enby.png
+Gaysper_Femboy, /emoji/gaysper/Gaysper_Femboy.png
 Gaysper_Genderfluid, /emoji/gaysper/Gaysper_Genderfluid.png
 Gaysper_Genderqueer, /emoji/gaysper/Gaysper_Genderqueer.png
 Gaysper_Intersex, /emoji/gaysper/Gaysper_Intersex.png
diff --git a/static/emoji/neofox/neofox_mug_drink.png b/static/emoji/neofox/neofox_mug_drink.png
index 21c4a52c..08f70958 100644
Binary files a/static/emoji/neofox/neofox_mug_drink.png and b/static/emoji/neofox/neofox_mug_drink.png differ
diff --git a/static/emoji/shitty_logos/credits.txt b/static/emoji/shitty_logos/credits.txt
new file mode 100644
index 00000000..4516b168
--- /dev/null
+++ b/static/emoji/shitty_logos/credits.txt
@@ -0,0 +1 @@
+- ffmpreg: [Astrid](https://fedi.astrid.tech/objects/90a2a2cf-2fed-42e1-a286-ba448788bef8).
diff --git a/static/emoji/shitty_logos/emoji.txt b/static/emoji/shitty_logos/emoji.txt
index b9cebe6a..7b617de7 100644
--- a/static/emoji/shitty_logos/emoji.txt
+++ b/static/emoji/shitty_logos/emoji.txt
@@ -22,6 +22,8 @@ decalog_shitty, /emoji/shitty_logos/decalog_shitty.png
 dhl_shitty, /emoji/shitty_logos/dhl_shitty.png
 eff_shitty, /emoji/shitty_logos/eff_shitty.png
 efnet_shitty, /emoji/shitty_logos/efnet_shitty.png
+ffmpreg_horizontal, /emoji/shitty_logos/ffmpreg_horizontal.png
+ffmpreg_vertical, /emoji/shitty_logos/ffmpreg_vertical.png
 freebsd-windows_shitty, /emoji/shitty_logos/freebsd-windows_shitty.png
 funk_shitty, /emoji/shitty_logos/funk_shitty.png
 gomo_shitty, /emoji/shitty_logos/gomo_shitty.png
diff --git a/static/emoji/shitty_logos/ffmpreg_horizontal.png b/static/emoji/shitty_logos/ffmpreg_horizontal.png
new file mode 100644
index 00000000..4ee6eb17
Binary files /dev/null and b/static/emoji/shitty_logos/ffmpreg_horizontal.png differ
diff --git a/static/emoji/shitty_logos/ffmpreg_vertical.png b/static/emoji/shitty_logos/ffmpreg_vertical.png
new file mode 100644
index 00000000..526a98ce
Binary files /dev/null and b/static/emoji/shitty_logos/ffmpreg_vertical.png differ