Normally you say *Eis* to both of it. But if you are in a special situation where it is not clear because of the context (what is the case in most situations) you can distinguish it with *Speiseeis* or *Eiswürfel.* While *Speiseeis* is very expressive, *Eiswürfel* is more often also used in normal situations.