Added icons as requested in #18