Optimized images

Same method as before, just making it up to date

Change-Id: I3847c247b8cfe0e1f0ff2f7d382c2a81fd5de7e5