- Fixed color of the general icon.
- Clean code