Add passing of custom options to drawn marker

When a marker is finishing drawing provide the custom options to the
marker, rather than just the icon.