diff --git a/code/modules/power/cells/device_cells_vr.dm b/code/modules/power/cells/device_cells_vr.dm
index 7718778844f..41291ab0c47 100644
--- a/code/modules/power/cells/device_cells_vr.dm
+++ b/code/modules/power/cells/device_cells_vr.dm
@@ -13,6 +13,9 @@
 	newcell.charge = newcell.maxcharge * percentage
 	qdel(src)
 
+/obj/item/weapon/cell/device/weapon/recharge/alien/update_icon()
+	return
+
 
 //The machine cell
 /obj/item/weapon/cell/void
@@ -37,6 +40,8 @@
 	newcell.charge = newcell.maxcharge * percentage
 	qdel(src)
 	
+/obj/item/weapon/cell/void/update_icon()
+	return
 
 // Bloo friendlier hybrid tech
 /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid
diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm
index cb0651e5a02..3321d47db16 100644
--- a/code/modules/power/port_gen_vr.dm
+++ b/code/modules/power/port_gen_vr.dm
@@ -100,7 +100,6 @@
 
 /obj/machinery/power/rtg/update_icon()
 	if(panel_open)
-
 		icon_state = "[initial(icon_state)]-open"
 	else
 		icon_state = initial(icon_state)
@@ -127,7 +126,6 @@
 
 // Void Core, power source for Abductor ships and bases.
 // Provides a lot of power, but tends to explode when mistreated.
-
 /obj/machinery/power/rtg/abductor
 	name = "Void Core"
 	icon_state = "core-nocell"
@@ -141,6 +139,7 @@
 	var/obj/item/weapon/cell/void/cell
 
 	var/icon_base = "core"
+	var/state_change = TRUE
 
 /obj/machinery/power/rtg/abductor/RefreshParts()
 	..()
@@ -171,12 +170,14 @@
 		cell.forceMove(get_turf(src))
 		user.put_in_active_hand(cell)
 		cell = null
+		state_change = TRUE
 		RefreshParts()
 		update_icon()
 		playsound(src, 'sound/effects/metal_close.ogg', 50, 1)
 		return TRUE
 
 /obj/machinery/power/rtg/abductor/attackby(obj/item/I, mob/user, params)
+	state_change = TRUE //Can't tell if parent did something
 	if(istype(I, /obj/item/weapon/cell/void) && !cell)
 		user.remove_from_mob(I)
 		I.forceMove(src)
@@ -188,11 +189,19 @@
 	return ..()
 
 /obj/machinery/power/rtg/abductor/update_icon()
+	if(!state_change)
+		return //Stupid cells constantly update our icon so trying to be efficient
+	
 	if(cell)
-		..()
+		if(panel_open)
+			icon_state = "[icon_base]-open"
+		else
+			icon_state = "[icon_base]"
 	else
 		icon_state = "[icon_base]-nocell"
 
+	state_change = FALSE
+
 /obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
 	asplod()