diff --git a/code/game/turfs/simulated/dungeon/wall.dm b/code/game/turfs/simulated/dungeon/wall.dm
index a688d1e6c7..be26ab2393 100644
--- a/code/game/turfs/simulated/dungeon/wall.dm
+++ b/code/game/turfs/simulated/dungeon/wall.dm
@@ -17,13 +17,16 @@
 
 /turf/simulated/wall/solidrock //for more stylish anti-cheese.
 	description_info = "Probably not going to be able to drill or bomb your way through this, best to try and find a way around."
-	var/icon_base = "rock"
 	var/rock_side = "rock_side"
 	block_tele = TRUE
 
 /turf/simulated/wall/solidrock/New(var/newloc)
 	..(newloc,"bedrock")
 
+/turf/simulated/wall/solidrock/Initialize()
+	..()
+	update_icon(1)
+
 /turf/simulated/wall/solidrock/update_material()
 	name = "solid rock"
 	desc = "This rock seems dense, impossible to drill."
@@ -49,7 +52,7 @@
 	if(density)
 		var/image/I
 		for(var/i = 1 to 4)
-			I = image('icons/turf/wall_masks.dmi', "[material.icon_base][wall_connections[i]]", dir = 1<<(i-1))
+			I = image('icons/turf/wall_masks.dmi', "rock[wall_connections[i]]", dir = 1<<(i-1))
 			add_overlay(I)
 		for(var/direction in cardinal)
 			var/turf/T = get_step(src,direction)
@@ -62,9 +65,6 @@
 				var/turf/simulated/wall/solidrock/M = get_step(src, direction)
 				M.update_icon()
 
-/turf/simulated/wall/ChangeTurf()
-	..()
-
 /turf/simulated/wall/solidrock/attackby()
 	return
 
@@ -74,10 +74,29 @@
 /turf/simulated/wall/solidrock/take_damage()	//These things are suppose to be unbreakable
 	return
 
-/*/turf/simulated/wall/dungeon/mossyrock // Version for POI labyrinths. No teleporting, no breaking.
-	name = "mossy rocks"
+
+//Mossy rocks for POI. Unbreakable, no teleport.
+
+/turf/simulated/wall/solidrock/mossyrockpoi // Version for POI labyrinths. No teleporting, no breaking.
 	desc = "An old, yet impressively durably rock wall."
-	description_info = "It's amazingly solid for how old it appears to be. May be best to find a way around."
-	icon_state = "mossyrock"
-	var/base_state = "mossyrock"
-	var/mossyrock_side = "mossyrock_side"*/
\ No newline at end of file
+	var/mossyrock_side = "mossyrock_side"
+
+/turf/simulated/wall/solidrock/New(var/newloc)
+	..(newloc,"mossyrock")
+
+/turf/simulated/wall/solidrock/mossyrockpoi/update_icon(var/update_neighbors)
+	if(density)
+		var/image/I
+		for(var/i = 1 to 4)
+			I = image('icons/turf/wall_masks.dmi', "mossyrock[wall_connections[i]]", dir = 1<<(i-1))
+			add_overlay(I)
+		for(var/direction in cardinal)
+			var/turf/T = get_step(src,direction)
+			if(istype(T) && !T.density)
+				add_overlay(get_cached_border(mossyrock_side,direction,icon,mossyrock_side))
+
+	else if(update_neighbors)
+		for(var/direction in alldirs)
+			if(istype(get_step(src, direction), /turf/simulated/wall/solidrock/mossyrockpoi))
+				var/turf/simulated/wall/solidrock/mossyrockpoi/M = get_step(src, direction)
+				M.update_icon()
\ No newline at end of file
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 6e4990c40a..5d7616aef7 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -212,6 +212,9 @@ turf/simulated/mineral/floor/light_corner
 				if(istype(get_step(src, direction), /turf/simulated/mineral))
 					var/turf/simulated/mineral/M = get_step(src, direction)
 					M.update_icon()
+				if(istype(get_step(src, direction), /turf/simulated/wall/solidrock))
+					var/turf/simulated/wall/solidrock/M = get_step(src, direction)
+					M.update_icon()
 
 /turf/simulated/mineral/ex_act(severity)