Updating icon
Merging conflicts