Resolve issues with icons that are defines as class instead of package and function