No, neither needs changing and the 2nd should not be changed. You can use 'chocolates' if you mean the little candies instead of the substance, but ice cream is uncountable.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.