diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index d26a24b39a2..42d241404b1 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -180,6 +180,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
 	var/turf/simulated/floor/plating/P = pry_tile(CB, user, TRUE)
 	if(!istype(P))
 		return
+	update_icon()
 	P.attackby(T, user, params)
 
 /turf/simulated/floor/proc/pry_tile(obj/item/C, mob/user, silent = FALSE)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 0121daf3ee4..1eb86650e4d 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -82,7 +82,6 @@
 // NEEDS TO BE UPDATED
 /turf/simulated/floor/basalt //By your powers combined, I am captain planet
 	name = "volcanic floor"
-	icon = 'icons/turf/floors.dmi'
 	icon_state = "basalt0"
 	oxygen = 14
 	nitrogen = 23
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index bd1ff075aca..7f71cf981bd 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -1,6 +1,7 @@
 /turf/simulated/floor/plating
 	name = "plating"
 	icon_state = "plating"
+	icon = 'icons/turf/floors/plating.dmi'
 	intact = 0
 	floor_tile = null
 	broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
@@ -14,12 +15,17 @@
 /turf/simulated/floor/plating/New()
 	..()
 	icon_plating = icon_state
+	if(icon == 'icons/turf/floors/plating.dmi')
+		smooth = SMOOTH_MORE
+		canSmoothWith = list(/turf/simulated/floor/plating, /turf/space)
+	update_icon()
 
 /turf/simulated/floor/plating/update_icon()
 	if(!..())
 		return
 	if(!broken && !burnt)
 		icon_state = icon_plating //Because asteroids are 'platings' too.
+	underlays += image(icon, icon_state)
 
 /turf/simulated/floor/plating/attackby(obj/item/C, mob/user, params)
 	if(..())
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 865f02a7eb8..6a5ae52ce27 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -453,7 +453,6 @@ var/global/list/rockTurfEdgeCache = list(
 
 /turf/simulated/floor/plating/airless/asteroid
 	name = "Asteroid"
-	icon = 'icons/turf/floors.dmi'
 	icon_state = "asteroid"
 	icon_plating = "asteroid"
 	var/dug = 0       //0 = has not yet been dug, 1 = has already been dug
@@ -463,10 +462,10 @@ var/global/list/rockTurfEdgeCache = list(
 
 /turf/simulated/floor/plating/airless/asteroid/New()
 	var/proper_name = name
-	..()
 	name = proper_name
 	if(prob(20))
 		icon_state = "asteroid[rand(0,12)]"
+	..()
 
 /turf/simulated/floor/plating/airless/asteroid/ex_act(severity, target)
 	switch(severity)
@@ -663,4 +662,4 @@ var/global/list/rockTurfEdgeCache = list(
 #undef NORTH_EDGING
 #undef SOUTH_EDGING
 #undef EAST_EDGING
-#undef WEST_EDGING
\ No newline at end of file
+#undef WEST_EDGING
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 303f08e39b3..73205be30ed 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/floors/plating.dmi b/icons/turf/floors/plating.dmi
new file mode 100644
index 00000000000..a08fbc76c5e
Binary files /dev/null and b/icons/turf/floors/plating.dmi differ