Optimized images

Same method as before, just making it up to date

Change-Id: Ibf60ed4f6dc443399e7c830adbefa2653f522e49