Switch icons to spans