Fix up image paths to be less awful slightly

Change-Id: I573b1036e1bee6824689233df72b3cccd0c60f03