This also needs to deal with the icon span, right?