diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
index f69aa95594..ceed083b4d 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -493,7 +493,7 @@
 		list("MRE", round(scale * 15), /obj/item/reagent_container/food/snacks/upp, VENDOR_ITEM_REGULAR),
 
 		list("TOOLS", -1, null, null),
-		list("Type 50 Entrenching Tool", round(scale * 2), /obj/item/tool/shovel/etoolupp/folded, VENDOR_ITEM_REGULAR),
+		list("Type 50 Entrenching Tool", round(scale * 2), /obj/item/tool/shovel/etool/upp/folded, VENDOR_ITEM_REGULAR),
 		list("Screwdriver", round(scale * 5), /obj/item/tool/screwdriver/tactical, VENDOR_ITEM_REGULAR),
 		list("Wirecutters", round(scale * 5), /obj/item/tool/wirecutters/tactical, VENDOR_ITEM_REGULAR),
 		list("Crowbar", round(scale * 5), /obj/item/tool/crowbar/tactical, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/items/tools/shovel_tools.dm b/code/game/objects/items/tools/shovel_tools.dm
index 192d0fb6a1..28389c4a3a 100644
--- a/code/game/objects/items/tools/shovel_tools.dm
+++ b/code/game/objects/items/tools/shovel_tools.dm
@@ -218,14 +218,21 @@
 	dirt_amt_per_dig = 5
 	shovelspeed = 50
 
+/obj/item/tool/shovel/etool/Initialize()
+	. = ..()
+	update_icon()
+	if(folded)
+		w_class = SIZE_SMALL
+		force = 5
+		hitsound = 'sound/weapons/genhit3.ogg'
 
 /obj/item/tool/shovel/etool/update_icon()
 	if(folded)
-		icon_state = "etool_c"
-		item_state = "etool_c"
+		icon_state = "[initial(icon_state)]_c"
+		item_state = "[initial(item_state)]_c"
 	else
-		icon_state = "etool"
-		item_state = "etool"
+		icon_state = initial(icon_state)
+		item_state = initial(item_state)
 	..()
 
 
@@ -234,59 +241,23 @@
 	if(folded)
 		w_class = SIZE_SMALL
 		force = 5
+		hitsound = 'sound/weapons/genhit3.ogg'
 	else
 		w_class = SIZE_LARGE
 		force = 30
+		hitsound = initial(hitsound)
 	..()
 
 /obj/item/tool/shovel/etool/folded
 	folded = TRUE
-	w_class = SIZE_SMALL
-	force = 5
-	icon_state = "etool_c"
-	item_state = "etool_c"
-	hitsound = 'sound/weapons/genhit3.ogg'
 
-/obj/item/tool/shovel/etoolupp
+/obj/item/tool/shovel/etool/upp
 	name = "Type 50 entrenching tool"
 	desc = "A serviceman's best friend. Dually useful for digging foxholes and bashing in heads. Folds in half for easier storage."
-	icon = 'icons/obj/items/marine-items.dmi'
 	icon_state = "etoolupp"
 	item_state = "etoolupp"
-	force = 30
-	throwforce = 2
-	w_class = SIZE_LARGE
-	hitsound = 'sound/weapons/bladeslice.ogg'
-
 	dirt_overlay = "etoolupp_overlay"
-	dirt_amt_per_dig = 5
-	shovelspeed = 50
 
-/obj/item/tool/shovel/etoolupp/update_icon()
-	if(folded)
-		icon_state = "etoolupp_c"
-		item_state = "etoolupp_c"
-	else
-		icon_state = "etoolupp"
-		item_state = "etoolupp"
-	..()
-
-/obj/item/tool/shovel/etoolupp/attack_self(mob/user as mob)
-	folded = !folded
-	if(folded)
-		w_class = SIZE_SMALL
-		force = 5
-		hitsound = 'sound/weapons/genhit3.ogg'
-	else
-		w_class = SIZE_LARGE
-		force = 30
-		hitsound = 'sound/weapons/bladeslice.ogg'
-	..()
-
-/obj/item/tool/shovel/etoolupp/folded
+/obj/item/tool/shovel/etool/upp/folded
 	folded = TRUE
-	w_class = SIZE_SMALL
-	force = 5
-	icon_state = "etoolupp_c"
-	item_state = "etoolupp_c"
-	hitsound = 'sound/weapons/genhit3.ogg'
+
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index a0d78c1301..be207bea8b 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -706,7 +706,7 @@
 
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/etool(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etoolupp/folded(new_human), WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/upp/folded(new_human), WEAR_IN_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE)
 
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 4e49104b54..cdf08e202d 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -124,7 +124,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/compass, WEAR_IN_R_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etoolupp/folded, WEAR_IN_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/upp/folded, WEAR_IN_R_STORE)
 
 	var/random_gear = rand(1,5)
 	switch(random_gear)