Restore icons on buttons

With the switch to lesscpy, the icons were not being displayed on
buttons anymore. Avoiding nested Mixin definitions appears to resolve
the issue.

Change-Id: I09699fb37f55b989893905f3b8978a17e317f598
Closes-Bug: #1226580
Merge "Restore icons on buttons"