Async loading fix

Performance patches + workaround for asynchronous icon loading.