[Bug 828308] Prevent text overflow problems on browser settings page buttons
Merge pull request #7446 from leibovic/button

[Bug 828308] Prevent text overflow problems on browser settings page but...
Auto-merge from branch 'master'