NVTY-1 Move icon badges to generic
Merge commit '6087e0a040cc124ab00bfdc0f805f253992d066f' into initial
Merge commit '7cf3383eed4ed8e213086dc4bd095375edc6e05d' into initial
Initial