diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 0f4bf8fa162..16046f29944 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -692,7 +692,18 @@ The _flatIcons list is a cache for generated icon files.
 	var/image/copy
 	// Add the atom's icon itself, without pixel_x/y offsets.
 	if(!noIcon)
-		copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=curdir)
+		if(curdir == SOUTH)
+			copy = image(curicon, curstate)
+		else
+			var/icon/dirIcon
+			if(curdir == NORTH || curdir == SOUTH || curdir == EAST || curdir == WEST)
+				dirIcon = icon('icons/effects/effects.dmi', "nothing_4way")
+			else
+				dirIcon = icon('icons/effects/effects.dmi', "nothing_8way")
+			var/icon/copyicon = icon(curicon, curstate)
+			dirIcon.Blend(copyicon, ICON_OVERLAY)
+			copy = image(dirIcon)
+		copy.dir = curdir
 		copy.color = A.color
 		copy.alpha = A.alpha
 		copy.blend_mode = curblend
@@ -1006,4 +1017,4 @@ var/global/list/humanoid_icon_cache = list()
 //Images have dir without being an atom, so they get their own definition.
 //Lame.
 /image/proc/setDir(newdir)
-	dir = newdir
+	dir = newdir
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index a23c8b993d9..52b39bc2737 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -258,9 +258,9 @@
 						holding = "They are holding \a [L.r_hand]"
 
 			if(!mob_detail)
-				mob_detail = "You can see [L] on the photo[L.health < 75 ? " - [L] looks hurt":""].[holding ? " [holding]":"."]. "
+				mob_detail = "You can see [L] on the photo[L.health < (L.maxHealth * 0.75) ? " - [L] looks hurt":""].[holding ? " [holding]":"."]. "
 			else
-				mob_detail += "You can also see [L] on the photo[L.health < 75 ? " - [L] looks hurt":""].[holding ? " [holding]":"."]."
+				mob_detail += "You can also see [L] on the photo[L.health < (L.maxHealth * 0.75) ? " - [L] looks hurt":""].[holding ? " [holding]":"."]."
 
 
 	return mob_detail
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 52e8dad7371..525558fa8d7 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ