Optimized images

Same method as before, just making it up to date

Change-Id: Ib9db2697ffaa015043514bb6c3f76f6d46235f57