Optimized images

Same method as before, just making it up to date

Change-Id: I312cf302c13696c9c9696c71f8c13987d0fdb1dc