Add missing ico
Fix merge conflict