diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm
index e5dd40e06ba..582c327fc66 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm
@@ -4053,7 +4053,6 @@
 /area/mine/laborcamp)
 "ye" = (
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /obj/machinery/firealarm/directional/south,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
index 5c8d82176ec..8b7f98f0e00 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -547,7 +547,6 @@
 /area/ruin/space/powered/bar)
 "wQ" = (
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/powered/bar)
 "xZ" = (
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index 936c668fd07..d457d32ed89 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -3826,7 +3826,6 @@
 /obj/structure/mopbucket/full{
 	dir = 4
 	},
-/obj/item/mop,
 /turf/simulated/floor/plasteel/freezer,
 /area/syndicate_mothership)
 "mS" = (
@@ -4589,9 +4588,8 @@
 /turf/simulated/floor/plasteel,
 /area/admin)
 "pu" = (
-/obj/structure/mopbucket,
-/obj/item/mop,
 /obj/structure/sink/directional/north,
+/obj/structure/mopbucket/full,
 /turf/simulated/floor/plasteel/dark,
 /area/ghost_bar)
 "pw" = (
@@ -6477,7 +6475,9 @@
 /turf/simulated/floor/plasteel/freezer,
 /area/trader_station/sol)
 "wd" = (
-/obj/structure/mopbucket,
+/obj/structure/mopbucket/full{
+	dir = 4
+	},
 /obj/item/soap,
 /turf/simulated/floor/plasteel/freezer,
 /area/trader_station/sol)
@@ -6487,7 +6487,6 @@
 /turf/simulated/floor/plasteel/white,
 /area/shuttle/escape)
 "wf" = (
-/obj/item/mop,
 /obj/structure/mirror{
 	pixel_x = 28
 	},
@@ -6917,12 +6916,13 @@
 /turf/simulated/floor/plasteel/white,
 /area/centcom/control)
 "xw" = (
-/obj/structure/mopbucket,
-/obj/item/mop,
 /obj/effect/turf_decal/tiles/department/security/corner,
 /obj/effect/turf_decal/tiles/department/security/corner{
 	dir = 1
 	},
+/obj/structure/mopbucket/full{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/freezer,
 /area/ghost_bar)
 "xx" = (
@@ -10707,12 +10707,13 @@
 /turf/simulated/floor/wood,
 /area/ghost_bar)
 "KW" = (
-/obj/structure/mopbucket,
-/obj/item/soap/syndie,
-/obj/item/mop,
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/mopbucket/full{
+	dir = 8
+	},
+/obj/item/soap/syndie,
 /turf/simulated/floor/plasteel/freezer,
 /area/ghost_bar)
 "KX" = (
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 50e27f896cd..705c15f9ac2 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -31166,7 +31166,6 @@
 /area/station/medical/patients_rooms_secondary)
 "cpd" = (
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /obj/item/caution,
 /obj/item/caution,
 /obj/effect/turf_decal/tiles/department/security/side{
@@ -45024,7 +45023,6 @@
 /area/station/maintenance/disposal)
 "dzN" = (
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "dAq" = (
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 8265614913d..e3bcd176da6 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -27832,7 +27832,6 @@
 	},
 /obj/item/caution,
 /obj/item/caution,
-/obj/item/mop,
 /obj/effect/turf_decal/delivery/hollow,
 /obj/effect/turf_decal/tiles/department/command/side{
 	dir = 8
@@ -52303,7 +52302,6 @@
 	dir = 8
 	},
 /obj/item/caution,
-/obj/item/mop,
 /obj/effect/spawner/random/dirt/frequent,
 /obj/effect/turf_decal/tiles/department/cargo,
 /turf/simulated/floor/plasteel/dark,
@@ -80521,7 +80519,6 @@
 /obj/structure/mopbucket/full{
 	dir = 8
 	},
-/obj/item/mop,
 /turf/simulated/floor/plating,
 /area/station/maintenance/security/fore_starboard)
 "qAR" = (
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 24521da897f..f55b06b45a2 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -77390,7 +77390,6 @@
 "qjO" = (
 /obj/item/wrench,
 /obj/item/storage/bag/trash,
-/obj/item/mop,
 /obj/item/reagent_containers/glass/bottle/ammonia,
 /obj/structure/shelf,
 /turf/simulated/floor/plating,
@@ -96938,7 +96937,6 @@
 /area/station/maintenance/fore)
 "yhn" = (
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /obj/item/caution,
 /obj/effect/turf_decal/tiles/department/command/corner{
 	dir = 4
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index c86a991cd05..7b03508ec85 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -41889,7 +41889,6 @@
 /area/station/maintenance/apmaint)
 "iwv" = (
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /obj/structure/sign/poster/official/random/directional/south,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fpmaint)
@@ -51658,10 +51657,12 @@
 /turf/simulated/floor/wood,
 /area/station/security/permabrig)
 "ksv" = (
-/obj/structure/mopbucket/full,
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/mopbucket/full{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/security/fore)
 "ksB" = (
@@ -52768,10 +52769,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
-"kFA" = (
-/obj/item/mop,
-/turf/simulated/floor/plating,
-/area/station/maintenance/security/fore)
 "kFC" = (
 /obj/structure/chair{
 	dir = 1
@@ -170923,7 +170920,7 @@ aZS
 aZS
 cwI
 sUW
-kFA
+gjn
 wiA
 gjn
 sgI
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 35a1945ae61..1c5b9259474 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -29320,7 +29320,6 @@
 	dir = 1
 	},
 /obj/structure/mopbucket/full,
-/obj/item/mop,
 /obj/item/caution,
 /obj/item/caution,
 /obj/item/caution,
diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index e1b990d3438..6b80c702a99 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -18,6 +18,8 @@
 /obj/structure/mopbucket/full/Initialize(mapload)
 	. = ..()
 	reagents.add_reagent("water", 150)
+	stored_mop = new /obj/item/mop(src)
+	update_icon(UPDATE_OVERLAYS)
 
 /obj/structure/mopbucket/Destroy()
 	GLOB.janitorial_equipment -= src