Will fish only be able to be placed in Aquariums or normal water as well?

If we have things like cichlids in the game, I'd really love to add them to my hippo or crocodile enclosure pools.

Will they only be available for aquariums or water as well?