Override Button template (make it simpler)
Override tab template
Clean up tab styling CSS some more
Put the icon back

We could remove the pointless span, but leaving it for now … would
require re-working the way the leftbar tabs are built.
More CSS cleanup
Merge branch 'refactor/button-tpl' into develop