Merge pull request #1042 from Arantor/release-2.1

The toggler really should use CSS where possible, this allows us to use our sprites.