diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm
index a68908932f..3e42dec29c 100644
--- a/code/game/objects/items/weapons/material/material_armor.dm
+++ b/code/game/objects/items/weapons/material/material_armor.dm
@@ -353,21 +353,28 @@ Protectiveness | Armor %
 	else
 		..()
 
+/obj/item/material/armor_plating/insert/proc/trim(var/mob/user)
+	to_chat(user, SPAN_NOTICE("You trim down the edges to size."))
+	user.drop_from_inventory(src)
+	user.put_in_hands(new /obj/item/clothing/accessory/material/makeshift/light(user, material.name))
+	qdel(src)
+
 //Make plating inserts for modular armour.
 /obj/item/material/armor_plating/insert/attackby(var/obj/O, mob/user)
 
 	. = ..()
 
 	if(istype(O, /obj/item/weldingtool))
-		var /obj/item/weldingtool/S = O
+		var/obj/item/weldingtool/S = O
+		if(!S.isOn())
+			return TRUE
 		if(S.remove_fuel(0,user))
-			if(!src || !S.isOn()) return
-			to_chat(user, "<span class='notice'>You trim down the edges to size.</span>")
-			user.drop_from_inventory(src)
-			var/obj/item/clothing/accessory/material/makeshift/light/new_armor = new(null, src.material.name)
-			user.put_in_hands(new_armor)
-			qdel(src)
-			return
+			trim(user)
+			return TRUE
+
+	if(O.sharp && material?.integrity <= 75) // wood and chitin
+		trim(user)
+		return TRUE
 
 	if(istype(O, /obj/item/material/armor_plating/insert))
 		var/obj/item/material/armor_plating/insert/second_plate = O
@@ -441,4 +448,4 @@ Protectiveness | Armor %
 	icon_state = "material_armor_makeshift"
 
 /obj/item/clothing/head/helmet/material/makeshift/durasteel
-	default_material = "durasteel"
\ No newline at end of file
+	default_material = "durasteel"
diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
index d8c1ee8875..de99c6f6da 100644
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -76,7 +76,7 @@
 
 /obj/item/material/Destroy()
 	STOP_PROCESSING(SSobj, src)
-	. = ..()
+	return ..()
 
 /obj/item/material/apply_hit_effect()
 	..()
diff --git a/code/modules/clothing/under/accessories/crafted/poncho.dm b/code/modules/clothing/under/accessories/crafted/poncho.dm
index fb69e4403c..65df9d9b91 100644
--- a/code/modules/clothing/under/accessories/crafted/poncho.dm
+++ b/code/modules/clothing/under/accessories/crafted/poncho.dm
@@ -57,6 +57,12 @@
 	QDEL_NULL_LIST(plates)
 	return ..()
 
+/obj/item/clothing/accessory/storage/poncho/crafted/update_clothing_icon()
+	if(ismob(loc))
+		var/mob/M = src.loc
+		M.update_inv_wear_suit()
+	. = ..()
+
 /obj/item/clothing/accessory/storage/poncho/crafted/proc/recalculate_armor()
 	LAZYINITLIST(armor)
 	if(!initial_armor)
@@ -115,10 +121,10 @@
 			to_chat(user, SPAN_WARNING("\The [src] has no plating to remove."))
 		else
 			var/obj/item/plate = plates[1]
-			user.visible_message(SPAN_NOTICE("\The [src] removes \the [plate] from \the [src]."))
-			recalculate_armor()
+			user.visible_message(SPAN_NOTICE("\The [user] removes \the [plate] from \the [src]."))
 			plate.dropInto(user.loc)
 			LAZYREMOVE(plates, plate)
+			recalculate_armor()
 		return TRUE
 
 	if(istype(O, /obj/item/reagent_containers/glass))
diff --git a/icons/mob/species/teshari/crafted_cloak.dmi b/icons/mob/species/teshari/crafted_cloak.dmi
index b330184226..839ff53cdd 100644
Binary files a/icons/mob/species/teshari/crafted_cloak.dmi and b/icons/mob/species/teshari/crafted_cloak.dmi differ
diff --git a/icons/mob/species/teshari/crafted_poncho.dmi b/icons/mob/species/teshari/crafted_poncho.dmi
index b00f545418..680f9487bb 100644
Binary files a/icons/mob/species/teshari/crafted_poncho.dmi and b/icons/mob/species/teshari/crafted_poncho.dmi differ