r1867 + fix icon name