diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
index c1d0102d225..c289e26a009 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
@@ -1,6 +1,6 @@
 /datum/gear/suit/unathi_mantle
 	display_name = "hide mantle"
-	path = /obj/item/clothing/suit/unathi/mantle
+	path = /obj/item/clothing/accessory/poncho/unathimantle
 	cost = 1
 	whitelisted = list(SPECIES_UNATHI)
 	sort_category = "Xenowear - Unathi"
diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm
index a60d659c89a..ce6fb04afda 100644
--- a/code/modules/clothing/suits/alien.dm
+++ b/code/modules/clothing/suits/alien.dm
@@ -27,13 +27,6 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
 	contained_sprite = 1
 
-/obj/item/clothing/suit/unathi/mantle
-	name = "hide mantle"
-	desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
-	icon_state = "mantle-unathi"
-	item_state = "mantle-unathi"
-	body_parts_covered = UPPER_TORSO
-
 //Vaurca clothing
 
 /obj/item/clothing/suit/vaurca
diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm
index 99d7a47a265..504cc121fb6 100644
--- a/code/modules/clothing/under/xenos/unathi.dm
+++ b/code/modules/clothing/under/xenos/unathi.dm
@@ -130,3 +130,12 @@
 	item_state = "thakh_mask"
 	species_restricted = list(BODYTYPE_UNATHI)
 	contained_sprite = TRUE
+
+/obj/item/clothing/accessory/poncho/unathimantle
+	name = "hide mantle"
+	desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
+	icon = 'icons/obj/unathi_items.dmi'
+	icon_state = "mantle-unathi"
+	item_state = "mantle-unathi"
+	icon_override = null
+	contained_sprite = TRUE
\ No newline at end of file
diff --git a/html/changelogs/wickedcybs_mantle.yml b/html/changelogs/wickedcybs_mantle.yml
new file mode 100644
index 00000000000..c1ef79a46f2
--- /dev/null
+++ b/html/changelogs/wickedcybs_mantle.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: WickedCybs
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "The Unathi hide mantle is now a poncho-type accessory, so it can attach to clothing and suits."
\ No newline at end of file
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 797bf69929d..61d77560c2d 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 20e96863689..6140c7678ba 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi
index 486794d9c60..66c9703f568 100644
Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ