- Fix preventing other indicators to show
- Implement removing icon