diff --git a/code/modules/admin/verbs/change_appearance.dm b/code/modules/admin/verbs/change_appearance.dm
index 2f7166a2c0..94c5170347 100644
--- a/code/modules/admin/verbs/change_appearance.dm
+++ b/code/modules/admin/verbs/change_appearance.dm
@@ -92,15 +92,7 @@
 
 	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female", "Neuter")
 	if (new_gender)
-		if(new_gender == "Male")
-			M.gender = MALE
-			M.dna.SetUIState(DNA_UI_GENDER, FALSE)
-		else if (new_gender == "Female")
-			M.gender = FEMALE
-			M.dna.SetUIState(DNA_UI_GENDER, TRUE)
-		else
-			M.gender = NEUTER
-			M.dna.SetUIState(DNA_UI_GENDER, FALSE)
+		M.set_gender(new_gender)
 
 	M.update_dna(M)
 	M.update_hair(FALSE)
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 67989b37b6..555c1a7072 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -140,6 +140,31 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	character.g_synth	= pref.g_synth
 	character.b_synth	= pref.b_synth
 	character.synth_markings = pref.synth_markings
+<<<<<<< HEAD
+=======
+	character.ear_style			= ear_styles_list[pref.ear_style]
+	character.r_ears	= pref.r_ears
+	character.b_ears	= pref.b_ears
+	character.g_ears			= pref.g_ears
+	character.r_ears2	= pref.r_ears2
+	character.b_ears2	= pref.b_ears2
+	character.g_ears2	= pref.g_ears2
+	character.tail_style = tail_styles_list[pref.tail_style]
+	character.r_tail	= pref.r_tail
+	character.b_tail	= pref.b_tail
+	character.g_tail	= pref.g_tail
+	character.r_tail2	= pref.r_tail2
+	character.b_tail2	= pref.b_tail2
+	character.g_tail2	= pref.g_tail2
+	character.wing_style = wing_styles_list[pref.wing_style]
+	character.r_wing	= pref.r_wing
+	character.b_wing	= pref.b_wing
+	character.g_wing	= pref.g_wing
+	character.r_wing2	= pref.r_wing2
+	character.b_wing2	= pref.b_wing2
+	character.g_wing2	= pref.g_wing2
+	character.set_gender( pref.biological_gender)
+>>>>>>> c58fb16... Adds proc to properly update human icon gender (#7813)
 
 	// Destroy/cyborgize organs and limbs.
 	for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 59d3576485..f2b4a1e588 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -196,3 +196,11 @@
 	var/list/all_bits = internal_organs|organs
 	for(var/obj/item/organ/O in all_bits)
 		O.set_dna(dna)
+
+/mob/living/carbon/human/proc/set_gender(var/g)
+	if(g != gender)
+		gender = g
+	
+	if(dna.GetUIState(DNA_UI_GENDER) ^ gender == FEMALE) // XOR will catch both cases where they do not match
+		dna.SetUIState(DNA_UI_GENDER, gender == FEMALE)
+		sync_organ_dna(dna)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index f47566279a..1cabd60aa8 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -233,10 +233,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 	//Create a new, blank icon for our mob to use.
 	var/icon/stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank")
 
-	var/g = "male"
-	if(gender == FEMALE)
-		g = "female"
-
+	var/g = (gender == MALE ? "male" : "female")
 	var/icon_key = "[species.get_race_key(src)][g][s_tone][r_skin][g_skin][b_skin]"
 	if(lip_style)
 		icon_key += "[lip_style]"