Optimized images

Change-Id: I4d8c0c46db0c055867a57e5deebecc73f357775e