CLC-4300 - Remove the dependency on foundation buttons

https://jira.ets.berkeley.edu/jira/browse/CLC-4300
Merge pull request #2980 from christianv/CLC-4300

CLC-4300 - Remove the dependency on foundation buttons