Optimize images

Change-Id: I24ca4cdb333a079019a76edbb39668af06da237b