update icons and their names
Resolving conflicts