Attempt to fix icons in map
Merge branch 'master' into gh-pages

* master:
  Attempt to fix icons in map