refactored icons management