diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm
index 3971306b76b..06385b765cf 100644
--- a/code/game/objects/items/choice_beacon.dm
+++ b/code/game/objects/items/choice_beacon.dm
@@ -2,8 +2,8 @@
 	name = "choice beacon"
 	desc = "Hey, why are you viewing this?!! Please let CentCom know about this odd occurrence."
 	icon = 'icons/obj/devices/remote.dmi'
-	icon_state = "gangtool-blue"
-	inhand_icon_state = "radio"
+	icon_state = "generic_delivery"
+	inhand_icon_state = "generic_delivery"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
 	/// How many uses this item has before being deleted
@@ -71,6 +71,10 @@
 /obj/item/choice_beacon/music
 	name = "instrument delivery beacon"
 	desc = "Summon your tool of art."
+	icon_state = "sb_delivery"
+	inhand_icon_state = "sb_delivery"
+	company_source = "Sophronia Broadcasting"
+	company_message = span_bold("Please enjoy your Sophronia Broadcasting's 'Spinward Idol' Musical Instrument, exactly as shown in the hit show!")
 	w_class = WEIGHT_CLASS_TINY
 
 /obj/item/choice_beacon/music/generate_display_names()
@@ -132,6 +136,8 @@
 	name = "augment beacon"
 	desc = "Summons augmentations. Can be used 3 times!"
 	uses = 3
+	icon_state = "self_delivery"
+	inhand_icon_state = "self_delivery"
 	company_source = "S.E.L.F."
 	company_message = span_bold("Request status: Recieved. Package status: Delivered. Notes: To assure optimal value, use supplied Interdyne-brand autosurgeons to change implantment status.")
 
diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
index 1fef4a38438..de81caa22e9 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -3,7 +3,8 @@
 #define WAND_EMERGENCY "emergency"
 
 /obj/item/door_remote
-	icon_state = "gangtool-white"
+	icon_state = "remote"
+	base_icon_state = "remote"
 	inhand_icon_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
@@ -11,6 +12,8 @@
 	name = "control wand"
 	desc = "A remote for controlling a set of airlocks."
 	w_class = WEIGHT_CLASS_TINY
+
+	var/department = "civilian"
 	var/mode = WAND_OPEN
 	var/region_access = REGION_GENERAL
 	var/list/access_list
@@ -18,6 +21,7 @@
 /obj/item/door_remote/Initialize(mapload)
 	. = ..()
 	access_list = SSid_access.get_region_access_list(list(region_access))
+	update_icon_state()
 
 /obj/item/door_remote/attack_self(mob/user)
 	var/static/list/desc = list(WAND_OPEN = "Open Door", WAND_BOLT = "Toggle Bolts", WAND_EMERGENCY = "Toggle Emergency Access")
@@ -28,6 +32,7 @@
 			mode = WAND_EMERGENCY
 		if(WAND_EMERGENCY)
 			mode = WAND_OPEN
+	update_icon_state()
 	balloon_alert(user, "mode: [desc[mode]]")
 
 // Airlock remote works by sending NTNet packets to whatever it's pointed at.
@@ -85,46 +90,59 @@
 			airlock.emergency = !airlock.emergency
 			airlock.update_appearance(UPDATE_ICON)
 
+/obj/item/door_remote/update_icon_state()
+	var/icon_state_mode
+	switch(mode)
+		if(WAND_OPEN)
+			icon_state_mode = "open"
+		if(WAND_BOLT)
+			icon_state_mode = "bolt"
+		if(WAND_EMERGENCY)
+			icon_state_mode = "emergency"
+
+	icon_state = "[base_icon_state]_[department]_[icon_state_mode]"
+	return ..()
+
 /obj/item/door_remote/omni
 	name = "omni door remote"
 	desc = "This control wand can access any door on the station."
-	icon_state = "gangtool-yellow"
+	department = "omni"
 	region_access = REGION_ALL_STATION
 
 /obj/item/door_remote/captain
 	name = "command door remote"
-	icon_state = "gangtool-yellow"
+	department = "command"
 	region_access = REGION_COMMAND
 
 /obj/item/door_remote/chief_engineer
 	name = "engineering door remote"
-	icon_state = "gangtool-orange"
+	department = "engi"
 	region_access = REGION_ENGINEERING
 
 /obj/item/door_remote/research_director
 	name = "research door remote"
-	icon_state = "gangtool-purple"
+	department = "sci"
 	region_access = REGION_RESEARCH
 
 /obj/item/door_remote/head_of_security
 	name = "security door remote"
-	icon_state = "gangtool-red"
+	department = "security"
 	region_access = REGION_SECURITY
 
 /obj/item/door_remote/quartermaster
 	name = "supply door remote"
 	desc = "Remotely controls airlocks. This remote has additional Vault access."
-	icon_state = "gangtool-green"
+	department = "cargo"
 	region_access = REGION_SUPPLY
 
 /obj/item/door_remote/chief_medical_officer
 	name = "medical door remote"
-	icon_state = "gangtool-blue"
+	department = "med"
 	region_access = REGION_MEDBAY
 
 /obj/item/door_remote/civilian
 	name = "civilian door remote"
-	icon_state = "gangtool-white"
+	department = "civilian"
 	region_access = REGION_GENERAL
 
 #undef WAND_OPEN
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index e497a30f705..2719c576a5e 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -176,8 +176,6 @@
 /obj/item/antag_spawner/nuke_ops/borg_tele
 	name = "syndicate cyborg beacon"
 	desc = "A single-use beacon designed to quickly launch reinforcement cyborgs into the field."
-	icon = 'icons/obj/devices/remote.dmi'
-	icon_state = "gangtool-red"
 	antag_datum = /datum/antagonist/nukeop/reinforcement/cyborg
 	special_role_name = "Syndicate Cyborg"
 
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index f904c4a5cf8..5dd9832a8b0 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -257,8 +257,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32)
 /obj/item/assault_pod/mining
 	name = "Landing Field Designator"
 	icon = 'icons/obj/devices/remote.dmi'
-	icon_state = "gangtool-purple"
-	inhand_icon_state = "electronic"
+	icon_state = "designator_mining"
+	inhand_icon_state = "minertalkie"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
 	desc = "Deploy to designate the landing zone of the auxiliary base."
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 3e76fc9671d..b628d7c5d84 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -17,8 +17,8 @@
 /obj/item/assault_pod
 	name = "Assault Pod Targeting Device"
 	icon = 'icons/obj/devices/remote.dmi'
-	icon_state = "gangtool-red"
-	inhand_icon_state = "radio"
+	icon_state = "designator_syndicate"
+	inhand_icon_state = "nukietalkie"
 	lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
 	desc = "Used to select a landing zone for assault pods."
diff --git a/icons/mob/inhands/items/devices_lefthand.dmi b/icons/mob/inhands/items/devices_lefthand.dmi
index 7b558c20e6e..48c47f872df 100644
Binary files a/icons/mob/inhands/items/devices_lefthand.dmi and b/icons/mob/inhands/items/devices_lefthand.dmi differ
diff --git a/icons/mob/inhands/items/devices_righthand.dmi b/icons/mob/inhands/items/devices_righthand.dmi
index 042ecb745c4..f8f19a8709b 100644
Binary files a/icons/mob/inhands/items/devices_righthand.dmi and b/icons/mob/inhands/items/devices_righthand.dmi differ
diff --git a/icons/obj/devices/remote.dmi b/icons/obj/devices/remote.dmi
index 7b1e07462ff..e6a008bb623 100644
Binary files a/icons/obj/devices/remote.dmi and b/icons/obj/devices/remote.dmi differ