Optimized images

Change-Id: I58c9dee7b4e72094f9ed3f30c12df41a478be2f6