Ok, done.

code/modules/surgery/organs/appendix.dm

@@ -19,7 +19,7 @@
 	if(M)
 		M.adjustToxLoss(4, TRUE, TRUE)	//forced to ensure people don't use it to gain tox as slime person
 
-/obj/item/organ/appendix/update_icon()
+/obj/item/organ/appendix/update_icon_state()
 	if(inflamed)
 		icon_state = "appendixinflamed"
 		name = "inflamed appendix"

code/modules/surgery/organs/augments_arms.dm

@@ -31,7 +31,7 @@
 		else
 			CRASH("Invalid zone for [type]")
 
-/obj/item/organ/cyberimp/arm/update_icon()
+/obj/item/organ/cyberimp/arm/update_icon_state()
 	if(zone == BODY_ZONE_R_ARM)
 		transform = null
 	else // Mirroring the icon

code/modules/surgery/organs/augments_chest.dm

@@ -178,14 +178,11 @@
 		on = FALSE
 	update_icon()
 
-/obj/item/organ/cyberimp/chest/thrusters/update_icon()
+/obj/item/organ/cyberimp/chest/thrusters/update_icon_state()
 	if(on)
 		icon_state = "imp_jetpack-on"
 	else
 		icon_state = "imp_jetpack"
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.UpdateButtonIcon()
 
 /obj/item/organ/cyberimp/chest/thrusters/proc/move_react()
 	allow_thrust(0.01)

code/modules/surgery/organs/heart.dm

@@ -22,7 +22,7 @@
 	var/failed = FALSE		//to prevent constantly running failing code
 	var/operated = FALSE	//whether the heart's been operated on to fix some of its damages
 
-/obj/item/organ/heart/update_icon()
+/obj/item/organ/heart/update_icon_state()
 	if(beating)
 		icon_state = "[icon_base]-on"
 	else