Optimized images

Same method as before, just making it up to date

Change-Id: Ib645d88768bc6a7fead023fc8503713a26af5e34