Optimized images

Change-Id: I134ea75735669efed5ff3cadcd3a34b2a0f036ea