Adding new-style skyline icons
Resolving conflict?