Optimized images

Change-Id: Ic577773665db0b48266ed6a54afcceb2d49e1f70