issue 220,221 (update icons)