Add span tags and some icon spacing