diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index cfc9120d301..08cd98d04ea 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -199,7 +199,9 @@
 /obj/item/device/lightreplacer/cyborg
 
 /obj/item/device/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
-	J.myreplacer=J.put_in_cart(src, user)
+	J.put_in_cart(src, user)
+	J.myreplacer = src
+	J.update_icon()
 
 /obj/item/device/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
 	return
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 5126249f9d5..1dec414ff71 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -50,7 +50,9 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A)
 
 
 /obj/item/weapon/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
-	J.mymop=J.put_in_cart(src, user)
+	J.put_in_cart(src, user)
+	J.mymop=src
+	J.update_icon()
 
 /obj/item/weapon/mop/cyborg
 
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 13acbb258a0..59fde425b6c 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -51,7 +51,9 @@
 /obj/item/weapon/storage/bag/trash/cyborg
 
 /obj/item/weapon/storage/bag/trash/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
-	J.mybag=J.put_in_cart(src, user)
+	J.put_in_cart(src, user)
+	J.mybag=src
+	J.update_icon()
 
 /obj/item/weapon/storage/bag/trash/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J)
 	return
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index a82a01a63e6..3417b1eae10 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -37,10 +37,9 @@
 /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user)
 	user.drop_item()
 	I.loc = src
-	update_icon()
 	updateUsrDialog()
 	user << "<span class='notice'>You put [I] into [src].</span>"
-	return I
+	return
 
 
 /obj/structure/janitorialcart/attackby(obj/item/I, mob/user)
@@ -64,7 +63,9 @@
 			user <<  fail_msg
 	else if(istype(I, /obj/item/weapon/reagent_containers/spray/cleaner))
 		if(!myspray)
-			myspray=put_in_cart(I, user)
+			put_in_cart(I, user)
+			myspray=I
+			update_icon()
 		else
 			user << fail_msg
 	else if(istype(I, /obj/item/device/lightreplacer))
@@ -77,6 +78,7 @@
 		if(signs < max_signs)
 			put_in_cart(I, user)
 			signs++
+			update_icon()
 		else
 			user << "<span class='notice'>[src] can't hold any more signs.</span>"
 	else if(mybag)