diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 13a1803188..ba58769d3e 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -192,6 +192,7 @@
 
 /datum/asset/spritesheet/goonchat/register()
 	InsertAll("emoji", 'icons/emoji.dmi')
+	InsertAll("emoji", 'icons/emoji_32.dmi')
 
 	// pre-loading all lanugage icons also helps to avoid meta
 	InsertAll("language", 'icons/misc/language.dmi')
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 65e8063ce0..33d32227e1 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -2,7 +2,8 @@
 	. = text
 	if(!CONFIG_GET(flag/emojis))
 		return
-	var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+	var/list/emojis = icon_states(icon('icons/emoji.dmi'))
+	emojis |= icon_states(icon('icons/emoji_32.dmi'))
 	var/parsed = ""
 	var/pos = 1
 	var/search = 0
@@ -18,7 +19,7 @@
 				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/goonchat)
 				var/tag = sheet.icon_tag("emoji-[emoji]")
 				if(tag)
-					parsed += tag
+					parsed += "<i style='width:16px !important;height:16px !important;'>[tag]</i>" //evil way of enforcing 16x16
 					pos = search + length(text[pos])
 				else
 					parsed += copytext(text, pos, search)
@@ -34,7 +35,8 @@
 	. = text
 	if(!CONFIG_GET(flag/emojis))
 		return
-	var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
+	var/list/emojis = icon_states(icon('icons/emoji.dmi'))
+	emojis |= icon_states(icon('icons/emoji_32.dmi'))
 	var/final = "" //only tags are added to this
 	var/pos = 1
 	var/search = 0
diff --git a/icons/emoji_32.dmi b/icons/emoji_32.dmi
new file mode 100644
index 0000000000..44b36a35e4
Binary files /dev/null and b/icons/emoji_32.dmi differ