Fix icon-1094 and remove map image