Optimized images

Same method as before, just making it up to date

Change-Id: Idaa4a678b9aec11102cacf0e725ff1c50ee00642