Add new icons and logic for them