diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 9127b5bc00b..e55739528d6 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -204,7 +204,6 @@
  */
 /obj/item/weapon/weldingtool
 	name = "welding tool"
-	desc = "Ensure the switch is safely in the off position before refueling."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "welder"
 	hitsound = 'sound/weapons/toolhit.ogg'
@@ -294,7 +293,7 @@
 			if(src.icon_state != "welder") //Check that the sprite is correct, if it isnt, it means toggle() was not called
 				src.force = 3
 				src.damtype = "brute"
-				update_icon()
+				src.icon_state = "welder"
 				src.hitsound = "sound/weapons/toolhit.ogg"
 				src.welding = 0
 			processing_objects.Remove(src)
@@ -304,7 +303,7 @@
 			if(src.icon_state != "welder1") //Check that the sprite is correct, if it isnt, it means toggle() was not called
 				src.force = 15
 				src.damtype = "fire"
-				update_icon()
+				src.icon_state = "welder1"
 				src.hitsound = "sound/weapons/welderattack.ogg"
 			if(prob(5))
 				remove_fuel(1)
@@ -400,7 +399,7 @@
 			to_chat(usr, "<span class='notice'>\The [src] switches on.</span>")
 			src.force = 15
 			src.damtype = "fire"
-			update_icon()
+			src.icon_state = "welder1"
 			processing_objects.Add(src)
 		else
 			to_chat(usr, "<span class='notice'>Need more fuel!</span>")
@@ -411,7 +410,7 @@
 		to_chat(usr, "<span class='notice'>\The [src] switches off.</span>")
 		src.force = 3
 		src.damtype = "brute"
-		update_icon()
+		src.icon_state = "welder"
 		src.welding = 0
 
 //Turns off the welder if there is no more fuel (does this really need to be its own proc?)
@@ -432,7 +431,7 @@
 			to_chat(usr, "<span class='notice'>You switch the [src] on.</span>")
 			src.force = 15
 			src.damtype = "fire"
-			update_icon()
+			src.icon_state = "welder1"
 			processing_objects.Add(src)
 		else
 			to_chat(usr, "<span class='notice'>Need more fuel!</span>")
@@ -445,7 +444,7 @@
 			to_chat(usr, "<span class='notice'>\The [src] shuts off!</span>")
 		src.force = 3
 		src.damtype = "brute"
-		update_icon()
+		src.icon_state = "welder"
 		src.welding = 0
 
 //Decides whether or not to damage a player's eyes based on what they're wearing as protection
@@ -498,18 +497,11 @@
 				spawn(100)
 					user.disabilities &= ~NEARSIGHTED
 
-/obj/item/weapon/weldingtool/update_icon()
-	..()
-	icon_state = "[initial(icon_state)][welding ? "1" : ""]" //Ternary operator.
-
-
 /obj/item/weapon/weldingtool/empty
 	start_fueled = 0
 
 /obj/item/weapon/weldingtool/largetank
 	name = "Industrial Welding Tool"
-	desc = "The cutting edge between portability and tank size."
-	icon_state = "welder_large"
 	max_fuel = 40
 	starting_materials = list(MAT_IRON = 70, MAT_GLASS = 60)
 	origin_tech = Tc_ENGINEERING + "=2"
@@ -519,8 +511,6 @@
 
 /obj/item/weapon/weldingtool/hugetank
 	name = "Upgraded Welding Tool"
-	desc = "A large tank for a large job."
-	icon_state = "welder_larger"
 	max_fuel = 80
 	w_class = W_CLASS_MEDIUM
 	starting_materials = list(MAT_IRON = 70, MAT_GLASS = 120)
@@ -529,19 +519,6 @@
 /obj/item/weapon/weldingtool/hugetank/empty
 	start_fueled = 0
 
-/obj/item/weapon/weldingtool/gatling
-	name = "gatling welder"
-	desc = "Engineering Dakka."
-	icon_state = "welder_gatling"
-	max_fuel = 160
-	w_class = W_CLASS_HUGE
-	starting_materials = list(MAT_IRON = 18750, MAT_GLASS = 18750)
-	origin_tech = Tc_ENGINEERING + "=4"
-
-/obj/item/weapon/weldingtool/gatling/empty
-	start_fueled = 0
-
-
 /obj/item/weapon/weldingtool/experimental
 	name = "Experimental Welding Tool"
 	max_fuel = 40
diff --git a/icons/mob/in-hand/left/items_lefthand.dmi b/icons/mob/in-hand/left/items_lefthand.dmi
index 65c4f2f1bf0..6a58f2540b4 100644
Binary files a/icons/mob/in-hand/left/items_lefthand.dmi and b/icons/mob/in-hand/left/items_lefthand.dmi differ
diff --git a/icons/mob/in-hand/right/items_righthand.dmi b/icons/mob/in-hand/right/items_righthand.dmi
index 1aabbc8298f..e61de57eb8d 100644
Binary files a/icons/mob/in-hand/right/items_righthand.dmi and b/icons/mob/in-hand/right/items_righthand.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index be479d0d60a..93801a252be 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ