diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm
index c60c0650c861..fb1ce8595c84 100644
--- a/code/game/turfs/open/floor/plating/rockplanet.dm
+++ b/code/game/turfs/open/floor/plating/rockplanet.dm
@@ -1,10 +1,11 @@
 /turf/open/floor/plating/asteroid/rockplanet
 	name = "iron sand"
 	icon = 'icons/turf/planetary/rockplanet.dmi'
-	icon_state = "dry_soft"
-	base_icon_state = "dry_soft"
-	floor_variance = 100
-	max_icon_states = 7
+	icon_state = "rock-255"
+	base_icon_state = "rock"
+	floor_variance = 80
+	max_icon_states = 4
+	layer = SAND_TURF_LAYER
 	initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 	baseturfs = /turf/open/floor/plating/asteroid/rockplanet
@@ -12,6 +13,16 @@
 	digResult = /obj/item/stack/ore/glass/rockplanet
 	light_color = COLOR_ROCKPLANET_LIGHT
 
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_ASH)
+	canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_ASH)
+	smooth_icon = 'icons/turf/floors/rockplanet_dry.dmi'
+
+/turf/open/floor/plating/asteroid/rockplanet/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		add_overlay("rockalt_[rand(1,max_icon_states)]")
+
 /turf/open/floor/plating/asteroid/rockplanet/lit
 	light_color = COLOR_ROCKPLANET_LIGHT
 	light_range = 2
@@ -19,10 +30,15 @@
 
 /turf/open/floor/plating/asteroid/rockplanet/cracked
 	name = "iron cracked sand"
-	icon_state = "dry_cracked0"
-	base_icon_state = "dry_cracked"
+	icon = 'icons/turf/floors/rockplanet_caves.dmi'
+	layer = STONE_TURF_LAYER
 	baseturfs = /turf/open/floor/plating/asteroid/rockplanet
 	turf_type = /turf/open/floor/plating/asteroid/rockplanet
+	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_ASH_ROCKY)
+	canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_ASH_ROCKY)
+	smooth_icon = 'icons/turf/floors/rockplanet_caves.dmi'
+
+	floor_variance = 0
 
 /turf/open/floor/plating/asteroid/rockplanet/cracked/lit
 	light_range = 2
@@ -31,13 +47,14 @@
 	turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit
 
 /turf/open/floor/plating/asteroid/rockplanet/wet
-	icon_state = "wet_soft0"
-	base_icon_state = "wet_soft"
+	icon = 'icons/turf/floors/rockplanet_wet.dmi'
+	smooth_icon = 'icons/turf/floors/rockplanet_wet.dmi'
 
 /turf/open/floor/plating/asteroid/rockplanet/wet/lit
 	light_range = 2
 	light_power = 0.6
 
+//TODO: unused, remove
 /turf/open/floor/plating/asteroid/rockplanet/wet/cracked
 	name = "iron cracked sand"
 	icon_state = "wet_cracked0"
diff --git a/icons/turf/floors/rockplanet_caves.dmi b/icons/turf/floors/rockplanet_caves.dmi
new file mode 100644
index 000000000000..44b7b9be1c16
Binary files /dev/null and b/icons/turf/floors/rockplanet_caves.dmi differ
diff --git a/icons/turf/floors/rockplanet_dry.dmi b/icons/turf/floors/rockplanet_dry.dmi
new file mode 100644
index 000000000000..70a5386b103c
Binary files /dev/null and b/icons/turf/floors/rockplanet_dry.dmi differ
diff --git a/icons/turf/floors/rockplanet_wet.dmi b/icons/turf/floors/rockplanet_wet.dmi
new file mode 100644
index 000000000000..ee86879a0894
Binary files /dev/null and b/icons/turf/floors/rockplanet_wet.dmi differ