diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
deleted file mode 100644
index e2ea954f3b..0000000000
--- a/code/_onclick/hud/fullscreen.dm
+++ /dev/null
@@ -1,83 +0,0 @@
-/mob/proc/overlay_fullscreen(category, type, severity)
-	var/atom/movable/screen/fullscreen/screen = screens[category]
-	if (!screen || screen.type != type)
-		// needs to be recreated
-		clear_fullscreen(category, FALSE)
-		screens[category] = screen = new type()
-	else if ((!severity || severity == screen.severity) && (!client || screen.screen_loc != "CENTER-7,CENTER-7" || screen.view == client.view))
-		// doesn't need to be updated
-		return screen
-
-	screen.icon_state = "[initial(screen.icon_state)][severity]"
-	screen.severity = severity
-	if (client && screen.should_show_to(src))
-		screen.update_for_view(client.view)
-		client.screen += screen
-
-	return screen
-
-/mob/proc/clear_fullscreen(category, animated = 10)
-	var/atom/movable/screen/fullscreen/screen = screens[category]
-	if(!screen)
-		return
-
-	screens -= category
-
-	if(animated)
-		animate(screen, alpha = 0, time = animated)
-		addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME)
-	else
-		if(client)
-			client.screen -= screen
-		qdel(screen)
-
-/mob/proc/clear_fullscreen_after_animate(atom/movable/screen/fullscreen/screen)
-	if(client)
-		client.screen -= screen
-	qdel(screen)
-
-/mob/proc/clear_fullscreens()
-	for(var/category in screens)
-		clear_fullscreen(category)
-
-/mob/proc/hide_fullscreens()
-	if(client)
-		for(var/category in screens)
-			client.screen -= screens[category]
-
-/mob/proc/reload_fullscreen()
-	if(client)
-		var/atom/movable/screen/fullscreen/screen
-		for(var/category in screens)
-			screen = screens[category]
-			if(screen.should_show_to(src))
-				screen.update_for_view(client.view)
-				client.screen |= screen
-			else
-				client.screen -= screen
-
-/atom/movable/screen/fullscreen
-	icon = 'icons/hud/screen_full.dmi'
-	icon_state = "default"
-	screen_loc = "CENTER-7,CENTER-7"
-	layer = FULLSCREEN_LAYER
-	plane = FULLSCREEN_PLANE
-	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	var/view = 7
-	var/severity = 0
-	var/show_when_dead = FALSE
-
-/atom/movable/screen/fullscreen/proc/update_for_view(client_view)
-	if (screen_loc == "CENTER-7,CENTER-7" && view != client_view)
-		var/list/actualview = getviewsize(client_view)
-		view = client_view
-		transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0)
-
-/atom/movable/screen/fullscreen/proc/should_show_to(mob/mymob)
-	if(!show_when_dead && mymob.stat == DEAD)
-		return FALSE
-	return TRUE
-
-/atom/movable/screen/fullscreen/ivanov_display
-	icon_state = "ivanov1"
-	alpha = 180
diff --git a/code/_rendering/fullscreen/fullscreen.dm b/code/_rendering/fullscreen/fullscreen.dm
index dd8f697891..76f2340591 100644
--- a/code/_rendering/fullscreen/fullscreen.dm
+++ b/code/_rendering/fullscreen/fullscreen.dm
@@ -232,3 +232,8 @@
 	layer = LIGHTING_LAYER
 	blend_mode = BLEND_ADD
 	show_when_dead = TRUE
+
+/atom/movable/screen/fullscreen/ivanov_display
+	icon_state = "ivanov1"
+	alpha = 180
+
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 7debb27598..837b770e76 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -641,7 +641,7 @@
 	icon_state = "reticenceprize"
 	quiet = 1
 
-/obj/item/toy/mecha/savannahivanov
+/obj/item/toy/prize/savannahivanov
 	name = "toy Savannah-Ivanov"
 	icon_state = "savannahivanovtoy"
 	desc = "Mini-Mecha action figure! Collect them all! 13/12."
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index e6bfbd1266..b68873bc82 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -268,7 +268,7 @@
 	RegisterSignal(chassis, COMSIG_MECHA_EQUIPMENT_CLICK, .proc/on_equipment_click)
 	owner.client.mouse_pointer_icon = 'icons/effects/mouse_pointers/supplypod_down_target.dmi'
 	owner.update_mouse_pointer()
-	//owner.overlay_fullscreen("ivanov1", /atom/movable/screen/fullscreen/ivanov_display, 1) // fuck it, i'll fix it later
+	owner.overlay_fullscreen("ivanov1", /atom/movable/screen/fullscreen/ivanov_display, 1) // fuck it, i'll fix it later
 	SEND_SOUND(owner, 'sound/machines/terminal_on.ogg') //spammable so I don't want to make it audible to anyone else
 
 /**
diff --git a/icons/mecha/mech_construct.dmi b/icons/mecha/mech_construct.dmi
index 2ae4a93a2e..bfe506638e 100644
Binary files a/icons/mecha/mech_construct.dmi and b/icons/mecha/mech_construct.dmi differ
diff --git a/icons/mecha/mech_construction.dmi b/icons/mecha/mech_construction.dmi
index 1f50346b71..3fb85f9ef6 100644
Binary files a/icons/mecha/mech_construction.dmi and b/icons/mecha/mech_construction.dmi differ
diff --git a/icons/screen/fullscreen_15x15.dmi b/icons/screen/fullscreen_15x15.dmi
index 502e9ad3f9..f26295a4fe 100644
Binary files a/icons/screen/fullscreen_15x15.dmi and b/icons/screen/fullscreen_15x15.dmi differ