Optimized images

Same method as before, just making it up to date

Change-Id: I1dde4f80ee524eb25308315a8e525d24c98f9edf