Optimized images

Same method as before, just making it up to date

Change-Id: Ie723b17c3cb2085c16442ecc990cbe0c843c6281