Bug 1040068 - Inconsistency in [contacts] buttons
Merge pull request #21870 from rnowm/1036147-followup

Bug 1040068 - Inconsistency in [contacts] buttons