Flattened collection to fix issues
Possible fix for icon.png issues
Fixed misplaced call in icon path