diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm
index 2532f9328ac..804116a2c09 100644
--- a/code/game/gamemodes/wizard/rightandwrong.dm
+++ b/code/game/gamemodes/wizard/rightandwrong.dm
@@ -60,7 +60,7 @@
 				if("mateba")
 					new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H))
 				if("crossbow")
-					new /obj/item/weapon/gun/projectile/automatic/crossbow(get_turf(H))
+					new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H))
 				if("nuclear")
 					var/obj/item/weapon/gun/energy/gun/nuclear/gat
 					gat.pin = /obj/item/device/firing_pin //no authentication pins for spawned guns. fun allowed.
@@ -86,9 +86,7 @@
 					gat.pin = /obj/item/device/firing_pin
 					new gat(get_turf(H))
 				if("speargun")
-					var/obj/item/weapon/gun/projectile/automatic/speargun/gat
-					gat.pin = /obj/item/device/firing_pin
-					new gat(get_turf(H))
+					new /obj/item/weapon/gun/projectile/automatic/speargun(get_turf(H))
 		else
 			switch (randomizemagic)
 				if("fireball")
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 6e128060017..1e74978d352 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -190,7 +190,7 @@
 	name = "foam dart crossbow"
 	desc = "A weapon favored by many overactive children. Ages 8 and up."
 	icon = 'icons/obj/gun.dmi'
-	icon_state = "crossbow"
+	icon_state = "crossbow100"
 	item_state = "crossbow"
 	w_class = 2.0
 	attack_verb = list("attacked", "struck", "hit")