[Bug 984315] Lint fixes
Merge pull request #244 from michalbe/polish-button-content-temp

[Bug 984315] Lint fixes