Reorganizing and adding new icons