Added off icon, and single-click on/off.