BS-9408, make iconPath nullable