Block gifs & animations

I'd like to be able to block gifs from autoplaying and stop animated avatars. Is there a way to do this? I have Never Autoplay Videos ticked but gifs work differently.

Thanks for any help.