Added key metrics icons
Resolved conflicts