applied new icons, color codes and done minor refactor