Use new icons, refs #87
Use main font in marker labels, closes #81