Search icon cell and Cancel cell issue in Borderless NSSearchField

The search icon cell in the NSSearchField when set to Borderless overlaps with both NSSearchField.stringValue as well as placeholderString. Further more, the cancel cell cannot be clicked on. Please note the screenshots for the overlapping issue. This is observed only when it is borderless.