Optimized images

Change-Id: Ie12a88e69703bf1a24c87f95e5da02243275d011