Missing icon size 96x96
Merge conflict