Optimized images

Same method as before, just making it up to date

Change-Id: Ifa8a53b4fc62c6c80f7db553d5227e6c382ce280