diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index f78f95db29b..12a2c733c42 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -712,9 +712,9 @@ world
 /// appearance system (overlays/underlays, etc.) is not available.
 ///
 /// Only the first argument is required.
-/proc/getFlatIcon(image/A, defdir, deficon, defstate, defblend, start = TRUE, no_anim = FALSE)
+/proc/getFlatIcon(image/A, defdir, deficon, defstate, defblend, start = TRUE, no_anim = TRUE)
 	//Define... defines.
-	var/static/icon/flat_template = icon('icons/effects/effects.dmi', "nothing")
+	var/static/icon/flat_template = icon('icons/blanks/32x32.dmi', "nothing")
 
 	#define BLANK icon(flat_template)
 	#define SET_SELF(SETVAR) do { \
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index bce6e914faa..26a50fa50a3 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -202,14 +202,11 @@
 
 	var/psize_x = (size_x * 2 + 1) * world.icon_size
 	var/psize_y = (size_y * 2 + 1) * world.icon_size
-	var/get_icon = camera_get_icon(turfs, target_turf, psize_x, psize_y, clone_area, size_x, size_y, (size_x * 2 + 1), (size_y * 2 + 1))
+	var/icon/get_icon = camera_get_icon(turfs, target_turf, psize_x, psize_y, clone_area, size_x, size_y, (size_x * 2 + 1), (size_y * 2 + 1))
 	qdel(clone_area)
-	var/icon/temp = icon('icons/effects/96x96.dmi',"")
-	temp.Blend("#000", ICON_OVERLAY)
-	temp.Scale(psize_x, psize_y)
-	temp.Blend(get_icon, ICON_OVERLAY)
+	get_icon.Blend("#000", ICON_UNDERLAY)
 
-	var/datum/picture/P = new("picture", desc.Join(" "), mobs_spotted, dead_spotted, temp, null, psize_x, psize_y, blueprints)
+	var/datum/picture/P = new("picture", desc.Join(" "), mobs_spotted, dead_spotted, get_icon, null, psize_x, psize_y, blueprints)
 	after_picture(user, P, flag)
 	blending = FALSE
 
diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm
index fa12cc20a7d..9b3034c8765 100644
--- a/code/modules/photography/camera/camera_image_capturing.dm
+++ b/code/modules/photography/camera/camera_image_capturing.dm
@@ -51,7 +51,7 @@
 				atoms += A
 			CHECK_TICK
 
-	var/icon/res = icon('icons/effects/96x96.dmi', "transparent")
+	var/icon/res = icon('icons/blanks/96x96.dmi', "transparent")
 	res.Scale(psize_x, psize_y)
 
 	var/list/sorted = list()
@@ -60,7 +60,7 @@
 		var/atom/c = atoms[i]
 		for(j = sorted.len, j > 0, --j)
 			var/atom/c2 = sorted[j]
-			if(c2.layer <= c.layer)
+			if((c2.plane <= c.plane) && (c2.layer <= c.layer))
 				break
 		sorted.Insert(j+1, c)
 		CHECK_TICK
@@ -76,7 +76,7 @@
 				var/atom/movable/AM = A
 				xo += AM.step_x
 				yo += AM.step_y
-			var/icon/img = getFlatIcon(A)
+			var/icon/img = getFlatIcon(A, no_anim = TRUE)
 			res.Blend(img, blendMode2iconMode(A.blend_mode), xo, yo)
 			CHECK_TICK
 	else
@@ -86,7 +86,7 @@
 			var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp
 			xo += clone.step_x
 			yo += clone.step_y
-			var/icon/img = getFlatIcon(clone)
+			var/icon/img = getFlatIcon(clone, no_anim = TRUE)
 			if(img)
 				if(clone.turn_angle) //the cheapest (so best, considering cams don't need to be laggier) way of doing this, considering getFlatIcon doesn't give a snot about transforms.'
 					img.Turn(clone.turn_angle)
diff --git a/icons/blanks/32x32.dmi b/icons/blanks/32x32.dmi
new file mode 100644
index 00000000000..6c4f2b33e0f
Binary files /dev/null and b/icons/blanks/32x32.dmi differ
diff --git a/icons/blanks/96x96.dmi b/icons/blanks/96x96.dmi
new file mode 100644
index 00000000000..d79e60c111a
Binary files /dev/null and b/icons/blanks/96x96.dmi differ