Optimized images

Same method as before, just making it up to date

Change-Id: I893040bd4301d9c6102e0419a2c6723dd36e4fbd