Optimized images

Change-Id: Ib47f2408e5f637538c92e4510c7510c492499748