diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm
index ec134731f3e..0ae080a917a 100644
--- a/code/datums/greyscale/config_types/greyscale_configs.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -928,6 +928,15 @@
 	icon_file = 'icons/mob/clothing/suits/costume.dmi'
 	json_config = 'code/datums/greyscale/json_configs/football_armor_worn.json'
 
+/datum/greyscale_config/hawaiian_shirt
+	name = "Hawaiian Overshirt"
+	icon_file = 'icons/obj/clothing/suits/costume.dmi'
+	json_config = 'code/datums/greyscale/json_configs/hawaiian_shirt.json'
+
+/datum/greyscale_config/hawaiian_shirt/worn
+	name = "Hawaiian Overshirt"
+	icon_file = 'icons/mob/clothing/suits/costume.dmi'
+
 /datum/greyscale_config/waistcoat
 	name = "Waistcoat"
 	icon_file = 'icons/obj/clothing/accessories.dmi'
diff --git a/code/datums/greyscale/json_configs/hawaiian_shirt.json b/code/datums/greyscale/json_configs/hawaiian_shirt.json
new file mode 100644
index 00000000000..c3291638780
--- /dev/null
+++ b/code/datums/greyscale/json_configs/hawaiian_shirt.json
@@ -0,0 +1,16 @@
+{
+	"hawaiian_shirt": [
+		{
+			"type": "icon_state",
+			"icon_state": "hawaiianbase",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "hawaiianflowers",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index c8faa7e86ad..87fa1697ef9 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -519,8 +519,12 @@
 /obj/item/clothing/suit/costume/hawaiian
 	name = "hawaiian overshirt"
 	desc = "A cool shirt for chilling on the beach."
-	icon_state = "hawaiian_blue"
+	icon_state = "hawaiian_shirt"
 	inhand_icon_state = null
+	greyscale_config = /datum/greyscale_config/hawaiian_shirt
+	greyscale_config_worn = /datum/greyscale_config/hawaiian_shirt/worn
+	greyscale_colors = "#313B82#CCCFF0"
+	flags_1 = IS_PLAYER_COLORABLE_1
 	species_exception = list(/datum/species/golem)
 
 /obj/item/clothing/suit/costume/football_armor
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index fc17dbd1628..81e014a1a7a 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -98,6 +98,7 @@
 				/obj/item/clothing/suit/jacket/puffer = 2,
 				/obj/item/clothing/suit/jacket/letterman = 2,
 				/obj/item/clothing/suit/jacket/letterman_red = 2,
+				/obj/item/clothing/suit/costume/hawaiian = 4,
 				/obj/item/clothing/suit/costume/poncho = 1,
 				/obj/item/clothing/under/dress/skirt = 2,
 				/obj/item/clothing/under/suit/white/skirt = 2,
diff --git a/icons/mob/clothing/suits/costume.dmi b/icons/mob/clothing/suits/costume.dmi
index 6b7db830a01..d681e492d9e 100644
Binary files a/icons/mob/clothing/suits/costume.dmi and b/icons/mob/clothing/suits/costume.dmi differ
diff --git a/icons/obj/clothing/suits/costume.dmi b/icons/obj/clothing/suits/costume.dmi
index 97e9d31b6c1..86c77feb991 100644
Binary files a/icons/obj/clothing/suits/costume.dmi and b/icons/obj/clothing/suits/costume.dmi differ