diff --git a/code/modules/language/common.dm b/code/modules/language/common.dm
index a54bab618dd..c00ab328ec1 100644
--- a/code/modules/language/common.dm
+++ b/code/modules/language/common.dm
@@ -8,8 +8,7 @@
 	flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD
 	default_priority = 100
 
-	icon = 'icons/obj/cardboard_cutout.dmi'
-	icon_state = "cutout_greytide"
+	icon_state = "galcom"
 
 //Syllable Lists
 /*
diff --git a/code/modules/language/drone.dm b/code/modules/language/drone.dm
index 841307489c4..253682d7e49 100644
--- a/code/modules/language/drone.dm
+++ b/code/modules/language/drone.dm
@@ -13,5 +13,4 @@
 	sentence_chance = 0
 	default_priority = 20
 
-	icon = 'icons/mob/drone.dmi'
-	icon_state = "drone_repair"
+	icon_state = "drone"
\ No newline at end of file
diff --git a/code/modules/language/language.dm b/code/modules/language/language.dm
index cf56a85b7ff..01bf268e01e 100644
--- a/code/modules/language/language.dm
+++ b/code/modules/language/language.dm
@@ -21,8 +21,9 @@
 	var/static/list/scramble_cache = list()
 	var/default_priority = 0          // the language that an atom knows with the highest "default_priority" is selected by default.
 
-	var/icon
-	var/icon_state
+	// if you are seeing someone speak popcorn language, then something is wrong.
+	var/icon = 'icons/misc/language.dmi'
+	var/icon_state = "popcorn"
 
 /datum/language/proc/display_icon(atom/movable/hearer)
 	if(isobserver(hearer))
diff --git a/code/modules/language/machine.dm b/code/modules/language/machine.dm
index bfbbe6bb8e9..1241ce02510 100644
--- a/code/modules/language/machine.dm
+++ b/code/modules/language/machine.dm
@@ -11,8 +11,7 @@
 	space_chance = 10
 	default_priority = 90
 
-	icon = 'icons/mob/robots.dmi'
-	icon_state = "robot_old"
+	icon_state = "eal"
 
 /datum/language/machine/get_random_name()
 	if(prob(70))
diff --git a/code/modules/language/monkey.dm b/code/modules/language/monkey.dm
index 0817689074c..bc1ff6a8e7b 100644
--- a/code/modules/language/monkey.dm
+++ b/code/modules/language/monkey.dm
@@ -10,5 +10,4 @@
 	syllables = list("oop", "aak", "chee", "eek")
 	default_priority = 80
 
-	icon = 'icons/obj/hydroponics/harvest.dmi'
-	icon_state = "banana"
+	icon_state = "animal"
diff --git a/code/modules/language/ratvar.dm b/code/modules/language/ratvar.dm
index bd0280d1bb0..51fc57f045e 100644
--- a/code/modules/language/ratvar.dm
+++ b/code/modules/language/ratvar.dm
@@ -8,8 +8,7 @@
 	default_priority = 10
 	spans = list(SPAN_ROBOT, "brass")
 
-	icon = 'icons/obj/clockwork_objects.dmi'
-	icon_state = "wall_gear"
+	icon_state = "ratvar"
 
 /datum/language/ratvar/scramble(var/input)
 	. = text2ratvar(input)
diff --git a/code/modules/language/slime.dm b/code/modules/language/slime.dm
index c70902c14c8..f1398ef1ba2 100644
--- a/code/modules/language/slime.dm
+++ b/code/modules/language/slime.dm
@@ -9,5 +9,4 @@
 	syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!")
 	default_priority = 70
 
-	icon = 'icons/mob/slimes.dmi'
-	icon_state = "grey adult slime"
+	icon_state = "slime"
diff --git a/code/modules/language/swarmer.dm b/code/modules/language/swarmer.dm
index a1145a123d6..318c3f48f75 100644
--- a/code/modules/language/swarmer.dm
+++ b/code/modules/language/swarmer.dm
@@ -11,7 +11,6 @@
 	sentence_chance = 0
 	default_priority = 60
 
-	icon = 'icons/mob/swarmer.dmi'
 	icon_state = "swarmer"
 
 	// since various flats and sharps are the same,
diff --git a/code/modules/language/xenocommon.dm b/code/modules/language/xenocommon.dm
index fd53405d477..790c56fd4e6 100644
--- a/code/modules/language/xenocommon.dm
+++ b/code/modules/language/xenocommon.dm
@@ -9,5 +9,4 @@
 	syllables = list("sss","sSs","SSS")
 	default_priority = 50
 
-	icon = 'icons/mob/alien.dmi'
-	icon_state = "alienq"
+	icon_state = "xeno"
diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi
new file mode 100644
index 00000000000..e3ad574d676
Binary files /dev/null and b/icons/misc/language.dmi differ