[Bug 984315] Last polishing
Merge pull request #240 from michalbe/polish-button-content-temp

[Bug 984315] Last polishing