FIXES: #384 map icons