Now supports icons at the category level