Optimized images

Same method as before, just making it up to date

Change-Id: Ifd974403c6bf9712148f9142267c46ec80f51046