Merge "Handle edge case where overflow icon is overflowing" into main