Fixed test failures and added icon.