Fixing icon display issues