Updated icons, spanclasses