Mixing and matching icon names to make it all more logical. Also, fixing global variable issue in toggle.