diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm
index a1b4b72b471..37aeafcacc4 100644
--- a/code/__DEFINES/sight.dm
+++ b/code/__DEFINES/sight.dm
@@ -1,3 +1,4 @@
+#define INVISIBILITY_MINIMUM 0 //not really minimum, but we will lie
 #define SEE_INVISIBLE_MINIMUM 5
 
 #define SEE_INVISIBLE_OBSERVER_NOLIGHTING 15
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 14755537f61..1b623213f89 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -2,7 +2,7 @@
 	name = "Automatic Robotic Factory 5000"
 	desc = "A large metallic machine with an entrance and an exit. A sign on the side reads, 'human go in, robot come out'. Has a cooldown between each use."
 	icon = 'icons/obj/recycling.dmi'
-	icon_state = "separator-AO1"
+	icon_state = "grinder-b1"
 	layer = MOB_LAYER+1 // Overhead
 	anchored = TRUE
 	density = TRUE
@@ -52,7 +52,7 @@
 
 /obj/machinery/transformer/update_icon_state()
 	if(is_on_cooldown || stat & (BROKEN|NOPOWER))
-		icon_state = "separator-AO0"
+		icon_state = "grinder-b0"
 	else
 		icon_state = initial(icon_state)
 
@@ -170,7 +170,7 @@
 
 /obj/machinery/transformer/xray/update_icon_state()
 	if(stat & (BROKEN|NOPOWER))
-		icon_state = "separator-AO0"
+		icon_state = "grinder-b0"
 	else
 		icon_state = initial(icon_state)
 
@@ -196,7 +196,7 @@
 	if(stat & (BROKEN|NOPOWER))
 		return
 
-	flick("separator-AO0",src)
+	flick("grinder-b0",src)
 	playsound(loc, 'sound/effects/alert.ogg', 50, 0)
 	sleep(5)
 	H.rad_act(rand(150, 200))
@@ -212,7 +212,7 @@
 /obj/machinery/transformer/xray/proc/scan(obj/item/I)
 	if(scan_rec(I))
 		playsound(loc, 'sound/effects/alert.ogg', 50, 0)
-		flick("separator-AO0",src)
+		flick("grinder-b0",src)
 	else
 		playsound(loc, 'sound/machines/ping.ogg', 50, 0)
 		sleep(30)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index e8a00a2cdf2..dd3ae8208e3 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -352,7 +352,6 @@
 			. += "dispover-unscrewed"
 		if(1)
 			. += "dispover-charge"
-			. += "dispover-panel"
 			underlays += emissive_appearance(icon, "dispover-charge")
 		if(2)
 			. += "dispover-ready"
@@ -763,28 +762,17 @@
 // update the icon_state to reflect hidden status
 /obj/structure/disposalpipe/proc/update()
 	var/turf/T = get_turf(src)
-	if(T.transparent_floor)
-		update_icon(UPDATE_ICON_STATE)
-		return
-	hide(T.intact && !isspaceturf(T))	// space never hides pipes
-	update_icon(UPDATE_ICON_STATE)
+	hide(T.intact && !isspaceturf(T) && !T.transparent_floor)	// space and transparent floors never hide pipes
 
 // hide called by levelupdate if turf intact status changes
-// change visibility status and force update of icon
+// change visibility status
 /obj/structure/disposalpipe/hide(intact)
-	invisibility = intact ? INVISIBILITY_MAXIMUM: 0	// hide if floor is intact
-	update_icon(UPDATE_ICON_STATE)
-
-// update actual icon_state depending on visibility
-// if invisible, append "f" to icon_state to show faded version
-// this will be revealed if a T-scanner is used
-// if visible, use regular icon_state
-/obj/structure/disposalpipe/update_icon_state()
-	if(invisibility)
-		icon_state = "[base_icon_state]f"
-	else
-		icon_state = base_icon_state
-
+	if(intact)
+		invisibility = INVISIBILITY_MAXIMUM
+		alpha = 128
+		return
+	invisibility = INVISIBILITY_MINIMUM
+	alpha = 255
 
 // expel the held objects into a turf
 // called when there is a break in the pipe
@@ -964,12 +952,19 @@
 		dpdir = dir | turn(dir, -90)
 	update()
 
-
+/obj/structure/disposalpipe/segment/corner
+	icon_state = "pipe-c"
 
 //a three-way junction with dir being the dominant direction
 /obj/structure/disposalpipe/junction
 	icon_state = "pipe-j1"
 
+/obj/structure/disposalpipe/junction/reversed
+	icon_state = "pipe-j2"
+
+/obj/structure/disposalpipe/junction/y
+	icon_state = "pipe-y"
+
 /obj/structure/disposalpipe/junction/Initialize(mapload)
 	. = ..()
 	if(icon_state == "pipe-j1")
@@ -1011,13 +1006,15 @@
 
 //a three-way junction that sorts objects
 /obj/structure/disposalpipe/sortjunction
-
 	icon_state = "pipe-j1s"
-	var/sortType = 0	//Look at the list called TAGGERLOCATIONS in /code/_globalvars/lists/flavor_misc.dm
+	var/sortType = 0	//Look at the list called TAGGERLOCATIONS in /code/_globalvars/lists/flavor_misc.dm and cry
 	var/posdir = 0
 	var/negdir = 0
 	var/sortdir = 0
 
+/obj/structure/disposalpipe/sortjunction/reversed
+	icon_state = "pipe-j2s"
+
 /obj/structure/disposalpipe/sortjunction/proc/updatedesc()
 	desc = "An underfloor disposal pipe with a package sorting mechanism."
 	if(sortType>0)
@@ -1103,6 +1100,9 @@
 	var/negdir = 0
 	var/sortdir = 0
 
+/obj/structure/disposalpipe/wrapsortjunction/reversed
+	icon_state = "pipe-j2s"
+
 /obj/structure/disposalpipe/wrapsortjunction/Initialize(mapload)
 	. = ..()
 	posdir = dir
diff --git a/icons/obj/pipes/disposal.dmi b/icons/obj/pipes/disposal.dmi
index 0371511f87c..a4b65104b7f 100644
Binary files a/icons/obj/pipes/disposal.dmi and b/icons/obj/pipes/disposal.dmi differ
diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi
index 32593014f21..00506a1b52b 100644
Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ