diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/FailedTestCaseSampleData.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/FailedTestCaseSampleData.component.tsx
index 7e97e80cdecf..a85a770756d2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/FailedTestCaseSampleData.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/FailedTestCaseSampleData.component.tsx
@@ -11,7 +11,8 @@
  *  limitations under the License.
  */
 
-import { Button, Dropdown, Space, Table, Tooltip, Typography } from 'antd';
+import { Table, Typography } from '@openmetadata/ui-core-components';
+import { Button, Dropdown, Space, Tooltip } from 'antd';
 import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import { AxiosError } from 'axios';
 import classNames from 'classnames';
@@ -40,33 +41,41 @@ import { showErrorToast } from '../../../../utils/ToastUtils';
 import Loader from '../../../common/Loader/Loader';
 import { ManageButtonItemLabel } from '../../../common/ManageButtonContentItem/ManageButtonContentItem.component';
 import { RowData } from '../../../Database/SampleDataTable/RowData';
-import {
-  SampleData,
-  SampleDataType,
-} from '../../../Database/SampleDataTable/SampleData.interface';
+import { SampleDataType } from '../../../Database/SampleDataTable/SampleData.interface';
 import EntityDeleteModal from '../../../Modals/EntityDeleteModal/EntityDeleteModal';
-import './failed-test-case-sample-data.less';
 import { FailedTestCaseSampleDataProps } from './FailedTestCaseSampleData.interface';
 
 const DIFF_TYPE = 'diffType';
 const ROW_KEY = '__rowKey';
+
 const DIFF_TYPE_VALUES = {
   ADD: '+',
   REMOVE: '-',
   NOT_EQUAL: '!=',
 };
 
+type SampleDataColumn = {
+  id: string;
+  label: string;
+};
+
+type LocalSampleData = {
+  columns: SampleDataColumn[];
+  rows: Record<string, SampleDataType>[];
+};
+
 const FailedTestCaseSampleData = ({
   testCaseData,
 }: FailedTestCaseSampleDataProps) => {
   const { t } = useTranslation();
-  const [sampleData, setSampleData] = useState<SampleData>();
+  const [sampleData, setSampleData] = useState<LocalSampleData>();
   const [isLoading, setIsLoading] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState<boolean>(false);
   const [showActions, setShowActions] = useState(false);
   const { permissions } = usePermissionProvider();
   const { version } = useParams<{ version: string }>();
   const isVersionPage = !isUndefined(version);
+
   const columnName = useMemo(
     () =>
       testCaseData?.entityLink
@@ -74,6 +83,7 @@ const FailedTestCaseSampleData = ({
         : undefined,
     [testCaseData]
   );
+
   const hasViewSampleDataPermission = useMemo(() => {
     return checkPermission(
       Operation.ViewSampleData,
@@ -116,48 +126,26 @@ const FailedTestCaseSampleData = ({
       },
     },
   ];
-  const getSampleDataWithType = (sampleData: TableData) => {
-    const updatedColumns = sampleData?.columns?.map((column) => {
-      return {
-        name: column,
-        title:
-          column === DIFF_TYPE ? (
-            ''
-          ) : (
-            <div className="d-flex flex-column">
-              <Typography.Text> {column}</Typography.Text>
-            </div>
-          ),
-        dataIndex: column,
-        key: column,
-        accessor: column,
-        width: column === DIFF_TYPE ? undefined : 210,
-        render: (data: SampleDataType) => ({
-          props: {
-            className: classNames({
-              'failed-sample-data-column': column === columnName,
-              'diff-type-sample-data-column': column === DIFF_TYPE,
-            }),
-          },
-          children: <RowData data={data} />,
-        }),
-      };
-    });
 
-    const data = (sampleData?.rows ?? []).map((item, index) => {
+  const getSampleDataWithType = (tableData: TableData): LocalSampleData => {
+    const columns: SampleDataColumn[] = (tableData?.columns ?? []).map(
+      (column) => ({
+        id: column,
+        label: column === DIFF_TYPE ? '' : column,
+      })
+    );
+
+    const rows = (tableData?.rows ?? []).map((item, index) => {
       const dataObject: Record<string, SampleDataType> = {};
-      (sampleData?.columns ?? []).forEach((col, index) => {
-        dataObject[col] = item[index];
+      (tableData?.columns ?? []).forEach((col, colIndex) => {
+        dataObject[col] = item[colIndex];
       });
       dataObject[ROW_KEY] = index;
 
       return dataObject;
     });
 
-    return {
-      columns: updatedColumns,
-      rows: data,
-    };
+    return { columns, rows };
   };
 
   const fetchFailedTestCaseSampleData = async () => {
@@ -216,9 +204,9 @@ const FailedTestCaseSampleData = ({
   return (
     <div className="w-full">
       <Space className="m-b-md justify-between w-full">
-        <Typography.Text className="right-panel-label">
+        <Typography className="right-panel-label" size="text-sm">
           {t('label.sample-data')}
-        </Typography.Text>
+        </Typography>
         <div className="d-flex gap-4">
           {testCaseData?.inspectionQuery && !isVersionPage && (
             <Link
@@ -258,25 +246,82 @@ const FailedTestCaseSampleData = ({
           )}
         </div>
       </Space>
-      <Table
-        bordered
-        columns={sampleData.columns}
-        data-testid="sample-data-table"
-        dataSource={sampleData.rows}
-        pagination={false}
-        rowClassName={(record) => {
-          const type = record?.diffType;
+      <div className="tw:overflow-x-auto tw:border tw:border-border-secondary tw:rounded-[10px]">
+        <Table
+          aria-label={t('label.sample-data')}
+          data-testid="sample-data-table"
+          size="sm">
+          <Table.Header columns={sampleData.columns}>
+            {(col) => (
+              <Table.Head
+                className={classNames('tw:px-2 tw:py-2', {
+                  'tw:min-w-52.5': col.id !== DIFF_TYPE,
+                })}
+                id={col.id}
+                key={col.id}
+                label={col.label}
+              />
+            )}
+          </Table.Header>
+          <Table.Body items={sampleData.rows}>
+            {(record) => {
+              const diffType = record[DIFF_TYPE];
+
+              return (
+                <Table.Row
+                  className={classNames({
+                    'tw:bg-success-primary': diffType === DIFF_TYPE_VALUES.ADD,
+                    'tw:bg-gray-50': diffType === DIFF_TYPE_VALUES.NOT_EQUAL,
+                    'tw:bg-error-primary': diffType === DIFF_TYPE_VALUES.REMOVE,
+                  })}
+                  columns={sampleData.columns}
+                  id={record[ROW_KEY] as number}
+                  key={record[ROW_KEY] as number}>
+                  {(col) => {
+                    const isDiffCol = col.id === DIFF_TYPE;
+                    const isFailedCol = col.id === columnName;
 
-          return classNames({
-            'remove-sample-data': type === DIFF_TYPE_VALUES.REMOVE,
-            'add-sample-data': type === DIFF_TYPE_VALUES.ADD,
-            'not-equal-sample-data': type === DIFF_TYPE_VALUES.NOT_EQUAL,
-          });
-        }}
-        rowKey={ROW_KEY}
-        scroll={{ x: 'max-content' }}
-        size="small"
-      />
+                    return (
+                      <Table.Cell
+                        className={classNames('tw:p-2', {
+                          'tw:border-r tw:border-r-gray-blue-100 tw:text-center tw:align-middle':
+                            isDiffCol,
+                          'failed-sample-data-column tw:bg-error-primary':
+                            isFailedCol,
+                          'tw:min-w-52.5': !isDiffCol,
+                        })}>
+                        {isDiffCol ? (
+                          <Typography
+                            className={classNames({
+                              'tw:text-success-primary':
+                                diffType === DIFF_TYPE_VALUES.ADD,
+                              'tw:text-gray-500':
+                                diffType === DIFF_TYPE_VALUES.NOT_EQUAL,
+                              'tw:text-error-primary':
+                                diffType === DIFF_TYPE_VALUES.REMOVE,
+                            })}
+                            size="text-sm"
+                            weight="medium">
+                            {record[col.id] as string}
+                          </Typography>
+                        ) : (
+                          <Typography
+                            className={
+                              isFailedCol ? 'tw:text-error-primary' : undefined
+                            }
+                            size="text-sm">
+                            <RowData data={record[col.id] as SampleDataType} />
+                          </Typography>
+                        )}
+                      </Table.Cell>
+                    );
+                  }}
+                </Table.Row>
+              );
+            }}
+          </Table.Body>
+        </Table>
+      </div>
       {isDeleteModalOpen && (
         <EntityDeleteModal
           bodyText={getEntityDeleteMessage(t('label.sample-data'), '')}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/failed-test-case-sample-data.less b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/failed-test-case-sample-data.less
deleted file mode 100644
index cf526bfa93b0..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/FailedTestCaseSampleData/failed-test-case-sample-data.less
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-@import (reference) '../../../../styles/variables.less';
-
-.ant-table-cell.failed-sample-data-column,
-.ant-table-row:hover .ant-table-cell.failed-sample-data-column {
-  background-color: fade(@red-3, 5%);
-
-  .ant-typography {
-    color: @red-3;
-  }
-}
-
-.ant-table-wrapper
-  .ant-table-bordered
-  .ant-table-container
-  .ant-table-content
-  > table
-  tbody
-  > tr
-  td.ant-table-cell.diff-type-sample-data-column {
-  border-right: 1px solid rgba(0, 0, 0, 0.06);
-  padding-right: 16px;
-}
-
-.add-sample-data {
-  background: fade(@green-3, 5%);
-
-  .diff-type-sample-data-column {
-    .ant-typography {
-      color: @green-3;
-    }
-  }
-}
-.remove-sample-data {
-  background: fade(@red-3, 5%);
-
-  .diff-type-sample-data-column {
-    .ant-typography {
-      color: @red-3;
-    }
-  }
-}
-.not-equal-sample-data {
-  background: #f8f8f8;
-
-  .diff-type-sample-data-column {
-    .ant-typography {
-      color: @grey-4;
-    }
-  }
-}