Apple has launched a series of more than 100 new and updated emojis.

It's replaced the gun with a water pistol and put out new designs it hopes will be more inclusive.

The company says it wants to "ensure that popular emoji characters reflect the diversity of people everywhere".

The new green and orange pistol emoji looks more like a toy and will replace the black and silver revolver, but some people have mocked the swap on Twitter.

Emoji on Apple products are designed by the Unicode consortium.

It all comes after a series of high-profile shootings in America.

However, many people on Twitter have joked that switching a gun for a toy isn't "going to solve anything".

It may have been ridiculed on social media by some but anti-gun campaigners were delighted to see the change.

Apple say the changes are an "exciting update" and "brings more gender options to existing characters".

"[These include] new female athletes and professionals, beautiful redesigns of popular emoji, a new rainbow flag and more family options," it said.

This isn't the first time that Apple has diversified its collection of approved emojis.

Last year it released a range of skin tones for popular faces but received criticism that it used a very yellow colour for the Asian skin.

Find us on Instagram at BBCNewsbeat and follow us on Snapchat, search for bbc_newsbeat