diff --git a/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointVersion/APIEndpointVersion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointVersion/APIEndpointVersion.tsx
index 44120ef18db..2a0ae114a6d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointVersion/APIEndpointVersion.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/APIEndpoint/APIEndpointVersion/APIEndpointVersion.tsx
@@ -205,6 +205,7 @@ const APIEndpointVersion: FC<APIEndpointVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx
index c0bf9e8751c..bc7ac92d1e1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx
@@ -258,6 +258,7 @@ const ContainerVersion: React.FC<ContainerVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx
index e533c38e05d..b14f9b33c95 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx
@@ -278,6 +278,7 @@ const DashboardVersion: FC<DashboardVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   data-testid="tabs"
                   defaultActiveKey={tab}
                   items={tabItems}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx
index 975a42ccd53..71e03f9050e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx
@@ -240,6 +240,7 @@ const DataModelVersion: FC<DataModelVersionProp> = ({
                 <Col span={24}>
                   <Tabs
                     activeKey={tab}
+                    className="tabs-new"
                     items={tabItems}
                     onChange={handleTabChange}
                   />
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx
index b0a489784a4..44e69a8f3d9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { Button, Col, Row, Skeleton, Space, Tooltip, Typography } from 'antd';
+import { Button, Row, Skeleton, Space, Tooltip, Typography } from 'antd';
 import { ColumnsType, TablePaginationConfig } from 'antd/lib/table';
 import { FilterValue, SorterResult } from 'antd/lib/table/interface';
 import { AxiosError } from 'axios';
@@ -494,90 +494,86 @@ const DataQualityTab: React.FC<DataQualityTabProps> = ({
   }, [testCases]);
 
   return (
-    <Row gutter={[16, 16]}>
-      <Col span={24}>
-        <Table
-          className="test-case-table-container"
-          columns={columns}
-          {...(pagingData && showPagination
-            ? {
-                customPaginationProps: {
-                  ...pagingData,
-                  showPagination,
-                },
+    <>
+      <Table
+        className="test-case-table-container"
+        columns={columns}
+        {...(pagingData && showPagination
+          ? {
+              customPaginationProps: {
+                ...pagingData,
+                showPagination,
+              },
+            }
+          : {})}
+        data-testid="test-case-table"
+        dataSource={sortedData}
+        loading={isLoading}
+        locale={{
+          emptyText: (
+            <FilterTablePlaceHolder
+              placeholderText={
+                <Transi18next
+                  i18nKey="message.no-data-quality-test-case"
+                  renderElement={
+                    <a
+                      href={DATA_QUALITY_PROFILER_DOCS}
+                      rel="noreferrer"
+                      target="_blank"
+                      title="Data Quality Profiler Documentation"
+                    />
+                  }
+                  values={{
+                    explore: t('message.explore-our-guide-here'),
+                  }}
+                />
               }
-            : {})}
-          data-testid="test-case-table"
-          dataSource={sortedData}
-          loading={isLoading}
-          locale={{
-            emptyText: (
-              <FilterTablePlaceHolder
-                placeholderText={
-                  <Transi18next
-                    i18nKey="message.no-data-quality-test-case"
-                    renderElement={
-                      <a
-                        href={DATA_QUALITY_PROFILER_DOCS}
-                        rel="noreferrer"
-                        target="_blank"
-                        title="Data Quality Profiler Documentation"
-                      />
-                    }
-                    values={{
-                      explore: t('message.explore-our-guide-here'),
-                    }}
-                  />
-                }
-              />
-            ),
-          }}
-          pagination={false}
-          rowKey="id"
-          scroll={{ x: true }}
-          size="small"
-          onChange={handleTableChange}
-        />
-      </Col>
-      <Col>
-        <EditTestCaseModal
-          testCase={selectedTestCase?.data as TestCase}
-          visible={selectedTestCase?.action === 'UPDATE'}
-          onCancel={handleCancel}
-          onUpdate={onTestUpdate}
-        />
+            />
+          ),
+        }}
+        pagination={false}
+        rowKey="id"
+        scroll={{ x: true }}
+        size="small"
+        onChange={handleTableChange}
+      />
+      <EditTestCaseModal
+        testCase={selectedTestCase?.data as TestCase}
+        visible={selectedTestCase?.action === 'UPDATE'}
+        onCancel={handleCancel}
+        onUpdate={onTestUpdate}
+      />
 
-        {removeFromTestSuite ? (
-          <ConfirmationModal
-            bodyText={t(
-              'message.are-you-sure-you-want-to-remove-child-from-parent',
-              {
-                child: getEntityName(selectedTestCase?.data),
-                parent: getEntityName(removeFromTestSuite.testSuite),
-              }
-            )}
-            cancelText={t('label.cancel')}
-            confirmText={t('label.remove')}
-            header={t('label.remove-entity', { entity: t('label.test-case') })}
-            isLoading={isTestCaseRemovalLoading}
-            visible={selectedTestCase?.action === 'DELETE'}
-            onCancel={handleCancel}
-            onConfirm={handleConfirmClick}
-          />
-        ) : (
-          <DeleteWidgetModal
-            isRecursiveDelete
-            afterDeleteAction={afterDeleteAction}
-            allowSoftDelete={false}
-            entityId={selectedTestCase?.data?.id ?? ''}
-            entityName={getEntityName(selectedTestCase?.data)}
-            entityType={EntityType.TEST_CASE}
-            visible={selectedTestCase?.action === 'DELETE'}
-            onCancel={handleCancel}
-          />
-        )}
-      </Col>
-    </Row>
+      {removeFromTestSuite ? (
+        <ConfirmationModal
+          bodyText={t(
+            'message.are-you-sure-you-want-to-remove-child-from-parent',
+            {
+              child: getEntityName(selectedTestCase?.data),
+              parent: getEntityName(removeFromTestSuite.testSuite),
+            }
+          )}
+          cancelText={t('label.cancel')}
+          confirmText={t('label.remove')}
+          header={t('label.remove-entity', { entity: t('label.test-case') })}
+          isLoading={isTestCaseRemovalLoading}
+          visible={selectedTestCase?.action === 'DELETE'}
+          onCancel={handleCancel}
+          onConfirm={handleConfirmClick}
+        />
+      ) : (
+        <DeleteWidgetModal
+          isRecursiveDelete
+          afterDeleteAction={afterDeleteAction}
+          allowSoftDelete={false}
+          entityId={selectedTestCase?.data?.id ?? ''}
+          entityName={getEntityName(selectedTestCase?.data)}
+          entityType={EntityType.TEST_CASE}
+          visible={selectedTestCase?.action === 'DELETE'}
+          onCancel={handleCancel}
+        />
+      )}
+    </>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
index b52f54714dc..7b736d510db 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/QualityTab/QualityTab.component.tsx
@@ -380,7 +380,7 @@ export const QualityTab = () => {
         <SummaryPanel testSummary={testCaseSummary ?? INITIAL_TEST_SUMMARY} />
       </Col>
       <Col span={24}>
-        <Tabs items={tabs} onChange={handleTabChange} />
+        <Tabs className="tabs-new" items={tabs} onChange={handleTabChange} />
       </Col>
     </Row>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx
index 4fb02d121a3..fd8ff57a6b4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx
@@ -201,6 +201,7 @@ const StoredProcedureVersion = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx
index 77269c342ed..d65fad0b0bc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx
@@ -262,6 +262,7 @@ const TableVersion: React.FC<TableVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricVersion/MetricVersion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricVersion/MetricVersion.tsx
index fff3087586d..b679cf33d98 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricVersion/MetricVersion.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Metric/MetricVersion/MetricVersion.tsx
@@ -206,6 +206,7 @@ const MetricVersion: FC<MetricVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx
index 10def4c4a8f..9926d0e5cca 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx
@@ -359,6 +359,7 @@ const MlModelVersion: FC<MlModelVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx
index 8ba6d3d259e..beae5c82e28 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx
@@ -196,6 +196,7 @@ const NotificationBox = ({
         {t('label.notification-plural')}
       </Typography.Title>
       <Tabs
+        className="tabs-new"
         defaultActiveKey="Task"
         size="small"
         tabBarGutter={24}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx
index 2524e114e35..7e787aa49d8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx
@@ -295,6 +295,7 @@ const PipelineVersion: FC<PipelineVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx
index 5d0d8671841..6471eb51b39 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx
@@ -230,6 +230,7 @@ const SearchIndexVersion: React.FC<SearchIndexVersionProps> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx
index 34e2cab168d..2bcc4758767 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable/IngestionListTable.tsx
@@ -448,7 +448,7 @@ function IngestionListTable({
   return (
     <>
       <div
-        className={classNames('m-b-md', tableContainerClassName)}
+        className={classNames(tableContainerClassName)}
         data-testid="ingestion-table">
         <Table
           className={tableClassName}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
index c24d52382da..797a064a87d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx
@@ -470,7 +470,7 @@ const Services = ({ serviceName }: ServicesProps) => {
 
   return (
     <Row
-      className="justify-center m-b-md"
+      className="justify-center"
       data-testid="services-container"
       gutter={[16, 16]}>
       <Col span={24}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx
index 49123bff8e0..2bd06fd915c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx
@@ -343,27 +343,21 @@ const Users = ({
           </div>
         </Col>
         <Col flex="auto">
-          <Row className="mb-sm w-full">
-            <div className="tabs-container d-flex justify-center">
-              <Tabs
-                activeKey={currentTab}
-                className="user-page-tabs-new"
-                data-testid="tabs"
-                items={tabs.map((tab) => ({
-                  key: tab.key,
-                  label: tab.label,
-                  disabled: tab.disabled,
-                }))}
-                renderTabBar={(props, DefaultTabBar) => (
-                  <div>
-                    <DefaultTabBar {...props} />
-                  </div>
-                )}
-                onChange={activeTabHandler}
-              />
-            </div>
-          </Row>
-          <Row className="tabs-content" gutter={[16, 16]}>
+          <Tabs
+            activeKey={currentTab}
+            className="tabs-new"
+            data-testid="tabs"
+            items={tabs.map((tab) => ({
+              key: tab.key,
+              label: tab.label,
+              disabled: tab.disabled,
+            }))}
+            renderTabBar={(props, DefaultTabBar) => (
+              <DefaultTabBar {...props} />
+            )}
+            onChange={activeTabHandler}
+          />
+          <Row className="users-tabs-container" gutter={[16, 16]}>
             <Col span={24}>
               {tabs.find((tab) => tab.key === currentTab)?.children}
             </Col>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
index b5fd3ee1306..9266303afe0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
@@ -21,46 +21,6 @@
   align-items: flex-start;
 }
 
-.user-page-tabs {
-  margin-top: 10px;
-
-  .ant-tabs-nav {
-    margin: 0 !important;
-    padding: 0 20px;
-  }
-}
-
-.user-page-tabs-new {
-  height: 48px;
-
-  .ant-tabs-nav {
-    margin: 0;
-    padding: 0 20px;
-
-    .ant-tabs-nav-list {
-      border-bottom: none;
-
-      .ant-tabs-tab {
-        padding-bottom: 8px;
-        position: relative;
-        color: @text-color;
-        font-size: 14px;
-
-        &.ant-tabs-tab-active {
-          color: #1570ef;
-          font-weight: 600;
-        }
-      }
-    }
-  }
-
-  .ant-tabs-ink-bar {
-    bottom: 6px;
-    height: 2px;
-    background-color: #1570ef;
-  }
-}
-
 .user-layout {
   > .ant-col {
     padding-top: 0;
@@ -210,31 +170,10 @@
   }
 }
 
-.tabs-container {
-  background-color: @white;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  height: 48px;
-  width: 100%;
-  border-radius: 12px;
-  margin-bottom: 20px;
-  border: 1px solid #eaecf5;
-
-  .ant-tabs-nav::before {
-    border-bottom: none !important;
-  }
-}
-
-.tabs-content {
+.users-tabs-container {
   .activity-feed-tab {
     border: none;
     border-radius: 0px;
-
-    .right-container {
-      border-radius: 12px;
-      border: 1px solid @grey-15;
-    }
   }
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx
index ca1ed82abb7..cc4ab6ee6cc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx
@@ -223,6 +223,7 @@ const TopicVersion: FC<TopicVersionProp> = ({
               onUpdate={() => Promise.resolve()}>
               <Col span={24}>
                 <Tabs
+                  className="tabs-new"
                   defaultActiveKey={tab}
                   items={tabItems}
                   onChange={handleTabChange}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx
index da7241b4673..edd4b7e312e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx
@@ -454,7 +454,7 @@ function AlertDetailsPage({
               <Col span={24}>
                 <Tabs
                   activeKey={tab}
-                  className="m-b-lg"
+                  className="tabs-new"
                   items={tabItems}
                   onTabClick={handleTabChange}
                 />
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx
index 876f1753540..1a0073d5495 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx
@@ -292,7 +292,12 @@ const CustomEntityDetailV1 = () => {
           <PageHeader data={customPageHeader} />
         </Col>
         <Col className="global-settings-tabs" span={24}>
-          <Tabs items={tabs} key={tab} onChange={onTabChange} />
+          <Tabs
+            className="tabs-new"
+            items={tabs}
+            key={tab}
+            onChange={onTabChange}
+          />
         </Col>
       </Row>
     </PageLayoutV1>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx
index b4ee957ec57..e00b82f87c9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx
@@ -246,6 +246,7 @@ export const PersonaDetailsPage = () => {
         <Col span={24}>
           <Tabs
             activeKey={activeKey}
+            className="tabs-new"
             items={tabItems}
             tabBarExtraContent={
               activeKey === 'users' && (
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
index 1dd91c60004..d5df8387954 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
@@ -449,7 +449,7 @@ const PoliciesDetailPage = () => {
                 onDescriptionUpdate={handleDescriptionUpdate}
               />
 
-              <Tabs defaultActiveKey="rules">
+              <Tabs className="tabs-new" defaultActiveKey="rules">
                 <TabPane key="rules" tab={t('label.rule-plural')}>
                   {isEmpty(policy.rules) ? (
                     <ErrorPlaceHolder />
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailsList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailsList.component.tsx
index cefa59fe4da..003abf02a19 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailsList.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailsList.component.tsx
@@ -13,12 +13,13 @@
 
 import Icon from '@ant-design/icons/lib/components/Icon';
 import { Button, Tooltip } from 'antd';
-import Table, { ColumnsType } from 'antd/lib/table';
+import { ColumnsType } from 'antd/lib/table';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { ReactComponent as IconRemove } from '../../../assets/svg/ic-remove.svg';
 import RichTextEditorPreviewerNew from '../../../components/common/RichTextEditor/RichTextEditorPreviewNew';
+import Table from '../../../components/common/Table/Table';
 import { EntityReference } from '../../../generated/type/entityReference';
 import { getEntityName } from '../../../utils/EntityUtils';
 import {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
index 4d7aa91cd34..af40e8ae0b3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
@@ -374,7 +374,10 @@ const RolesDetailPage = () => {
                 onDescriptionUpdate={handleDescriptionUpdate}
               />
 
-              <Tabs data-testid="tabs" defaultActiveKey="policies">
+              <Tabs
+                className="tabs-new"
+                data-testid="tabs"
+                defaultActiveKey="policies">
                 <TabPane key="policies" tab={t('label.policy-plural')}>
                   <Space
                     className="role-detail-tab w-full"
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPageList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPageList.component.tsx
index 804c3478160..d278b717476 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPageList.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPageList.component.tsx
@@ -12,13 +12,14 @@
  */
 
 import Icon from '@ant-design/icons/lib/components/Icon';
-import { Button, Table, Tooltip } from 'antd';
+import { Button, Tooltip } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { ReactComponent as IconRemove } from '../../../assets/svg/ic-remove.svg';
 import RichTextEditorPreviewerNew from '../../../components/common/RichTextEditor/RichTextEditorPreviewNew';
+import Table from '../../../components/common/Table/Table';
 import { EntityReference } from '../../../generated/type/entityReference';
 import { getEntityName } from '../../../utils/EntityUtils';
 import {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx
index 2e65e1959ea..b39e94d535f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx
@@ -36,6 +36,7 @@ import useCustomLocation from '../../hooks/useCustomLocation/useCustomLocation';
 import { getSettingPageEntityBreadCrumb } from '../../utils/GlobalSettingsUtils';
 import { userPermissions } from '../../utils/PermissionsUtils';
 import { getResourceEntityFromServiceCategory } from '../../utils/ServiceUtils';
+import './service-page.less';
 
 const ServicesPage = () => {
   const { tab } = useParams<{ tab: string }>();
@@ -95,6 +96,7 @@ const ServicesPage = () => {
           <Tabs
             destroyInactiveTabPane
             activeKey={search as string}
+            className="tabs-new services-tabs"
             items={[
               ...(serviceName === 'dataObservabilityServices'
                 ? []
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/service-page.less b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/service-page.less
new file mode 100644
index 00000000000..5a15ff4a29b
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/service-page.less
@@ -0,0 +1,21 @@
+/*
+ *  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) url('../../styles/variables.less');
+
+.ant-tabs.services-tabs {
+  .ant-tabs-tabpane {
+    padding: @padding-mlg;
+    border: 1px solid @grey-15;
+    margin-bottom: @margin-mlg;
+  }
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
index 27ce68aeda1..aacae199eb9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
@@ -523,7 +523,7 @@ const TestSuiteDetailsPage = () => {
         </Col>
 
         <Col span={24}>
-          <Tabs items={tabs} />
+          <Tabs className="tabs-new" items={tabs} />
         </Col>
         <Col span={24}>
           <Modal