Optimized images

Change-Id: Idb98b2aaec3049e6e9fa87a2c83ad17404c3f313