diff --git a/modular_skyrat/master_files/code/modules/clothing/under/syndicate.dm b/modular_skyrat/master_files/code/modules/clothing/under/syndicate.dm
index 72047f599e7..336dab6ecb6 100644
--- a/modular_skyrat/master_files/code/modules/clothing/under/syndicate.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/under/syndicate.dm
@@ -141,7 +141,6 @@
 /obj/item/clothing/under/syndicate/skyrat/tactical/skirt/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/reskinable_item, /datum/atom_skin/tactical_skirtleneck)
-	RegisterSignal(src, COMSIG_OBJ_RESKIN, PROC_REF(on_reskin))
 
 /datum/atom_skin/tactical_skirtleneck
 	abstract_type = /datum/atom_skin/tactical_skirtleneck
@@ -155,6 +154,7 @@
 	new_icon_state = "syndicate_skirt"
 
 /obj/item/clothing/under/syndicate/skyrat/tactical/skirt/on_reskin()
+	. = ..()
 	if(icon_state == "syndicate_skirt")
 		desc = "A non-descript and slightly suspicious looking skirtleneck."
 		inhand_icon_state = "bl_suit"
diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/plant_bag.dm b/modular_skyrat/modules/primitive_cooking_additions/code/plant_bag.dm
index 555d6b107dd..3f834a92bef 100644
--- a/modular_skyrat/modules/primitive_cooking_additions/code/plant_bag.dm
+++ b/modular_skyrat/modules/primitive_cooking_additions/code/plant_bag.dm
@@ -21,18 +21,20 @@
 
 // This is so the linen reskin shows properly in the suit storage.
 /obj/item/storage/bag/plants/build_worn_icon(default_layer, default_icon_file, isinhands, female_uniform, override_state, override_file, mutant_styles)
-	var/datum/component/reskinable_item/reskin_component = GetComponent(/datum/component/reskinable_item)
-	if(default_layer == SUIT_STORE_LAYER && reskin_component && reskin_component.is_using_skin(/datum/atom_skin/plant_bag/linen))
-		override_file = 'modular_skyrat/modules/primitive_cooking_additions/icons/plant_bag_worn_mirror.dmi'
-
+	var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
+	if(default_layer == SUIT_STORE_LAYER)
+		for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
+			if(reskin_component.is_using_skin(/datum/atom_skin/plant_bag/linen))
+				override_file = 'modular_skyrat/modules/primitive_cooking_additions/icons/plant_bag_worn_mirror.dmi'
+				break
 	return ..()
 
 /// Simple helper to reskin this item into its primitive variant.
 /obj/item/storage/bag/plants/proc/make_primitive()
-	var/datum/component/reskinable_item/reskin_component = GetComponent(/datum/component/reskinable_item)
+	var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
 
-	if(reskin_component)
-		reskin_component.set_skin_by_name("Linen")
+	for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
+		reskin_component.set_skin_by_name(RESKIN_LINEN)
 
 /// A helper for the primitive variant, for mappers.
 /obj/item/storage/bag/plants/primitive
diff --git a/modular_zubbers/code/modules/surgery/tools.dm b/modular_zubbers/code/modules/surgery/tools.dm
index 105739e3714..33e52d15276 100644
--- a/modular_zubbers/code/modules/surgery/tools.dm
+++ b/modular_zubbers/code/modules/surgery/tools.dm
@@ -46,7 +46,7 @@
 
 /datum/atom_skin/drapes/default
 	preview_name = "default"
-	new_icon_state = "drapes"
+	new_icon_state = "surgical_drapes"
 	new_icon = 'icons/obj/medical/surgery_tools.dmi'
 
 /obj/item/retractor/Initialize(mapload)