location icon integrated everywhere
manual merge