diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index 6c43f7c9ead..af1e3376687 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -124,6 +124,10 @@
 	name = "Pyromancer REAL_NAME"
 	speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "ONI SOMA!")
 
+/datum/dog_fashion/head/black_wizard
+	name = "Necromancer REAL_NAME"
+	speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
+
 /datum/dog_fashion/head/cardborg
 	name = "Borgi"
 	speak = list("Ping!","Beep!","Woof!")
@@ -148,6 +152,8 @@
 	name = "Corgi Tech REAL_NAME"
 	desc = "The reason your yellow gloves have chew-marks."
 
+/datum/dog_fashion/head/softcap
+
 /datum/dog_fashion/head/reindeer
 	name = "REAL_NAME the red-nosed Corgi"
 	emote_hear = list("lights the way!", "illuminates.", "yaps!")
@@ -208,3 +214,38 @@
 /datum/dog_fashion/head/fried_vox_empty
 	name = "Colonel REAL_NAME"
 	desc = "Keep away from live vox."
+
+/datum/dog_fashion/head/HoS
+	name = "Head of Security REAL_NAME"
+	desc = "Probably better than the last HoS."
+
+/datum/dog_fashion/head/beret/sec
+	name = "Officer REAL_NAME"
+	desc = "Ever-loyal, ever-vigilant."
+
+/datum/dog_fashion/head/bowlerhat
+	name = "REAL_NAME"
+	desc = "A sophisticated city gent."
+
+/datum/dog_fashion/head/surgery
+	name = "Nurse-in-Training REAL_NAME"
+	desc = "The most adorable bed-side manner ever."
+
+/datum/dog_fashion/head/bucket
+	name = "REAL_NAME"
+	desc = "A janitor's best friend."
+
+/datum/dog_fashion/head/justice_wig
+	name = "Arbiter REAL_NAME"
+	desc = "Head of the High Court of Cute."
+
+/datum/dog_fashion/head/wizard/magus
+	name = "Battlemage REAL_NAME"
+
+/datum/dog_fashion/head/wizard/marisa
+	name = "Witch REAL_NAME"
+	desc = "Flying broom not included."
+
+/datum/dog_fashion/head/roman
+	name = "Imperator REAL_NAME"
+	desc = "For the Senate and the people of Rome!"
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index dc880f82541..95c4e04b3ac 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -55,14 +55,12 @@
 	icon_state = "hardhat0_orange"
 	item_state = "hardhat0_orange"
 	item_color = "orange"
-	dog_fashion = null
 
 /obj/item/clothing/head/hardhat/red
 	name = "firefighter helmet"
 	icon_state = "hardhat0_red"
 	item_state = "hardhat0_red"
 	item_color = "red"
-	dog_fashion = null
 	flags = STOPSPRESSUREDMAGE
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
@@ -84,7 +82,6 @@
 	icon_state = "hardhat0_dblue"
 	item_state = "hardhat0_dblue"
 	item_color = "dblue"
-	dog_fashion = null
 
 /obj/item/clothing/head/hardhat/atmos
 	name = "atmospheric technician's firefighting helmet"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index bafe3a9f0a9..e8ce88dba1e 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -162,7 +162,7 @@
 	icon_state = "roman"
 	item_state = "roman"
 	strip_delay = 100
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/roman
 
 /obj/item/clothing/head/helmet/roman/fake
 	desc = "An ancient helmet made of plastic and leather."
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 44b1431bdfe..db5da84af68 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -25,7 +25,7 @@
 	name = "captain's parade cap"
 	desc = "Worn only by Captains with an abundance of class."
 	icon_state = "capcap"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/captain
 
 //Head of Personnel
 /obj/item/clothing/head/hopcap
@@ -106,11 +106,13 @@
 	icon_state = "hoscap"
 	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60)
 	strip_delay = 80
+	dog_fashion = /datum/dog_fashion/head/HoS
 
 /obj/item/clothing/head/HoS/beret
 	name = "head of security's beret"
 	desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
 	icon_state = "beret_hos_black"
+	dog_fashion = /datum/dog_fashion/head/HoS
 
 /obj/item/clothing/head/warden
 	name = "warden's police hat"
@@ -134,7 +136,7 @@
 	icon_state = "beret_officer"
 	armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
 	strip_delay = 60
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/beret/sec
 
 /obj/item/clothing/head/beret/sec/warden
 	name = "warden's beret"
@@ -180,15 +182,19 @@
 /obj/item/clothing/head/surgery/purple
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple."
 	icon_state = "surgcap_purple"
+	dog_fashion = /datum/dog_fashion/head/surgery
 
 /obj/item/clothing/head/surgery/blue
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue."
 	icon_state = "surgcap_blue"
+	dog_fashion = /datum/dog_fashion/head/surgery
 
 /obj/item/clothing/head/surgery/green
 	desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
 	icon_state = "surgcap_green"
+	dog_fashion = /datum/dog_fashion/head/surgery
 
 /obj/item/clothing/head/surgery/black
 	desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers.  It is as dark than the coroner's humor."
 	icon_state = "surgcap_black"
+	dog_fashion = /datum/dog_fashion/head/surgery
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index ba01f0347b2..388fa0374ed 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -25,6 +25,7 @@
 	desc = "A fancy powdered wig given to arbitrators of the law. It looks itchy."
 	icon_state = "jwig"
 	item_state = "jwig"
+	dog_fashion = /datum/dog_fashion/head/justice_wig
 
 /obj/item/clothing/head/beret/blue
 	icon_state = "beret_blue"
@@ -187,6 +188,7 @@
 	icon_state = "bowler_hat"
 	item_state = "bowler_hat"
 	desc = "For that industrial age look."
+	dog_fashion = /datum/dog_fashion/head/bowlerhat
 
 /obj/item/clothing/head/beaverhat
 	name = "beaver hat"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 818e92eb667..dd2c70692f5 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -38,35 +38,35 @@
 	desc = "It's a baseball hat in a tasteless red colour."
 	icon_state = "redsoft"
 	item_color = "red"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/blue
 	name = "blue cap"
 	desc = "It's a baseball hat in a tasteless blue colour."
 	icon_state = "bluesoft"
 	item_color = "blue"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/green
 	name = "green cap"
 	desc = "It's a baseball hat in a tasteless green colour."
 	icon_state = "greensoft"
 	item_color = "green"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/yellow
 	name = "yellow cap"
 	desc = "It's a baseball hat in a tasteless yellow colour."
 	icon_state = "yellowsoft"
 	item_color = "yellow"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/grey
 	name = "grey cap"
 	desc = "It's a baseball hat in a tasteful grey colour."
 	icon_state = "greysoft"
 	item_color = "grey"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/orange
 	name = "orange cap"
@@ -79,28 +79,28 @@
 	desc = "It's a baseball hat in a tasteless white colour."
 	icon_state = "mimesoft"
 	item_color = "mime"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/purple
 	name = "purple cap"
 	desc = "It's a baseball hat in a tasteless purple colour."
 	icon_state = "purplesoft"
 	item_color = "purple"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/black
 	name = "black cap"
 	desc = "It's a baseball hat in a tasteless black colour."
 	icon_state = "blacksoft"
 	item_color = "black"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/rainbow
 	name = "rainbow cap"
 	desc = "It's a baseball hat in a bright rainbow of colors."
 	icon_state = "rainbowsoft"
 	item_color = "rainbow"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/sec
 	name = "security cap"
@@ -109,7 +109,7 @@
 	item_color = "sec"
 	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
 	strip_delay = 60
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/softcap
 
 /obj/item/clothing/head/soft/sec/corp
 	name = "corporate security cap"
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 5b35f14f943..d7c146e3602 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -22,7 +22,7 @@
 	name = "black wizard hat"
 	desc = "Strange-looking black hat-wear that most certainly belongs to a real skeleton. Spooky."
 	icon_state = "blackwizard"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/black_wizard
 
 /obj/item/clothing/head/wizard/clown
 	name = "purple wizard hat"
@@ -58,14 +58,14 @@
 	name = "witch hat"
 	desc = "Strange-looking hat-wear, makes you want to cast fireballs."
 	icon_state = "marisa"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/wizard/marisa
 
 /obj/item/clothing/head/wizard/magus
 	name = "magus helm"
 	desc = "A mysterious helmet that hums with an unearthly power"
 	icon_state = "magus"
 	item_state = "magus"
-	dog_fashion = null
+	dog_fashion = /datum/dog_fashion/head/wizard/magus
 
 /obj/item/clothing/head/wizard/amp
 	name = "psychic amplifier"
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index c5a5195a848..bead1467de5 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -297,6 +297,7 @@
 	slot_flags = SLOT_HEAD
 	resistance_flags = NONE
 	container_type = OPENCONTAINER
+	dog_fashion = /datum/dog_fashion/head/bucket
 
 /obj/item/reagent_containers/glass/bucket/wooden
 	name = "wooden bucket"
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index 7492b40833d..9c84a030aaf 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ