Apple will be replacing the controversial pistol emoji with a green water gun emoji in the next operating system, according to a report by CNN Money.

iOS10 will also feature new emojis including new female athletes, a pride flag, and family options for single parents. Revamped emojis will show women doing stereotypically male jobs.

There will be over one hundred new and redesigned emojis in total this fall.