diff --git a/Common/Defs/GeneDefs/GeneDefs_Cum.xml b/Common/Defs/GeneDefs/GeneDefs_Cum.xml
index 900d4b0..28b841a 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Cum.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Cum.xml
@@ -19,7 +19,7 @@
     <defName>rjw_genes_no_cum</defName>
     <label>No Cum</label>
     <description>Males of these species have no fluid.</description>
-    <iconPath>Genes/Icons/no_cum</iconPath>
+    <iconPath>Genes/Icons/No_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_NoCum</geneClass>
     <displayOrderInCategory>533</displayOrderInCategory>
     <biostatCpx>0</biostatCpx>
@@ -30,7 +30,7 @@
     <defName>rjw_genes_much_cum</defName>
     <label>Much Cum</label>
     <description>Males of this species produce a lot of fluid.</description>
-    <iconPath>Genes/Icons/much_cum</iconPath>
+    <iconPath>Genes/Icons/Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_MuchCum</geneClass>
     <displayOrderInCategory>534</displayOrderInCategory>
     <biostatCpx>1</biostatCpx>
@@ -41,7 +41,7 @@
     <defName>rjw_genes_very_much_cum</defName>
     <label>Very Much Cum</label>
     <description>Males of this species produce a whole lot of fluid. They are like fountains basically.</description>
-    <iconPath>Genes/Icons/very_much_cum</iconPath>
+    <iconPath>Genes/Icons/Very_Much_Cum</iconPath>
     <geneClass>RJW_Genes.Gene_VeryMuchCum</geneClass>
     <displayOrderInCategory>535</displayOrderInCategory>
     <biostatCpx>1</biostatCpx>
diff --git a/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
index e3217e4..294dc66 100644
--- a/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
@@ -40,7 +40,7 @@
     <defName>rjw_genes_extra_vagina</defName>
     <label>extra vagina</label>
     <description>Females of this species grow an additional vagina .</description>
-    <iconPath>Genes/Icons/extra_female</iconPath>
+    <iconPath>Genes/Icons/Extra_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_ExtraVagina</geneClass>
     <displayOrderInCategory>703</displayOrderInCategory>
     <exclusionTags>
@@ -52,7 +52,7 @@
     <defName>rjw_genes_no_vagina</defName>
     <label>no vagina</label>
     <description>Females of this do not have a vagina.</description>
-    <iconPath>Genes/Icons/No_Female_Genitalia</iconPath>
+    <iconPath>Genes/Icons/No_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_NoVagina</geneClass>
     <displayOrderInCategory>704</displayOrderInCategory>
     <exclusionTags>
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
index 175f36d..5c43285 100644
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
@@ -42,7 +42,7 @@
     <defName>rjw_genes_loose_female_genitalia</defName>
     <label>Loose Female Genitalia</label>
     <description>Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday)</description>
-    <iconPath>Genes/Icons/Loose_Female_Genitalia</iconPath>
+    <iconPath>Genes/Icons/Loose_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_LooseFemaleGenitalia</geneClass>
     <displayOrderInCategory>754</displayOrderInCategory>
     <exclusionTags>
@@ -54,7 +54,7 @@
     <defName>rjw_genes_tight_female_genitalia</defName>
     <label>Tight Female Genitalia</label>
     <description>Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday)</description>
-    <iconPath>Genes/Icons/Tight_Female_Genitalia</iconPath>
+    <iconPath>Genes/Icons/Tight_Vagina</iconPath>
     <geneClass>RJW_Genes.Gene_TightFemaleGenitalia</geneClass>
     <displayOrderInCategory>756</displayOrderInCategory>
     <exclusionTags>
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
index a180910..112d5cc 100644
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
@@ -65,7 +65,7 @@
     <defName>rjw_genes_slime_genitalia</defName>
     <label>slime genitalia</label>
     <description>Carriers of this gene have slime genitalia.</description>
-    <iconPath>Genes/Icons/Genitalia_Slime</iconPath>
+    <iconPath>Genes/Icons/Slime_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_SlimeGenitalia</geneClass>
     <displayOrderInCategory>807</displayOrderInCategory>
   </GeneDef>
diff --git a/Common/Defs/GeneDefs/GeneDefs_Hive.xml b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
index 47fc3cb..26e4ebc 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
@@ -232,7 +232,7 @@
     <defName>rjw_genes_insectbreeder</defName>
     <label>Insect Breeder</label>	
     <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
-    <iconPath>World/WorldObjects/Expanding/Insects</iconPath>
+    <iconPath>Genes/Icons/Insect_Breeder</iconPath>
     <displayOrderInCategory>53</displayOrderInCategory>
 	<displayCategory>rjw_genes_hive</displayCategory>
     <biostatCpx>1</biostatCpx>
diff --git a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
index abe6d22..9f5e291 100644
--- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
@@ -135,7 +135,7 @@
 		<label>paralysing kiss</label>
 		<labelShortAdj>paralysing kiss</labelShortAdj>
 		<description>Carriers of this gene are able to briefly stun an enemy with a kiss.</description>
-		<iconPath>Genes/Icons/rjw_genes_lips</iconPath>
+		<iconPath>Genes/Icons/Paralysing_Kiss</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>12</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
@@ -260,7 +260,7 @@
 		<defName>rjw_genes_drainer</defName>
 		<label>vitality drainer</label>
 		<description>Carriers of this gene are able to absorb a great amount of fertilin by draining the vitality of the partner. This is done passively through having sex with a non-drained pawn that does not have this gene.</description>
-		<iconPath>Things/Mote/Heart</iconPath>
+		<iconPath>Genes/Icons/Vitality_Drainer</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>4</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
diff --git a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
index a5069c5..75ab7c2 100644
--- a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
@@ -59,7 +59,7 @@
         <displayCategory>rjw_genes_special</displayCategory>
 		    <geneClass>RJW_Genes.Gene_Aphrodisiac_Pheromones</geneClass>
         <description>Pheremones of this pawn induce an incressed sexdrive to others nearby.</description>
-        <iconPath>UI/Memes/FleshPurity</iconPath>
+        <iconPath>Genes/Icons/Pheromones</iconPath>
         <displayOrderInCategory>4</displayOrderInCategory>
         <biostatCpx>1</biostatCpx>
         <biostatMet>1</biostatMet>
diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
index cc57f23..646d4c8 100644
--- a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
@@ -98,7 +98,7 @@
     <label>Cumazone</label>
     <description>Cumazone are a female only xenotype that excel at meele combat. Originally created as bodyguards for glitterworld amazon communities, they spred to other systems by mere strength and providing for some fetishes. They can use Fertilin to enhance their skin to overpower any combatant in meele. Their only source for Fertilin is biting of male genitalia - so be sure to have a steady supply of victim males or prepare to raid unsuspecting men of the rim.</description>
     <descriptionShort>Female only, strong meele fighters, that use Fertilin from bitten-off cocks for powerful buffs.</descriptionShort>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Cumazone</iconPath>
+    <iconPath>Genes/Icons/Xenotypes/Xenotype-Cumazon</iconPath>
     <generateWithXenogermReplicatingHediffChance>0.5</generateWithXenogermReplicatingHediffChance>
     <xenogermReplicatingDurationLeftDaysRange>0.1~140</xenogermReplicatingDurationLeftDaysRange>
     <combatPowerFactor>2.5</combatPowerFactor>
diff --git a/Common/Textures/Genes/Icons/Bonus_Cum.png b/Common/Textures/Genes/Icons/Bonus_Cum.png
deleted file mode 100644
index e6c51a4..0000000
Binary files a/Common/Textures/Genes/Icons/Bonus_Cum.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Cocoon.png b/Common/Textures/Genes/Icons/Cocoon.png
index e05c2d1..5e9b0bc 100644
Binary files a/Common/Textures/Genes/Icons/Cocoon.png and b/Common/Textures/Genes/Icons/Cocoon.png differ
diff --git a/Common/Textures/Genes/Icons/Egg.png b/Common/Textures/Genes/Icons/Egg.png
index 00001b7..a635f14 100644
Binary files a/Common/Textures/Genes/Icons/Egg.png and b/Common/Textures/Genes/Icons/Egg.png differ
diff --git a/Common/Textures/Genes/Icons/Extra_Vagina.png b/Common/Textures/Genes/Icons/Extra_Vagina.png
new file mode 100644
index 0000000..4c93501
Binary files /dev/null and b/Common/Textures/Genes/Icons/Extra_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png
index 6bed636..daa1704 100644
Binary files a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png and b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Insect.png b/Common/Textures/Genes/Icons/Genitalia_Insect.png
deleted file mode 100644
index e71cabe..0000000
Binary files a/Common/Textures/Genes/Icons/Genitalia_Insect.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Genitalia_Slime.png b/Common/Textures/Genes/Icons/Genitalia_Slime.png
deleted file mode 100644
index ee7ae69..0000000
Binary files a/Common/Textures/Genes/Icons/Genitalia_Slime.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Insect_Breeder.png b/Common/Textures/Genes/Icons/Insect_Breeder.png
new file mode 100644
index 0000000..4898614
Binary files /dev/null and b/Common/Textures/Genes/Icons/Insect_Breeder.png differ
diff --git a/Common/Textures/Genes/Icons/Loose_Female_Genitalia.png b/Common/Textures/Genes/Icons/Loose_Female_Genitalia.png
deleted file mode 100644
index 63b6a9c..0000000
Binary files a/Common/Textures/Genes/Icons/Loose_Female_Genitalia.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Loose_Vagina.png b/Common/Textures/Genes/Icons/Loose_Vagina.png
new file mode 100644
index 0000000..c1b5808
Binary files /dev/null and b/Common/Textures/Genes/Icons/Loose_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/No_Cum.png b/Common/Textures/Genes/Icons/No_Cum.png
index b1507b2..8bcdc81 100644
Binary files a/Common/Textures/Genes/Icons/No_Cum.png and b/Common/Textures/Genes/Icons/No_Cum.png differ
diff --git a/Common/Textures/Genes/Icons/No_Female_Genitalia.png b/Common/Textures/Genes/Icons/No_Female_Genitalia.png
deleted file mode 100644
index 9405ce7..0000000
Binary files a/Common/Textures/Genes/Icons/No_Female_Genitalia.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/No_Vagina.png b/Common/Textures/Genes/Icons/No_Vagina.png
new file mode 100644
index 0000000..ec99f03
Binary files /dev/null and b/Common/Textures/Genes/Icons/No_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png
index 400677a..a2b5806 100644
Binary files a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png and b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Paralysing_Kiss.png b/Common/Textures/Genes/Icons/Paralysing_Kiss.png
new file mode 100644
index 0000000..20c4fd5
Binary files /dev/null and b/Common/Textures/Genes/Icons/Paralysing_Kiss.png differ
diff --git a/Common/Textures/Genes/Icons/Pheromones.png b/Common/Textures/Genes/Icons/Pheromones.png
new file mode 100644
index 0000000..88a6c53
Binary files /dev/null and b/Common/Textures/Genes/Icons/Pheromones.png differ
diff --git a/Common/Textures/Genes/Icons/Slime_Genitalia.png b/Common/Textures/Genes/Icons/Slime_Genitalia.png
new file mode 100644
index 0000000..09bbd61
Binary files /dev/null and b/Common/Textures/Genes/Icons/Slime_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Tight_Female_Genitalia.png b/Common/Textures/Genes/Icons/Tight_Female_Genitalia.png
deleted file mode 100644
index d0931fa..0000000
Binary files a/Common/Textures/Genes/Icons/Tight_Female_Genitalia.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Tight_Vagina.png b/Common/Textures/Genes/Icons/Tight_Vagina.png
new file mode 100644
index 0000000..cd8be97
Binary files /dev/null and b/Common/Textures/Genes/Icons/Tight_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Vitality_Drainer.png b/Common/Textures/Genes/Icons/Vitality_Drainer.png
new file mode 100644
index 0000000..eb310c1
Binary files /dev/null and b/Common/Textures/Genes/Icons/Vitality_Drainer.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png
index 0c11a77..9ffab2c 100644
Binary files a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Breeder.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png
index 5dda564..8d285e5 100644
Binary files a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Cumazon.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png
index 434da2c..e831799 100644
Binary files a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Guard.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png
index 73e01cf..14d6685 100644
Binary files a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Incubus.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png
index 64382f8..9b0f425 100644
Binary files a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Queen.png differ
diff --git a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png
index 33f7cda..dddb34d 100644
Binary files a/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png and b/Common/Textures/Genes/Icons/Xenotypes/Xenotype-Succubus.png differ
diff --git a/Common/Textures/Genes/Icons/drone.png b/Common/Textures/Genes/Icons/drone.png
index 31a1f78..e600639 100644
Binary files a/Common/Textures/Genes/Icons/drone.png and b/Common/Textures/Genes/Icons/drone.png differ
diff --git a/Common/Textures/Genes/Icons/extra_female.png b/Common/Textures/Genes/Icons/extra_female.png
deleted file mode 100644
index 1a6ae6e..0000000
Binary files a/Common/Textures/Genes/Icons/extra_female.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/much_cum.png b/Common/Textures/Genes/Icons/much_cum.png
index 403ac1d..412030f 100644
Binary files a/Common/Textures/Genes/Icons/much_cum.png and b/Common/Textures/Genes/Icons/much_cum.png differ
diff --git a/Common/Textures/Genes/Icons/queen.png b/Common/Textures/Genes/Icons/queen.png
index 9e99810..8ef515f 100644
Binary files a/Common/Textures/Genes/Icons/queen.png and b/Common/Textures/Genes/Icons/queen.png differ
diff --git a/Common/Textures/Genes/Icons/very_much_cum.png b/Common/Textures/Genes/Icons/very_much_cum.png
index f9b1997..0e692ff 100644
Binary files a/Common/Textures/Genes/Icons/very_much_cum.png and b/Common/Textures/Genes/Icons/very_much_cum.png differ
diff --git a/Common/Textures/Genes/Icons/worker.png b/Common/Textures/Genes/Icons/worker.png
index eee43e9..743caa0 100644
Binary files a/Common/Textures/Genes/Icons/worker.png and b/Common/Textures/Genes/Icons/worker.png differ