Remove duplicate icons
Add pins
Move icons and pins to local files