Map icon fixes.
Merge origin/master
Bookmarks