Fix bug that truncates button text

A previous change accidentally calculated the text size in some
places without padding. This resulted in a slightly to small text
rectangle, causing the text to be truncated.

Change-Id: I975a17be56216105e3cbed02a43e2f78636f0b76