diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
index cac2f025cf..8b1710f64f 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
@@ -742,12 +742,11 @@
 	allowed_roles = list("Explorer", "Pathfinder")
 
 /datum/gear/fluff/mocha_cloak
-	path = /obj/item/clothing/accessory/poncho/cloak/fluff/mocha
-	display_name = "Warden Cloak"
-	description = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
-	ckeywhitelist = list("mocatheporg1")
-	character_name = list("Mocha")
-	allowed_roles = list("Warden")
+    path = /obj/item/clothing/accessory/poncho/cloak/fluff/mocha
+    display_name = "Elaborate Cloak"
+    description = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
+    ckeywhitelist = list("mocatheporg1")
+    character_name = list("Mocha")
 
 //  N CKEYS
 //NESgamer190
diff --git a/code/modules/projectiles/projectile/energy_yw.dm b/code/modules/projectiles/projectile/energy_yw.dm
index 4e6c5eb923..0d13d1eec8 100644
--- a/code/modules/projectiles/projectile/energy_yw.dm
+++ b/code/modules/projectiles/projectile/energy_yw.dm
@@ -2,7 +2,7 @@
 //Gauss beam for gaussguns -RadiantFlash//
 /obj/item/projectile/energy/gauss
 	name = "gauss bolt"
-	icon = 'icons/obj/projectiles_yw.dmi'
+	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "gauss"
 	damage = 35
 	stun = 0
@@ -14,7 +14,7 @@
 
 /obj/item/projectile/energy/gaussweak.
 	name = "gauss bolt"
-	icon = 'icons/obj/projectiles_yw.dmi'
+	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "gauss"
 	damage = 25
 	stun = 0
@@ -26,7 +26,7 @@
 
 /obj/item/projectile/energy/gaussrifle
 	name = "gauss bolt"
-	icon = 'icons/obj/projectiles_yw.dmi'
+	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "gauss"
 	damage = 60
 	stun = 2
@@ -56,4 +56,4 @@
 	damage = 25
 	damage_type = BURN
 	pass_flags = PASSGRILLE
-	check_armour = "laser"
\ No newline at end of file
+	check_armour = "laser"
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index 88c913ef85..6983d8cb9f 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -1579,12 +1579,13 @@
 	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35)
 
 /obj/item/clothing/accessory/poncho/cloak/fluff/mocha
-	name = "Warden Cloak"
-	desc = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
-	icon = 'icons/vore/custom_clothes_yw.dmi'
-	icon_state = "mocha_cloak"
-	icon_override = "icons/vore/custom_clothes_yw.dmi"
-	item_state = "mocha_cloak_s"
+    name = "Elaborate Cloak"
+    desc = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
+    icon = 'icons/vore/custom_clothes_yw.dmi'
+    icon_state = "mocha_cloak"
+    icon_override = 'icons/vore/custom_clothes_yw.dmi'
+    item_state = "mocha_cloak_s"
+    overlay_state = "mocha_cloak_s"
 
 // ******
 // Lawst
diff --git a/icons/obj/projectiles_yw.dmi b/icons/obj/projectiles_yw.dmi
index fa8c8e43a4..a65db3828f 100644
Binary files a/icons/obj/projectiles_yw.dmi and b/icons/obj/projectiles_yw.dmi differ