Should the correct English be "the girls will fill the glasses with water"?
Yes, it should be like you said.
It is an accepted answer (now), although not the proposed one.
Yes. In Romanian "un pahar cu apă" and un pahar de apă" both mean a glass of water, but obviously that doesn't work when you're filling a glass.