Adding support for icon span and classes per item