Apple is replacing the pistol emoji with a squirt gun, the company announced on Monday.
New emoji, including icons that depict female athletes and professionals, will be included as part of a new beta version of the software that goes on iPhones and iPads.
As part of the new emoji, Apple appears to have replaced the handgun emoji with a bright green icon that looks like a classic Super Soaker water pistol.
This appears to be an Apple decision — not a decision by Unicode, the body that writes the standards for computer characters, including emoji.
Earlier this year, Apple started a discussion at a Unicode meeting to remove a proposed rifle emoji from a package of proposed emoji icons meant to commemorate the Summer Olympics.
Apple has also introduced emoji of its own, without Unicode, in the past, including an eye emoji as part of an anti-bullying campaign.
Here are all the new emoji: