diff --git a/code/ATMOSPHERICS/_atmos_setup.dm b/code/ATMOSPHERICS/_atmos_setup.dm
index 5f105c8e6c..a7585bf7cc 100644
--- a/code/ATMOSPHERICS/_atmos_setup.dm
+++ b/code/ATMOSPHERICS/_atmos_setup.dm
@@ -1,7 +1,7 @@
 //--------------------------------------------
 // Pipe colors
 //
-// Add them here and to the pipe_colors list 
+// Add them here and to the pipe_colors list
 //  to automatically add them to all relevant
 //  atmospherics devices.
 //--------------------------------------------
@@ -90,7 +90,7 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
 /datum/pipe_icon_manager/proc/gen_pipe_icons()
 	if(!pipe_icons)
 		pipe_icons = new()
-	
+
 	var/icon/pipe = new('icons/atmos/pipes.dmi')
 
 	for(var/state in pipe.IconStates())
@@ -106,10 +106,23 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
 			I.color = pipe_colors[pipe_color]
 			pipe_icons[state + "[pipe_colors[pipe_color]]"] = I
 
+	pipe = new ('icons/atmos/heat.dmi')
+	for(var/state in pipe.IconStates())
+		if(!state || findtext(state, "map"))
+			continue
+		pipe_icons["hepipe" + state] = image('icons/atmos/heat.dmi', icon_state = state)
+
+	pipe = new ('icons/atmos/junction.dmi')
+	for(var/state in pipe.IconStates())
+		if(!state || findtext(state, "map"))
+			continue
+		pipe_icons["hejunction" + state] = image('icons/atmos/junction.dmi', icon_state = state)
+
+
 /datum/pipe_icon_manager/proc/gen_manifold_icons()
 	if(!manifold_icons)
 		manifold_icons = new()
-	
+
 	var/icon/pipe = new('icons/atmos/manifold.dmi')
 
 	for(var/state in pipe.IconStates())
@@ -129,7 +142,7 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
 /datum/pipe_icon_manager/proc/gen_device_icons()
 	if(!device_icons)
 		device_icons = new()
-	
+
 	var/icon/device
 
 	device = new('icons/atmos/vent_pump.dmi')
@@ -147,9 +160,9 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
 /datum/pipe_icon_manager/proc/gen_omni_icons()
 	if(!omni_icons)
 		omni_icons = new()
-		
+
 	var/icon/omni = new('icons/atmos/omni_devices.dmi')
-	
+
 	for(var/state in omni.IconStates())
 		if(!state || findtext(state, "map"))
 			continue
@@ -168,11 +181,11 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_
 		pipe_underlays_intact = new()
 
 	var/icon/pipe = new('icons/atmos/pipe_underlays.dmi')
-	
+
 	for(var/state in pipe.IconStates())
 		if(state == "")
 			continue
-		
+
 		for(var/D in cardinal)
 			var/image/I = image('icons/atmos/pipe_underlays.dmi', icon_state = state, dir = D)
 			switch(state)
diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm
index dd77f8a777..c22c483e8c 100644
--- a/code/ATMOSPHERICS/he_pipes.dm
+++ b/code/ATMOSPHERICS/he_pipes.dm
@@ -1,7 +1,8 @@
 
 obj/machinery/atmospherics/pipe/simple/heat_exchanging
-	icon = 'icons/obj/pipes/heat.dmi'
+	icon = 'icons/atmos/heat.dmi'
 	icon_state = "intact"
+	pipe_icon = "hepipe"
 	level = 2
 	var/initialize_directions_he
 	var/surface = 2	//surface area in m^2
@@ -62,8 +63,9 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
 
 
 obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
-	icon = 'icons/obj/pipes/junction.dmi'
+	icon = 'icons/atmos/junction.dmi'
 	icon_state = "intact"
+	pipe_icon = "hejunction"
 	level = 2
 	minimum_temperature_difference = 300
 	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
@@ -86,16 +88,6 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
 				initialize_directions_he = WEST
 	// BubbleWrap END
 
-	update_icon()
-		if(node1&&node2)
-			icon_state = "intact"
-		else
-			var/have_node1 = node1?1:0
-			var/have_node2 = node2?1:0
-			icon_state = "exposed[have_node1][have_node2]"
-		if(!node1&&!node2)
-			del(src)
-
 	initialize()
 		for(var/obj/machinery/atmospherics/target in get_step(src,initialize_directions))
 			if(target.initialize_directions & get_dir(target,src))
diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index 1f1150b37c..82d44c788e 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -135,6 +135,7 @@
 /obj/machinery/atmospherics/pipe/simple
 	icon = 'icons/atmos/pipes.dmi'
 	icon_state = ""
+	var/pipe_icon = "" //what kind of pipe it is and from which dmi is the icon manager getting its icons, "" for simple pipes, "hepipe" for HE pipes, "hejunction" for HE junctions
 	name = "pipe"
 	desc = "A one meter section of regular pipe"
 
@@ -253,9 +254,9 @@
 				del(meter)
 		del(src)
 	else if(node1 && node2)
-		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "intact")
+		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "intact")
 	else
-		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "exposed[node1?1:0][node2?1:0]")
+		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]")
 
 /obj/machinery/atmospherics/pipe/simple/update_underlays()
 	return
diff --git a/code/modules/power/cable_logic.dm b/code/modules/power/cable_logic.dm
index a6e6e07b2b..0e95350359 100644
--- a/code/modules/power/cable_logic.dm
+++ b/code/modules/power/cable_logic.dm
@@ -85,7 +85,7 @@
 	var/dir_output = 1
 	var/obj/structure/cable/input
 	var/obj/structure/cable/output
-	icon = 'icons/obj/pipes/heat.dmi'
+	icon = 'icons/atmos/heat.dmi'
 	icon_state = "intact"
 
 /obj/machinery/logic/oneinput/process()
diff --git a/icons/obj/pipes/heat.dmi b/icons/atmos/heat.dmi
similarity index 100%
rename from icons/obj/pipes/heat.dmi
rename to icons/atmos/heat.dmi
diff --git a/icons/obj/pipes/junction.dmi b/icons/atmos/junction.dmi
similarity index 100%
rename from icons/obj/pipes/junction.dmi
rename to icons/atmos/junction.dmi