FIX: Make sure that icons are passed around as strings in the case of using a common icon from the layer
FIX: Make sure that icons are passed around as strings in the case of using a common icon from the layer

gordonbanderson/Mappable,gordonbanderson/Mappable