I would like to suggest an indicator that shows you if the water cannon on the wawe is turned on or off.
Now its not noticeable unless there are civilians nearby to 'spray' at. Besides, if it's turned on there is no way to turn it back off, as the button only activates the cannon, I think.