diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index b81fb88ee67..683a023bf16 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -84,9 +84,6 @@
 	if(!istype(T))
 		return
 
-	if(T.intact && node1 && node2 && node1.level == 1 && node2.level == 1 && istype(node1, /obj/machinery/atmospherics/pipe) && istype(node2, /obj/machinery/atmospherics/pipe))
-		vent_icon += "h"
-
 	if(!powered())
 		vent_icon += "off"
 	else
@@ -111,6 +108,8 @@
 				add_underlay(T, node2, dir, node2.icon_connect_type)
 			else
 				add_underlay(T, node2, dir)
+		var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame")
+		underlays += frame
 
 /obj/machinery/atmospherics/binary/dp_vent_pump/process_atmos()
 	..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
index 438e95f021d..2a65d9f5451 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
@@ -67,3 +67,5 @@
 		if(!istype(T))
 			return
 		add_underlay(T, node, dir)
+		var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame")
+		underlays += frame
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index ce89e03b48a..9f4afef06d1 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -94,9 +94,6 @@
 	if(!istype(T))
 		return
 
-	if(T.intact && node && node.level == 1 && istype(node, /obj/machinery/atmospherics/pipe))
-		vent_icon += "h"
-
 	if(welded)
 		vent_icon += "weld"
 	else if(!powered())
@@ -104,7 +101,7 @@
 	else
 		vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
 
-	overlays += SSair.icon_manager.get_atmos_icon("device", , , vent_icon)
+	overlays += SSair.icon_manager.get_atmos_icon("device", state = vent_icon)
 
 	update_pipe_image()
 
@@ -121,6 +118,8 @@
 				add_underlay(T, node, dir, node.icon_connect_type)
 			else
 				add_underlay(T,, dir)
+			var/icon/frame = icon('icons/atmos/vent_pump.dmi', "frame")
+			underlays += frame
 
 /obj/machinery/atmospherics/unary/vent_pump/hide()
 	update_icon()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 4799db33bd3..c82e9ff3710 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/unary/vent_scrubber
 	icon = 'icons/atmos/vent_scrubber.dmi'
-	icon_state = "map_scrubber"
+	icon_state = "map_scrubber_off"
 
 	req_one_access_txt = "24;10"
 
@@ -40,6 +40,7 @@
 
 /obj/machinery/atmospherics/unary/vent_scrubber/on
 	on = TRUE
+	icon_state = "map_scrubber"
 
 /obj/machinery/atmospherics/unary/vent_scrubber/New()
 	..()
@@ -115,10 +116,13 @@
 		scrubber_icon += "off"
 	else
 		scrubber_icon += "[on ? "[scrubbing ? "on" : "in"]" : "off"]"
+		if(on && widenet)
+			scrubber_icon += "_expanded"
+
 	if(welded)
 		scrubber_icon = "scrubberweld"
 
-	overlays += SSair.icon_manager.get_atmos_icon("device", , , scrubber_icon)
+	overlays += SSair.icon_manager.get_atmos_icon("device", state = scrubber_icon)
 	update_pipe_image()
 
 /obj/machinery/atmospherics/unary/vent_scrubber/update_underlays()
@@ -134,6 +138,9 @@
 				add_underlay(T, node, dir, node.icon_connect_type)
 			else
 				add_underlay(T,, dir)
+			var/icon/frame = icon('icons/atmos/vent_scrubber.dmi', "frame")
+			underlays += frame
+
 
 /obj/machinery/atmospherics/unary/vent_scrubber/set_frequency(new_frequency)
 	SSradio.remove_object(src, frequency)
diff --git a/icons/atmos/vent_pump.dmi b/icons/atmos/vent_pump.dmi
index bd83de36174..0d6e2e78f43 100644
Binary files a/icons/atmos/vent_pump.dmi and b/icons/atmos/vent_pump.dmi differ
diff --git a/icons/atmos/vent_scrubber.dmi b/icons/atmos/vent_scrubber.dmi
index 628a17e8565..9309fed8e42 100644
Binary files a/icons/atmos/vent_scrubber.dmi and b/icons/atmos/vent_scrubber.dmi differ
diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi
index e41098e7290..d01f438e4c1 100644
Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ