Refactored icon links into general classes, not spans.