diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi
deleted file mode 100644
index 6f4933f5665b..000000000000
Binary files a/icons/mob/humans/onmob/back.dmi and /dev/null differ
diff --git a/icons/mob/humans/onmob/clothing/back/melee_weapons.dmi b/icons/mob/humans/onmob/clothing/back/melee_weapons.dmi
new file mode 100644
index 000000000000..90dad4159fba
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/melee_weapons.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/back/misc.dmi b/icons/mob/humans/onmob/clothing/back/misc.dmi
new file mode 100644
index 000000000000..0206ed8f7559
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/back/misc.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi
new file mode 100644
index 000000000000..894c5282f0f0
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/classic.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi
new file mode 100644
index 000000000000..86b887ab8f3a
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/desert.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi
new file mode 100644
index 000000000000..d4d1acf18c40
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/jungle.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi
new file mode 100644
index 000000000000..23c9f7e6aa2c
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/snow.dmi differ
diff --git a/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi b/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi
new file mode 100644
index 000000000000..7ec01525d8da
Binary files /dev/null and b/icons/mob/humans/onmob/clothing/head/hats_by_map/urban.dmi differ
diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi
index 5ee07890f72a..1af4621ad43c 100644
Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ
diff --git a/icons/mob/humans/onmob/__inhand_template.dmi b/icons/mob/humans/onmob/inhands/__inhand_template.dmi
similarity index 100%
rename from icons/mob/humans/onmob/__inhand_template.dmi
rename to icons/mob/humans/onmob/inhands/__inhand_template.dmi
diff --git a/icons/obj/items/clothing/hats/hats.dmi b/icons/obj/items/clothing/hats/hats.dmi
index 12b15acc68e7..b2f7568128a4 100644
Binary files a/icons/obj/items/clothing/hats/hats.dmi and b/icons/obj/items/clothing/hats/hats.dmi differ
diff --git a/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi b/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi
index fc7185cc179c..d3d3f43ff938 100644
Binary files a/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi and b/icons/obj/items/clothing/hats/hats_by_faction/UA.dmi differ
diff --git a/icons/obj/items/clothing/hats/soft_caps.dmi b/icons/obj/items/clothing/hats/soft_caps.dmi
index 87fa791b4fdc..6b05e9eb98ca 100644
Binary files a/icons/obj/items/clothing/hats/soft_caps.dmi and b/icons/obj/items/clothing/hats/soft_caps.dmi differ