diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index b072a7e4889..d51b79ae48f 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -14,4 +14,10 @@
 	return attack_hand(user)
 
 /obj/machinery/button/attackby(obj/item/weapon/W, mob/user as mob)
-	return attack_hand(user)
\ No newline at end of file
+	return attack_hand(user)
+
+// VOREStation Edit Begin
+/obj/machinery/button/attack_hand(obj/item/weapon/W, mob/user as mob)
+	if(..()) return 1
+	playsound(loc, 'sound/machines/button.ogg', 100, 1)
+// VOREStation Edit End
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 7f7ce32e036..aeb49cace79 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -78,6 +78,7 @@
 #define SAFE   0x10
 
 /obj/machinery/button/remote/airlock
+	icon = 'icons/obj/stationobjs_vr.dmi' // VOREStation Edit
 	name = "remote door-control"
 	desc = "It controls doors, remotely."
 
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 180471f0705..94fb9913b21 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -4,7 +4,7 @@
 /obj/machinery/light_switch
 	name = "light switch"
 	desc = "It turns lights on and off. What are you, simple?"
-	icon = 'icons/obj/power.dmi'
+	icon = 'icons/obj/power_vr.dmi' // VOREStation Edit
 	icon_state = "light1"
 	anchored = 1.0
 	use_power = 1
@@ -53,6 +53,7 @@
 
 	area.lightswitch = on
 	area.updateicon()
+	playsound(src, 'sound/machines/button.ogg', 100, 1, 0) // VOREStation Edit
 
 	for(var/obj/machinery/light_switch/L in area)
 		L.on = on
diff --git a/icons/obj/objects_vr.dmi b/icons/obj/objects_vr.dmi
new file mode 100644
index 00000000000..66c95b9be2e
Binary files /dev/null and b/icons/obj/objects_vr.dmi differ
diff --git a/icons/obj/power_vr.dmi b/icons/obj/power_vr.dmi
new file mode 100644
index 00000000000..8d51091c47b
Binary files /dev/null and b/icons/obj/power_vr.dmi differ
diff --git a/icons/obj/stationobjs_vr.dmi b/icons/obj/stationobjs_vr.dmi
new file mode 100644
index 00000000000..59f23a5e5dc
Binary files /dev/null and b/icons/obj/stationobjs_vr.dmi differ
diff --git a/sound/machines/button.ogg b/sound/machines/button.ogg
new file mode 100644
index 00000000000..79b458317ac
Binary files /dev/null and b/sound/machines/button.ogg differ