Refine toilet preset

Fixes #1697