Added Icons and round resolver