Remove duplicate close icon, update references