Fixing icon overwrite issue