Optimized images

Change-Id: Id6d87c4229887ddb1c7725579fbe621682c239c8