Added support for set icon on link attributes and updated #12 and #6