All: Updated button and icon classes

Fixes gh-7664
Demos: Updated markup of buttons and icons

Fixes gh-7770