diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index 4149b75823..798674f6f0 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -99,6 +99,7 @@
 	icon_screen = "pass"
 	density = FALSE
 	circuit = /obj/item/circuitboard/guestpass
+	flags = WALL_ITEM
 
 	var/obj/item/card/id/giver
 	var/list/accesses = list()
diff --git a/code/game/machinery/computer/id_restorer_vr.dm b/code/game/machinery/computer/id_restorer_vr.dm
index c7330ded2c..86bbc28243 100644
--- a/code/game/machinery/computer/id_restorer_vr.dm
+++ b/code/game/machinery/computer/id_restorer_vr.dm
@@ -10,6 +10,7 @@
 	density = FALSE
 	clicksound = null
 	circuit = /obj/item/circuitboard/id_restorer
+	flags = WALL_ITEM
 
 	var/icon_success = "restorer_success"
 	var/icon_fail = "restorer_fail"
diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm
index 8627b163d7..c554582ee7 100644
--- a/code/game/machinery/computer/timeclock_vr.dm
+++ b/code/game/machinery/computer/timeclock_vr.dm
@@ -16,6 +16,7 @@
 	density = FALSE
 	circuit = /obj/item/circuitboard/timeclock
 	clicksound = null
+	flags = WALL_ITEM
 	var/channel = "Common" //Radio channel to announce on
 
 	var/obj/item/card/id/card // Inserted Id card
diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm
index 6115f71c79..01fa524eff 100644
--- a/code/game/machinery/doorbell_vr.dm
+++ b/code/game/machinery/doorbell_vr.dm
@@ -8,6 +8,7 @@
 	idle_power_usage = 10
 	active_power_usage = 200
 	anchored = TRUE
+	flags = WALL_ITEM
 	var/id_tag = null
 	var/chime_sound = 'sound/machines/doorbell.ogg'
 
@@ -89,6 +90,7 @@
 	icon = 'icons/obj/machines/doorbell_vr.dmi'
 	icon_state = "doorbell-standby"
 	use_power = USE_POWER_OFF
+	flags = WALL_ITEM
 
 /obj/machinery/button/doorbell/Initialize(mapload, var/dir, var/building = FALSE)
 	. = ..()
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 8caf04c9a4..5c72617979 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -318,3 +318,4 @@ GLOBAL_LIST_INIT(recharger_battery_exempt, list(
 	icon_state_idle = "wrecharger0"
 	portable = FALSE
 	circuit = /obj/item/circuitboard/recharger/wrecharger
+	flags = WALL_ITEM
diff --git a/code/game/machinery/status_display_ai.dm b/code/game/machinery/status_display_ai.dm
index 8987a99ca2..586287f287 100644
--- a/code/game/machinery/status_display_ai.dm
+++ b/code/game/machinery/status_display_ai.dm
@@ -66,6 +66,7 @@ GLOBAL_LIST_INIT(ai_status_emotions, list(
 	anchored = TRUE
 	density = FALSE
 	circuit =  /obj/item/circuitboard/ai_status_display
+	flags = WALL_ITEM
 
 	var/mode = 0	// 0 = Blank
 					// 1 = AI emoticon
diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm
index 21ae4bcbbe..f0e2bbf99c 100644
--- a/code/game/objects/items/devices/geiger.dm
+++ b/code/game/objects/items/devices/geiger.dm
@@ -110,7 +110,7 @@
 	plane = TURF_PLANE
 	layer = ABOVE_TURF_LAYER
 	w_class = ITEMSIZE_LARGE
-	flags = NOBLOODY
+	flags = NOBLOODY|WALL_ITEM
 	var/circuit = /obj/item/circuitboard/geiger
 	var/number = 0
 	var/last_tick //used to delay the powercheck
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index cdf5998579..cf376d6dfb 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -629,8 +629,9 @@
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "light0"
 	desc = "A remote control switch for polarized windows."
-	var/range = 7
 	circuit = /obj/item/circuitboard/electrochromic
+	flags = WALL_ITEM
+	var/range = 7
 
 /obj/machinery/button/windowtint/attack_hand(mob/user as mob)
 	if(..())
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 90892694ad..8b2a232833 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -23,6 +23,7 @@ log transactions
 	use_power = USE_POWER_IDLE
 	idle_power_usage = 10
 	circuit =  /obj/item/circuitboard/atm
+	flags = WALL_ITEM
 	var/datum/money_account/authenticated_account
 	var/number_incorrect_tries = 0
 	var/previous_account_number = 0
diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm
index a645903104..e70f9f04ce 100644
--- a/code/modules/holomap/station_holomap.dm
+++ b/code/modules/holomap/station_holomap.dm
@@ -14,6 +14,7 @@
 	active_power_usage = 500
 	circuit = /obj/item/circuitboard/station_map
 	vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature
+	flags = ON_BORDER|WALL_ITEM
 
 	// TODO - Port use_auto_lights from /vg - for now declare here
 	var/use_auto_lights = 1
@@ -29,7 +30,6 @@
 	var/original_zLevel = 1	// zLevel on which the station map was initialized.
 	var/bogus = TRUE		// set to 0 when you initialize the station map on a zLevel that has its own icon formatted for use by station holomaps.
 	var/datum/station_holomap/holomap_datum
-	flags = ON_BORDER
 
 /obj/machinery/station_map/Initialize(mapload)
 	. = ..()
diff --git a/icons/mob/hud_vr.dmi b/icons/mob/hud_vr.dmi
index 5a5cc23522..653ef21a7f 100644
Binary files a/icons/mob/hud_vr.dmi and b/icons/mob/hud_vr.dmi differ