Apple is replacing the controversial pistol emoji with a green water gun in the next version of its iPhone and iPad operating system, iOS 10. The gun replacement is just one of a number of emoji changes the company announced on Monday.

Apart from the gun swap it will also introduce new and revamped emojis that show women doing stereotypically male jobs like detective, construction worker, and police officer. There are new female athletes, a pride flag, and family options for single parents.

The pistol and other weapon emojis have landed people in trouble with the law. A 12-year-old in Virginia was charged after allegedly threatening her school in an Instagram post that used a gun, knife and bomb emoji. A teen in Brooklyn was arrested for posting a police emoji with pistol emojis pointing at his head. The charges were later dropped.

Microsoft has long used a toy gun emoji instead of a pistol in Windows. Google, Samsung, Facebook and Twitter all still use realistic pistol emojis.