Merge pull request #1415 from ermshiperete/FixTruncatedButton