updated with icon and link support