Add support for Icon, minimal comment for Spark and add comments