diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 80fd9a8350..fc419375d9 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -198,28 +198,25 @@
 		"Saber" = list("icon_state" = "esaber0")
 	)
 	var/hacked = FALSE
-	var/saber = FALSE
 
 /obj/item/melee/transforming/energy/sword/saber/transform_weapon(mob/living/user, supress_message_text)
 	. = ..()
 	if(.)
-		if(active)
-			switch(current_skin)
-				if("Sword")
-					icon_state = "sword[sword_color ? sword_color : "0"]"
-				if("Saber")
-					icon_state = "esaber[sword_color ? sword_color : "0"]"
+		switch(current_skin)
+			if("Sword")
+				icon_state = "sword[active ? sword_color : "0"]"
+			if("Saber")
+				icon_state = "esaber[active ? sword_color : "0"]"
 
 /obj/item/melee/transforming/energy/sword/saber/reskin_obj(mob/M)
 	. = ..()
 	if(!.)
 		return
-	if(active)
-		switch(current_skin)
-			if("Sword")
-				icon_state = "sword[sword_color]"
-			if("Saber")
-				icon_state = "esaber[sword_color]"
+	switch(current_skin)
+		if("Sword")
+			icon_state = "sword[active ? sword_color : "0"]"
+		if("Saber")
+			icon_state = "esaber[active ? sword_color : "0"]"
 
 /obj/item/melee/transforming/energy/sword/saber/set_sword_color(var/color_forced)
 	if(color_forced) // wow i really do not like this at fucking all holy SHIT
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 1e7236696e..adacf45218 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -573,3 +573,9 @@
 		"Non-binary Pride"  = list("icon_state" = "pride_enby"),
 		"Transgender Pride" = list("icon_state" = "pride_trans")
 	)
+
+/obj/item/clothing/accessory/pride/reskin_obj(mob/M)
+	. = ..()
+	if(!.)
+		return
+	name = "[current_skin] pin"