diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 90792b54602..3034e50e34d 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -116,8 +116,10 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 	//Drawing one pixel with a crayon
 	if(istype(I, /obj/item/toy/crayon))
 		var/obj/item/toy/crayon/C = I
-		if(masterpiece.GetPixel(pixX, pixY)) // if the located pixel isn't blank (null))
+		var/pix = masterpiece.GetPixel(pixX, pixY)
+		if(pix && pix != C.colour) // if the located pixel isn't blank (null))
 			DrawPixelOn(C.colour, pixX, pixY)
+		qdel(masterpiece)
 		return
 
 	..()
diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm
index f8243813e31..76633ea6fff 100644
--- a/code/modules/paperwork/frames.dm
+++ b/code/modules/paperwork/frames.dm
@@ -1,6 +1,6 @@
 /obj/item/weapon/picture_frame
 	name = "picture frame"
-	desc = "Its patented design allows it to be folded larger or smaller to accommodate standard paper, photo, and poster sizes."
+	desc = "Its patented design allows it to be folded larger or smaller to accommodate standard paper, photo, and poster, and canvas sizes."
 	icon = 'icons/obj/bureaucracy.dmi'
 
 	var/icon_base
@@ -33,6 +33,8 @@
 		icon_state = "[icon_base]-photo"
 	else if(istype(displayed, /obj/structure/sign/poster))
 		icon_state = "[icon_base]-[(displayed.icon_state in wide_posters) ? "wposter" : "poster"]"
+	else if(istype(displayed, /obj/item/weapon/canvas))
+		icon_state = "[icon_base]-canvas-[displayed.icon_state]"
 	else
 		icon_state = "[icon_base]-paper"
 
@@ -81,7 +83,7 @@
 				O.forceMove(user.loc)
 		displayed = null
 		qdel(src)
-	else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster))
+	else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster) || istype(I, /obj/item/weapon/canvas))
 		if(!displayed)
 			user.unEquip(I)
 			insert(I)
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 351635143af..1bd8373670c 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ