Optimized images

Same method as before, just making it up to date

Change-Id: I08ea1b7a002cdb410e1eb7b750cad8ea3e8da7ed