Move Icon class out of NonTile and add an 'imageZ' field.