Optimized images

Change-Id: Id00204d97597df91a4160b6a95c13dc481c6904a