odd icon name mixups fixed