Fix icon issue + Fix Females in NBW

(for the most part)