Update icon color classes & refactoring

Merge request reports

Loading