Merge "Use display:inline-block for special character buttons"