diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index af48fb1b6dc..d1092212761 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -24,10 +24,12 @@
 /obj/mecha/combat/phazon/GrantActions(mob/living/user, human_occupant = 0)
 	..()
 	phasing_action.Grant(user, src)
+	switch_damtype_action.Grant(user, src)
 
 /obj/mecha/combat/phazon/RemoveActions(mob/living/user, human_occupant = 0)
 	..()
 	phasing_action.Remove(user)
+	switch_damtype_action.Remove(user)
 
 /obj/mecha/combat/phazon/New()
 	..()
@@ -36,26 +38,6 @@
 	ME = new /obj/item/mecha_parts/mecha_equipment/gravcatapult
 	ME.attach(src)
 
-/obj/mecha/combat/phazon/verb/switch_damtype()
-	set category = "Exosuit Interface"
-	set name = "Reconfigure arm microtool arrays"
-	set src = usr.loc
-	set popup_menu = 0
-	if(usr != occupant)
-		return
-	var/new_damtype = alert(occupant, "Arm Tool Selection", null, "Fists", "Torch", "Toxic Injector")
-	switch(new_damtype)
-		if("Fists")
-			damtype = "brute"
-			occupant_message("Your exosuit's hands form into fists.")
-		if("Torch")
-			damtype = "fire"
-			occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
-		if("Toxic Injector")
-			damtype = "tox"
-			occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
-	playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1)
-
 /obj/mecha/combat/phazon/get_commands()
 	var/output = {"<div class='wr'>
 						<div class='header'>Special</div>
@@ -65,9 +47,4 @@
 						</div>
 						"}
 	output += ..()
-	return output
-
-/obj/mecha/combat/phazon/Topic(href, href_list)
-	..()
-	if(href_list["switch_damtype"])
-		switch_damtype()
\ No newline at end of file
+	return output
\ No newline at end of file
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 297e76cf19f..2205a9f6a72 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1075,10 +1075,6 @@
 /obj/mecha/portableConnectorReturnAir()
 	return internal_tank.return_air()
 
-
-/////////////////////////
-////////  Verbs  ////////
-/////////////////////////
 /obj/mecha/proc/toggle_lights()
 	lights = !lights
 	if(lights)
diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
index 2db88a3b57b..db807634102 100644
--- a/code/game/mecha/mecha_actions.dm
+++ b/code/game/mecha/mecha_actions.dm
@@ -11,7 +11,7 @@
 	var/datum/action/innate/mecha/mech_smoke/smoke_action = new
 	var/datum/action/innate/mecha/mech_zoom/zoom_action = new
 	var/datum/action/innate/mecha/mech_toggle_phasing/phasing_action = new
-	// var/datum/action/innate/mecha/mech_switch_damtype/switch_damtype_action = new
+	var/datum/action/innate/mecha/mech_switch_damtype/switch_damtype_action = new
 
 /obj/mecha/proc/GrantActions(mob/living/user, human_occupant = 0)
 	if(human_occupant)
@@ -202,4 +202,28 @@
 	chassis.phasing = !chassis.phasing
 	button_icon_state = "mech_phasing_[chassis.phasing ? "on" : "off"]"
 	chassis.occupant_message("<font color=\"[chassis.phasing?"#00f\">En":"#f00\">Dis"]abled phasing.</font>")
+	UpdateButtonIcon()
+
+
+/datum/action/innate/mecha/mech_switch_damtype
+	name = "Reconfigure arm microtool arrays"
+	button_icon_state = "mech_damtype_brute"
+
+/datum/action/innate/mecha/mech_switch_damtype/Activate()
+	if(!owner || !chassis || chassis.occupant != owner)
+		return
+	var/new_damtype
+	switch(chassis.damtype)
+		if("tox")
+			new_damtype = "brute"
+			chassis.occupant_message("Your exosuit's hands form into fists.")
+		if("brute")
+			new_damtype = "fire"
+			chassis.occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
+		if("fire")
+			new_damtype = "tox"
+			chassis.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
+	chassis.damtype = new_damtype
+	button_icon_state = "mech_damtype_[new_damtype]"
+	playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1)
 	UpdateButtonIcon()
\ No newline at end of file