PIM-2043: Fix regression due to icons added