FIXES: #384 map icons
Merge branch 'master' into wikwio