Optimised images

Fixes #2349