diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
index eca182b9bf4..bbe788bac53 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
@@ -140,3 +140,13 @@
 		else
 			to_chat(user, span_notice("You set the [src]'s sensors to the default settings."))
 	return TRUE
+
+//mapping
+
+/obj/machinery/atmospherics/components/binary/temperature_gate/layer2
+	piping_layer = 2
+	icon_state = "tgate_map-2"
+
+/obj/machinery/atmospherics/components/binary/temperature_gate/layer4
+	piping_layer = 4
+	icon_state = "tgate_map-4"
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
index b33f8845d46..2db9207a82d 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
@@ -106,3 +106,25 @@
 				heat_transfer_rate = clamp(rate, 0, max_heat_transfer_rate)
 				investigate_log("was set to [heat_transfer_rate]% by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_appearance()
+
+//mapping
+
+/obj/machinery/atmospherics/components/binary/temperature_pump/layer2
+	icon_state = "tpump_map-2"
+	piping_layer = 2
+
+/obj/machinery/atmospherics/components/binary/temperature_pump/layer4
+	icon_state = "tpump_map-4"
+	piping_layer = 4
+
+/obj/machinery/atmospherics/components/binary/temperature_pump/on
+	on = TRUE
+	icon_state = "tpump_on_map-3"
+
+/obj/machinery/atmospherics/components/binary/temperature_pump/on/layer2
+	icon_state = "tpump_on_map-2"
+	piping_layer = 2
+
+/obj/machinery/atmospherics/components/binary/temperature_pump/on/layer4
+	icon_state = "tpump_on_map-4"
+	piping_layer = 4
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 94013ccadc7..139cbe71b36 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -174,11 +174,11 @@
 
 /obj/machinery/atmospherics/components/binary/volume_pump/on/layer2
 	piping_layer = 2
-	icon_state = "volpump_map-2"
+	icon_state = "volpump_on_map-2"
 
 /obj/machinery/atmospherics/components/binary/volume_pump/on/layer4
 	piping_layer = 4
-	icon_state = "volpump_map-4"
+	icon_state = "volpump_on_map-4"
 
 /obj/item/circuit_component/atmos_volume_pump
 	display_name = "Atmospheric Volume Pump"
diff --git a/icons/obj/machines/atmospherics/binary_devices.dmi b/icons/obj/machines/atmospherics/binary_devices.dmi
index 96528d420c2..7855922700c 100644
Binary files a/icons/obj/machines/atmospherics/binary_devices.dmi and b/icons/obj/machines/atmospherics/binary_devices.dmi differ