diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 75892110924de..9ce00dce2c475 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -69,8 +69,9 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
 	//list(/datum/quirk/flimsy,/datum/quirk/tough),
 
 	// You must have working eyes for hypnotic gaze.
-	// Disabled because quirk was replaced by NIFsoft
-	//list(/datum/quirk/Hypnotic_gaze,/datum/quirk/item_quirk/blindness,/datum/quirk/echolocation),
+	// NOTE: Quirk was replaced by NIFsoft
+	list(/datum/quirk/hypnotic_gaze,/datum/quirk/item_quirk/blindness),
+	list(/datum/quirk/hypnotic_gaze,/datum/quirk/echolocation),
 
 	// You can't smell anything!
 	list(/datum/quirk/cum_sniff,/datum/quirk/item_quirk/anosmia),
diff --git a/modular_zzplurt/code/datums/quirks/negative_quirks/dumb_for_cum.dm b/modular_zzplurt/code/datums/quirks/negative_quirks/dumb_for_cum.dm
index 012d30e4c0c89..c0efa2e545ce5 100644
--- a/modular_zzplurt/code/datums/quirks/negative_quirks/dumb_for_cum.dm
+++ b/modular_zzplurt/code/datums/quirks/negative_quirks/dumb_for_cum.dm
@@ -8,7 +8,7 @@
 	lose_text = span_purple("Cum didn't even taste that good, anyways.")
 	medical_record_text = "Patient seems to have an unhealthy psychological obsession with seminal fluids."
 	mob_trait = TRAIT_DUMB_CUM
-	icon = FA_ICON_DROPLET
+	icon = FA_ICON_FAUCET_DRIP
 	erp_quirk = TRUE
 	var/timer_crave
 
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/choke_slut.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/choke_slut.dm
index 7e2fa8fe51610..cd0273c3722bc 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/choke_slut.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/choke_slut.dm
@@ -6,7 +6,7 @@
 	lose_text = span_purple("You stop feeling aroused by suffocation.")
 	medical_record_text = "Patient exhibits an abnormal obsession with restricted breathing."
 	mob_trait = TRAIT_CHOKE_SLUT
-	icon = FA_ICON_LUNGS
+	icon = FA_ICON_HEAD_SIDE_COUGH
 	erp_quirk = TRUE
 	mail_goodies = list (
 		/obj/item/reagent_containers/hypospray/medipen = 1 // Fix your oxy loss
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/concubus.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/concubus.dm
index 27902aeb1d143..2b39b363a1830 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/concubus.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/concubus.dm
@@ -10,7 +10,7 @@
 	lose_text = span_purple("Your bodily fluid cravings fade back away.")
 	medical_record_text = "Patient claims to subsist entirely on lactose and reproductive fluids."
 	mob_trait = TRAIT_CONCUBUS
-	icon = FA_ICON_DROPLET
+	icon = FA_ICON_COW
 	erp_quirk = TRUE
 	mail_goodies = list (
 		/datum/glass_style/drinking_glass/cum = 1,
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/cosglow.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/cosglow.dm
index 2d91e872c5354..0b03d5b58e682 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/cosglow.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/cosglow.dm
@@ -21,7 +21,7 @@
 	lose_text = span_notice("You realize that working for the space agency sucks!")
 	medical_record_text = "Patient emits a subtle emissive aura."
 	mob_trait = TRAIT_COSGLOW
-	icon = FA_ICON_PERSON_RAYS
+	icon = FA_ICON_MAGIC_WAND_SPARKLES
 	mail_goodies = list (
 		/obj/item/flashlight/glowstick = 1
 	)
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_plus.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_plus.dm
index 8a88b499a13da..55d8825a5dc4e 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_plus.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_plus.dm
@@ -10,7 +10,7 @@
 	gain_text = span_purple("You feel pressure in your groin.")
 	lose_text = span_purple("You feel a weight lifted from your groin.")
 	medical_record_text = "Patient exhibits increased production of sexual fluids."
-	icon = FA_ICON_DROPLET
+	icon = FA_ICON_HEART_CIRCLE_PLUS
 	erp_quirk = TRUE
 
 // Note: Increasing size increases production rate
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm
index 3482fcd073e74..673ab609c26d3 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm
@@ -7,6 +7,6 @@
 	gain_text = span_purple("You begin sensing peculiar smells from people's bits...")
 	lose_text = span_purple("People's genitals start smelling all the same to you...")
 	medical_record_text = "Patient has exemplary olfactory capability for specific body regions."
-	icon = FA_ICON_SOCCER_BALL
+	icon = FA_ICON_VIAL
 	erp_quirk = TRUE
 	hidden_quirk = TRUE
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm
index 269b0da2367a3..c4d06aa3d1ccd 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm
@@ -6,7 +6,7 @@
 
 // REMOVED QUIRK - Disabled in favor of new NIFSoft method
 // This file still contains the action
-/datum/quirk/Hypnotic_gaze
+/datum/quirk/hypnotic_gaze
 	name = "Hypnotic Gaze"
 	desc = "Prolonged eye contact with you can place a viewer into a highly-suggestible hypnotic trance."
 	value = 0
@@ -14,11 +14,11 @@
 	lose_text = span_purple("Your eyes return to normal.")
 	medical_record_text = "Patient's eyes exhibits soporific effects. Additional testing may be necessary."
 	mob_trait = TRAIT_HYPNOTIC_GAZE
-	icon = FA_ICON_ARROWS_TO_EYE
+	icon = FA_ICON_FAN
 	erp_quirk = TRUE
 	hidden_quirk = TRUE
 
-/datum/quirk/Hypnotic_gaze/add()
+/datum/quirk/hypnotic_gaze/add()
 	// Define quirk mob
 	var/mob/living/carbon/human/quirk_mob = quirk_holder
 
@@ -29,7 +29,7 @@
 	// Add status effect
 	quirk_holder.apply_status_effect(/datum/status_effect/quirk_hypnotic_gaze)
 
-/datum/quirk/Hypnotic_gaze/remove()
+/datum/quirk/hypnotic_gaze/remove()
 	// Define quirk mob
 	var/mob/living/carbon/human/quirk_mob = quirk_holder
 
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
index d969d8e71291e..dcd68645b844b 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
@@ -6,7 +6,7 @@
 	lose_text = span_purple("You don't feel the need to make a mess anymore.")
 	medical_record_text = "Patient's body has above-average fluid production capability."
 	mob_trait = TRAIT_MESSY
-	icon = FA_ICON_DROPLET
+	icon = FA_ICON_EXPLOSION
 	erp_quirk = TRUE
 	mail_goodies = list (
 		/obj/item/mop = 1 // Clean this mess up!
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/phobia.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/phobia.dm
new file mode 100644
index 0000000000000..7dcb87e2bedf5
--- /dev/null
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/phobia.dm
@@ -0,0 +1,3 @@
+/datum/quirk/phobia
+	// Override icon
+	icon = FA_ICON_SPAGHETTI_MONSTER_FLYING
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/undead.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/undead.dm
index 165b61fc32b17..cd2df6fb4f18f 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/undead.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/undead.dm
@@ -8,7 +8,7 @@
     lose_text = span_notice("By some miracle, you've been brought back to life!")
     medical_record_text = "Patient is listed as deceased in medical records."
     mob_trait = TRAIT_UNDEAD
-    icon = FA_ICON_SKULL_CROSSBONES
+    icon = FA_ICON_HEAD_SIDE_VIRUS
 
 /datum/quirk/undead/add()
 	// Define quirk holder mob
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm
index e16bf611e59ce..90c0483b11dff 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm
@@ -8,7 +8,7 @@
 	lose_text = span_notice("The moon's call hushes into silence.")
 	medical_record_text = "Patient has been reported howling at the night sky."
 	mob_trait = TRAIT_WEREWOLF
-	icon = FA_ICON_MOON
+	icon = FA_ICON_PAW
 	hidden_quirk = TRUE
 
 /datum/quirk/werewolf/post_add()
diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm
index 4588bcd539700..dbfd2debbd469 100644
--- a/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm
+++ b/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm
@@ -13,7 +13,7 @@
 	medical_record_text = "Patient exhibits onset symptoms of a sanguine curse."
 	mob_trait = TRAIT_BLOODFLEDGE
 	hardcore_value = -2
-	icon = FA_ICON_WINE_GLASS
+	icon = FA_ICON_CHAMPAGNE_GLASSES
 
 /datum/quirk/item_quirk/bloodfledge/add()
 	// Define quirk mob
diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm
index 837ae38215453..0d5fdf85f087d 100644
--- a/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm
+++ b/modular_zzplurt/code/datums/quirks/positive_quirks/breathless.dm
@@ -7,5 +7,5 @@
 	medical_record_text = "Patient demonstrates no requirement for oxygen intake."
 	mob_trait = TRAIT_NOBREATH
 	hardcore_value = -4
-	icon = FA_ICON_LUNGS
+	icon = FA_ICON_BAN_SMOKING
 	hidden_quirk = TRUE
diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/flutter.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/flutter.dm
index 2179fb5263440..5d7cea23e16e9 100644
--- a/modular_zzplurt/code/datums/quirks/positive_quirks/flutter.dm
+++ b/modular_zzplurt/code/datums/quirks/positive_quirks/flutter.dm
@@ -7,7 +7,7 @@
 	medical_record_text = "Patient demonstrates exceptional maneuverability in low-gravity environments."
 	mob_trait = TRAIT_FLUTTER
 	hardcore_value = -1
-	icon = FA_ICON_DOVE
+	icon = FA_ICON_PLANE
 
 /mob/Process_Spacemove(movement_dir, continuous_move)
 	if(HAS_TRAIT(src, TRAIT_FLUTTER))
diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/restorative_metabolism.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/restorative_metabolism.dm
index c3d0573adc4fb..34b475ed12370 100644
--- a/modular_zzplurt/code/datums/quirks/positive_quirks/restorative_metabolism.dm
+++ b/modular_zzplurt/code/datums/quirks/positive_quirks/restorative_metabolism.dm
@@ -15,7 +15,7 @@
 	medical_record_text = "Patient possesses a self-reconstructive condition. Medical care is only required under extreme circumstances."
 	mob_trait = TRAIT_RESTORATIVE_METABOLISM
 	hardcore_value = -10
-	icon = FA_ICON_NOTES_MEDICAL
+	icon = FA_ICON_BRIEFCASE_MEDICAL
 
 /datum/quirk/restorative_metabolism/process(seconds_per_tick)
 	// Quirk holder must be injured
diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/vacuum_resistance.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/vacuum_resistance.dm
index f4a8790f839bd..da609adbdb03a 100644
--- a/modular_zzplurt/code/datums/quirks/positive_quirks/vacuum_resistance.dm
+++ b/modular_zzplurt/code/datums/quirks/positive_quirks/vacuum_resistance.dm
@@ -7,7 +7,7 @@
     medical_record_text = "Patient's body has fully adapted to zero-pressure environments."
     mob_trait = TRAIT_VACUUM_RESIST
     hardcore_value = -6
-    icon = FA_ICON_USER_ASTRONAUT
+    icon = FA_ICON_ROCKET
     mail_goodies = list (
         /obj/item/storage/box/emergency_spacesuit = 1
     )
diff --git a/modular_zzplurt/code/modules/mob/living/carbon/carbon_defense.dm b/modular_zzplurt/code/modules/mob/living/carbon/carbon_defense.dm
index 480d1df2ca0e5..ee23011e86814 100644
--- a/modular_zzplurt/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/modular_zzplurt/code/modules/mob/living/carbon/carbon_defense.dm
@@ -107,9 +107,8 @@
 		if(!quirk_mob)
 			return
 
-		// Adjust arousal and pleasure
+		// Adjust arousal
 		quirk_mob.adjust_arousal(amount)
-		quirk_mob.adjust_pleasure(amount / 2)
 
 /mob/living/carbon/proc/can_touch_retaliate()
 	// User must be conscious
diff --git a/tgstation.dme b/tgstation.dme
index 508cf2b41e003..1739820412bce 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9428,6 +9428,7 @@
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\modularlimbs.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\nudist.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\personalspace.dm"
+#include "modular_zzplurt\code\datums\quirks\neutral_quirks\phobia.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\sodiumsensetivity.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\storage_concealment.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\undead.dm"