NVTY-1  Move icon badges to generic