diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 0983ef99ccc..98be5d71110 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -174,9 +174,9 @@
 	overlays.Cut()
 	if(welding)
 		overlays += "[initial(icon_state)]-on"
-		item_state = "welder1"
+		item_state = "[initial(item_state)]1"
 	else
-		item_state = "welder"
+		item_state = "[initial(item_state)]"
 
 /obj/item/weapon/weldingtool/update_icon()
 	if(change_icons)
@@ -394,6 +394,7 @@
 /obj/item/weapon/weldingtool/hugetank
 	name = "upgraded industrial welding tool"
 	icon_state = "upindwelder"
+	item_state = "upindwelder"
 	max_fuel = 80
 	w_class = 3.0
 	m_amt = 70
@@ -403,13 +404,13 @@
 /obj/item/weapon/weldingtool/experimental
 	name = "experimental welding tool"
 	icon_state = "exwelder"
+	item_state = "exwelder"
 	max_fuel = 40
 	w_class = 3.0
 	m_amt = 70
 	g_amt = 120
 	origin_tech = "engineering=4;plasmatech=3"
 	var/last_gen = 0
-	change_icons = 0
 
 
 //Proc to make the experimental welder generate fuel, optimized as fuck -Sieve
@@ -423,7 +424,9 @@
 
 /obj/item/weapon/weldingtool/experimental/process()
 	..()
-	fuel_gen()
+	if(reagents.total_volume < max_fuel)
+		fuel_gen()
+
 
 
 /*
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 92504c50588..03f29696ab6 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 568d7f77036..95a11631b4c 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index eb88c37ab98..260d51c4303 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ