Merge "Make sure buttons font-size is relative to its container"