diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 0db6e6d001..06a090cc53 100755
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -344,16 +344,14 @@
 	heat = 3800
 	toolspeed = 1
 
-/obj/item/weapon/weldingtool/New()
-	..()
+/obj/item/weapon/weldingtool/Initialize()
+	. = ..()
 	create_reagents(max_fuel)
 	reagents.add_reagent("welding_fuel", max_fuel)
 	update_icon()
-	return
 
 
 /obj/item/weapon/weldingtool/proc/update_torch()
-	cut_overlays()
 	if(welding)
 		add_overlay("[initial(icon_state)]-on")
 		item_state = "[initial(item_state)]1"
@@ -362,13 +360,11 @@
 
 
 /obj/item/weapon/weldingtool/update_icon()
+	cut_overlays()
 	if(change_icons)
 		var/ratio = get_fuel() / max_fuel
 		ratio = Ceiling(ratio*4) * 25
-		if(ratio == 100)
-			icon_state = initial(icon_state)
-		else
-			icon_state = "[initial(icon_state)][ratio]"
+		add_overlay("[initial(icon_state)][ratio]")
 	update_torch()
 	return
 
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index cdbaa9e248..3ab2087cd9 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ