diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 989b8bbf87f..092206cbff2 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1218,6 +1218,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	flags = FPRINT | TABLEPASS | NOSHIELD
 
 /obj/item/weapon/sword
+	var/color
 	name = "energy sword"
 	icon_state = "sword0"
 	var/active = 0.0
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index ca9be4e1732..bf5ba6de3bb 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -15,6 +15,8 @@ STUN BATON
 		target:fireloss += 20
 	..()
 
+/obj/item/weapon/sword/New()
+	color = pick("red","blue")
 
 /obj/item/weapon/sword/attack_self(mob/user as mob)
 	if ((user.mutations & 16) && prob(50))
@@ -28,7 +30,7 @@ STUN BATON
 		if(istype(src,/obj/item/weapon/sword/pirate))
 			src.icon_state = "cutlass1"
 		else
-			src.icon_state = "sword1"
+			src.icon_state = "sword[color]"
 		src.w_class = 4
 		playsound(user, 'saberon.ogg', 50, 1)
 	else
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index db339c55bf2..dfff5fbe341 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 671f0b5513f..4acb3e07636 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 11ce37b2d74..2ac1e390968 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ