diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index c51528eb6e6..6d578e585e7 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -146,6 +146,11 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		if(E.status & ORGAN_ROBOT)
 			temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
 		preview_icon.Blend(temp, ICON_OVERLAY)
+	
+	//Tail
+	if(H.species.tail && H.species.flags & HAS_TAIL)
+		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
+		preview_icon.Blend(temp, ICON_OVERLAY)
 
 	// Skin tone
 	if(H.species.flags & HAS_SKIN_TONE)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 108e6e5ca99..b32a4780b03 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -212,6 +212,11 @@ datum/preferences
 
 			preview_icon.Blend(temp, ICON_OVERLAY)
 
+		//Tail
+		if(current_species && (current_species.flags & HAS_TAIL))
+			var/icon/temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[current_species.tail]_s")
+			preview_icon.Blend(temp, ICON_OVERLAY)
+		
 		// Skin color
 		if(current_species && (current_species.flags & HAS_SKIN_COLOR))
 			preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)