Items like Water Bottles can't be set to advancement icons

It is currently impossible to have items such as "Water bottles" as the icon for advancements. If no damage value is provided, the regeneration potion is provided. And specifying a damage value other than 0 causes a missing texture to appear.

On a slightly unrelated note, things like dyed armor or other items with important NBT data can't be set. Only the basic item can be.