Merge "Added restriction if a user is allowed to change the icon. BUG: 25305966"