[master] Update marker's icon and info window content

closes #39