Optimize images

Change-Id: I8e252b457ec3a961f10bd9af771e054a0afa4d6f