diff --git a/code/datums/greyscale/json_configs/kitsune.json b/code/datums/greyscale/json_configs/kitsune.json
index bee64183213..495520fbbd8 100644
--- a/code/datums/greyscale/json_configs/kitsune.json
+++ b/code/datums/greyscale/json_configs/kitsune.json
@@ -12,5 +12,19 @@
 			"blend_mode": "overlay",
 			"color_ids": [ 2 ]
 		}
+	],
+	"kitsune_up": [
+		{
+			"type": "icon_state",
+			"icon_state": "kitsune_base_up",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "kitsune_stripe_up",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
 	]
 }
diff --git a/code/modules/clothing/masks/costume.dm b/code/modules/clothing/masks/costume.dm
index 844b823880a..ff980442565 100644
--- a/code/modules/clothing/masks/costume.dm
+++ b/code/modules/clothing/masks/costume.dm
@@ -38,6 +38,7 @@
 	icon_state = "kitsune"
 	inhand_icon_state = null
 	w_class = WEIGHT_CLASS_SMALL
+	adjusted_flags = ITEM_SLOT_HEAD
 	flags_inv = HIDEFACE|HIDEFACIALHAIR
 	custom_price = PAYCHECK_CREW
 	greyscale_colors = "#EEEEEE#AA0000"
@@ -45,6 +46,18 @@
 	greyscale_config_worn = /datum/greyscale_config/kitsune/worn
 	flags_1 = IS_PLAYER_COLORABLE_1
 
+/obj/item/clothing/mask/kitsune/examine(mob/user)
+	. = ..()
+	if(up)
+		. += "Use in-hand to wear as a mask!"
+		return
+	else
+		. += "Use in-hand to tie it up to wear as a hat!"
+
+/obj/item/clothing/mask/kitsune/attack_self(mob/user)
+	adjust_visor(user)
+	alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : null
+
 /obj/item/clothing/mask/rebellion
 	name = "rebellion mask"
 	desc = "Mask that is usually used during rebellions by insurgents. It covers the entire face and makes you unrecognizable."
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index db25b68413a..117511dd874 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 0aa05799831..59589317735 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ