Optimized images

Change-Id: Ie84ac36da04bfddd342c5925ebd9183d469a31b4