Replace existing images with new images suggested by Pau

Change-Id: I64b0a8f2aa713c27577a64c62772f22ab5118e56
Merge "Replace existing images with new images suggested by Pau"