Would be nice to have those icons as well instead of just the link symbol
A WAZE icon is also needed
