Compress images

I've kept them as 2 patches so that it's easier to revert if needed. I can squash them though.