diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index a5162339181..af949b000f0 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -395,10 +395,6 @@
 /obj/structure/sign/warning/gas_mask/directional/north,
 /turf/open/floor/plating,
 /area/ruin/powered/beach)
-"me" = (
-/obj/effect/overlay/palmtree_r,
-/turf/open/misc/beach/sand,
-/area/ruin/powered/beach)
 "mh" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
@@ -801,7 +797,7 @@
 /turf/closed/wall/mineral/sandstone,
 /area/ruin/powered/beach)
 "Cb" = (
-/obj/effect/overlay/coconut,
+/obj/structure/flora/coconuts,
 /obj/machinery/light/directional/north,
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
@@ -1142,7 +1138,7 @@
 /turf/closed/wall/mineral/wood/nonmetal,
 /area/ruin/powered/beach)
 "Ou" = (
-/obj/effect/overlay/palmtree_l,
+/obj/structure/flora/tree/palm,
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "OE" = (
@@ -1183,7 +1179,7 @@
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "Qx" = (
-/obj/effect/overlay/coconut,
+/obj/structure/flora/coconuts,
 /turf/open/misc/beach/sand,
 /area/ruin/powered/beach)
 "QF" = (
@@ -1952,7 +1948,7 @@ Bp
 wL
 MZ
 dj
-me
+Ou
 aE
 VI
 sl
diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
index 7d117317c4b..70dfed5d5d6 100644
--- a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
@@ -35,11 +35,7 @@
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "j" = (
-/obj/effect/overlay/coconut,
-/turf/open/floor/grass,
-/area/ruin/space/has_grav)
-"k" = (
-/obj/effect/overlay/palmtree_l,
+/obj/structure/flora/coconuts,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "l" = (
@@ -67,7 +63,7 @@
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "r" = (
-/obj/effect/overlay/palmtree_r,
+/obj/structure/flora/tree/palm,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "s" = (
@@ -410,7 +406,7 @@ b
 b
 b
 d
-k
+r
 d
 d
 q
@@ -419,7 +415,7 @@ d
 j
 d
 d
-k
+r
 d
 d
 d
@@ -852,7 +848,7 @@ b
 d
 d
 d
-k
+r
 d
 i
 i
@@ -1051,7 +1047,7 @@ d
 d
 d
 d
-k
+r
 d
 d
 j
diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
index 0650d684a03..c98f0986934 100644
--- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
@@ -24,7 +24,7 @@
 /turf/closed/wall/rust,
 /area/ruin/space/has_grav/powered/aesthetic)
 "h" = (
-/obj/effect/overlay/palmtree_r,
+/obj/structure/flora/tree/palm,
 /turf/open/floor/holofloor/beach,
 /area/ruin/space/has_grav/powered/aesthetic)
 "i" = (
@@ -61,10 +61,6 @@
 /obj/structure/window/spawner/directional/east,
 /turf/open/floor/iron/vaporwave,
 /area/ruin/space/has_grav/powered/aesthetic)
-"p" = (
-/obj/effect/overlay/palmtree_l,
-/turf/open/floor/holofloor/beach,
-/area/ruin/space/has_grav/powered/aesthetic)
 "q" = (
 /turf/open/floor/holofloor/beach,
 /area/ruin/space/has_grav/powered/aesthetic)
@@ -160,7 +156,7 @@
 	},
 /area/ruin/space)
 "H" = (
-/obj/effect/overlay/palmtree_l,
+/obj/structure/flora/tree/palm,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "I" = (
@@ -186,10 +182,6 @@
 	icon_state = "stairs-r"
 	},
 /area/ruin/space)
-"M" = (
-/obj/effect/overlay/palmtree_r,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
 "O" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
@@ -431,7 +423,7 @@ o
 o
 f
 G
-M
+H
 d
 d
 "}
@@ -441,9 +433,9 @@ a
 d
 d
 g
-p
+h
 t
-p
+h
 u
 y
 g
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index 4b39903261f..3c064dc4965 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -35,7 +35,7 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "al" = (
-/obj/effect/overlay/palmtree_r{
+/obj/structure/flora/tree/palm{
 	desc = "How did you get here?";
 	icon_state = "palm2";
 	name = "\proper island palm tree"
@@ -48,7 +48,7 @@
 	},
 /area/awaymission/beach)
 "an" = (
-/obj/effect/overlay/coconut{
+/obj/structure/flora/coconuts{
 	pixel_x = 17;
 	pixel_y = 7
 	},
@@ -133,7 +133,7 @@
 	},
 /area/awaymission/beach)
 "aA" = (
-/obj/effect/overlay/palmtree_l,
+/obj/structure/flora/tree/palm,
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "aB" = (
@@ -145,7 +145,7 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "aD" = (
-/obj/effect/overlay/coconut,
+/obj/structure/flora/coconuts,
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "aE" = (
@@ -204,10 +204,6 @@
 "aX" = (
 /turf/closed/wall/mineral/sandstone,
 /area/awaymission/beach)
-"aZ" = (
-/obj/effect/overlay/palmtree_r,
-/turf/open/misc/beach/sand,
-/area/awaymission/beach)
 "ba" = (
 /obj/effect/turf_decal/sand,
 /turf/open/misc/beach/sand,
@@ -350,11 +346,6 @@
 	},
 /turf/open/floor/wood,
 /area/awaymission/beach)
-"bv" = (
-/obj/effect/overlay/palmtree_r,
-/obj/effect/overlay/coconut,
-/turf/open/misc/beach/sand,
-/area/awaymission/beach)
 "bx" = (
 /obj/effect/turf_decal/sand,
 /obj/effect/turf_decal/stripes/asteroid/line{
@@ -405,10 +396,10 @@
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "bE" = (
-/obj/effect/overlay/palmtree_l{
+/obj/structure/flora/tree/palm{
 	pixel_y = 25
 	},
-/obj/effect/overlay/coconut{
+/obj/structure/flora/coconuts{
 	pixel_x = -7;
 	pixel_y = 7
 	},
@@ -600,8 +591,8 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "ch" = (
-/obj/effect/overlay/palmtree_l,
-/obj/effect/overlay/coconut,
+/obj/structure/flora/tree/palm,
+/obj/structure/flora/coconuts,
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "ci" = (
@@ -847,7 +838,7 @@
 /turf/open/misc/beach/sand,
 /area/awaymission/beach)
 "cV" = (
-/obj/effect/overlay/coconut{
+/obj/structure/flora/coconuts{
 	pixel_x = -5;
 	pixel_y = 4
 	},
@@ -5281,7 +5272,7 @@ av
 av
 ag
 MD
-aZ
+aA
 ak
 ak
 ak
@@ -6127,7 +6118,7 @@ ak
 ak
 ak
 ak
-aZ
+aA
 ak
 ak
 ak
@@ -6547,7 +6538,7 @@ ak
 ak
 ak
 ak
-aZ
+aA
 bf
 bp
 bx
@@ -8161,7 +8152,7 @@ ba
 bG
 ak
 ak
-aZ
+aA
 ak
 ak
 ak
@@ -8494,7 +8485,7 @@ ak
 ak
 ak
 ak
-aZ
+aA
 ak
 ak
 ap
@@ -9127,7 +9118,7 @@ ak
 ak
 ak
 ak
-bv
+ch
 ak
 ak
 cu
@@ -9244,7 +9235,7 @@ ak
 ak
 cu
 ak
-aZ
+aA
 bo
 aq
 av
@@ -9769,7 +9760,7 @@ bT
 ca
 aX
 ak
-aZ
+aA
 ak
 ak
 cu
@@ -10307,7 +10298,7 @@ ak
 ak
 ak
 ak
-aZ
+aA
 ak
 ak
 ak
@@ -10525,7 +10516,7 @@ ak
 ak
 ak
 ak
-aZ
+aA
 ak
 ak
 ak
@@ -10829,7 +10820,7 @@ ak
 ak
 ak
 ak
-bv
+ch
 ak
 ba
 ba
diff --git a/_maps/map_files/Basketball/beach_bums.dmm b/_maps/map_files/Basketball/beach_bums.dmm
index 19ccafc78cf..06ea7084054 100644
--- a/_maps/map_files/Basketball/beach_bums.dmm
+++ b/_maps/map_files/Basketball/beach_bums.dmm
@@ -55,7 +55,7 @@
 /turf/open/misc/beach/sand,
 /area/centcom/basketball)
 "fj" = (
-/obj/effect/overlay/coconut,
+/obj/structure/flora/coconuts,
 /turf/open/misc/beach/sand,
 /area/centcom/basketball)
 "fu" = (
@@ -150,7 +150,7 @@
 /turf/open/misc/beach/sand,
 /area/centcom/basketball)
 "un" = (
-/obj/effect/overlay/palmtree_r,
+/obj/structure/flora/tree/palm,
 /turf/open/misc/beach/sand,
 /area/centcom/basketball)
 "uH" = (
@@ -298,10 +298,6 @@
 /obj/structure/flora/rock/pile/jungle/style_random,
 /turf/open/water/beach,
 /area/centcom/basketball)
-"Eb" = (
-/obj/effect/overlay/palmtree_l,
-/turf/open/misc/beach/sand,
-/area/centcom/basketball)
 "EX" = (
 /obj/structure/fence/corner,
 /turf/open/misc/beach/sand,
@@ -792,7 +788,7 @@ BM
 BM
 Fi
 Uv
-Eb
+un
 eM
 Ul
 lD
@@ -858,7 +854,7 @@ YI
 BW
 ao
 lD
-Eb
+un
 IM
 iB
 Jb
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index c909eaa1a32..8058677f938 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -4994,7 +4994,7 @@
 "bjf" = (
 /obj/machinery/light/directional/east,
 /obj/effect/landmark/start/hangover,
-/obj/effect/overlay/coconut,
+/obj/structure/flora/coconuts,
 /turf/open/misc/beach/sand,
 /area/station/hallway/floor2/fore)
 "bjg" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index e82ca3b6d6c..db5dfa0d12e 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -65973,7 +65973,7 @@
 "wtR" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/flora/tree/palm/style_random,
-/obj/effect/overlay/coconut,
+/obj/structure/flora/coconuts,
 /turf/open/misc/grass/jungle,
 /area/station/science/explab)
 "wtS" = (
diff --git a/_maps/templates/holodeck_beach.dmm b/_maps/templates/holodeck_beach.dmm
index 1f933e5925c..6260ed27862 100644
--- a/_maps/templates/holodeck_beach.dmm
+++ b/_maps/templates/holodeck_beach.dmm
@@ -42,8 +42,8 @@
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
 "T" = (
-/obj/effect/overlay/palmtree_l,
-/obj/effect/overlay/coconut,
+/obj/structure/flora/tree/palm,
+/obj/structure/flora/coconuts,
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
 "W" = (
@@ -51,7 +51,7 @@
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
 "X" = (
-/obj/effect/overlay/palmtree_r,
+/obj/structure/flora/tree/palm,
 /turf/open/floor/holofloor/beach,
 /area/template_noop)
 
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 619071da278..318af5cf52e 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -17,30 +17,6 @@
 	. = ..()
 	QDEL_IN(src, 10)
 
-/obj/effect/overlay/palmtree_r
-	name = "palm tree"
-	icon = 'icons/misc/beach2.dmi'
-	icon_state = "palm1"
-	density = TRUE
-	layer = WALL_OBJ_LAYER
-	plane = GAME_PLANE_UPPER
-	anchored = TRUE
-
-/obj/effect/overlay/palmtree_l
-	name = "palm tree"
-	icon = 'icons/misc/beach2.dmi'
-	icon_state = "palm2"
-	density = TRUE
-	layer = WALL_OBJ_LAYER
-	plane = GAME_PLANE_UPPER
-	anchored = TRUE
-
-/obj/effect/overlay/coconut
-	gender = PLURAL
-	name = "coconuts"
-	icon = 'icons/misc/beach.dmi'
-	icon_state = "coconuts"
-
 /obj/effect/overlay/sparkles
 	gender = PLURAL
 	name = "sparkles"
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index d45d6ac921a..0424b4d2722 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -494,6 +494,12 @@
  * Palm Trees *
  **************/
 
+/obj/structure/flora/coconuts
+	gender = PLURAL
+	name = "coconuts"
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "coconuts"
+
 /obj/structure/flora/tree/palm
 	name = "palm tree"
 	desc = "A tree straight from the tropics."