USA –   Bullets are out, water is in. 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 swap is just one of a number of emoji changes the company announced on Monday. 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 water gun swap is not Apple’s (AAPL, Tech30) first foray into cartoon gun control. Earlier this year the governing body in charge of emojis nixed a proposed rifle emoji. It was one of a number of possible new additions, but Unicode Consortium members Apple and Microsoft argued against the Olympics-inspired gun, according to Buzzfeed.(CNN.COM/photo: cnn.com)…[+]