- Update: Some code refactoring (no functional change)
- Update: Icon updated