Optimized images

Same method as before, just making it up to date

Change-Id: I7e5ed4b280c1efd1439dccb85df7bf2a92d233a1