Attempt to solve merge conflicts in icon file