diff --git a/.github/playwright/impact-map.generated.json b/.github/playwright/impact-map.generated.json
index 74eddbaf5b6b..a9ae94f44f0f 100644
--- a/.github/playwright/impact-map.generated.json
+++ b/.github/playwright/impact-map.generated.json
@@ -5165,6 +5165,7 @@
         "openmetadata-ui/src/main/resources/ui/playwright/utils/userDetails.ts"
       ],
       "specs": [
+        "playwright/e2e/Pages/Teams.spec.ts",
         "playwright/e2e/Pages/UserDetails.spec.ts"
       ]
     },
@@ -5660,6 +5661,16 @@
         "playwright/e2e/Features/BlockEditorEmbedLink.spec.ts"
       ]
     },
+    {
+      "sources": [
+        "openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/image/UploadFile/UploadFileTab.tsx"
+      ],
+      "specs": [
+        "playwright/e2e/Features/BulkImport.spec.ts",
+        "playwright/e2e/Features/BulkImportWithDotInName.spec.ts",
+        "playwright/e2e/Features/MetricBulkImportExportEdit.spec.ts"
+      ]
+    },
     {
       "sources": [
         "openmetadata-ui/src/main/resources/ui/src/components/BulkEditEntity/BulkEditEntity.component.tsx"
@@ -5885,6 +5896,7 @@
         "playwright/e2e/Features/ContextCenterDashboard.spec.ts",
         "playwright/e2e/Features/ContextCenterDocument.spec.ts",
         "playwright/e2e/Features/ContextCenterPermission.spec.ts",
+        "playwright/e2e/Features/SSOConfiguration.spec.ts",
         "playwright/e2e/Pages/DataContracts.spec.ts",
         "playwright/e2e/Pages/ODCSImportExport.spec.ts"
       ]
@@ -6147,6 +6159,7 @@
         "playwright/e2e/Features/ContextCenterDocument.spec.ts",
         "playwright/e2e/Features/ContextCenterPermission.spec.ts",
         "playwright/e2e/Features/DataQuality/TestCaseImportExportBasic.spec.ts",
+        "playwright/e2e/Features/SSOConfiguration.spec.ts",
         "playwright/e2e/Pages/DataContracts.spec.ts",
         "playwright/e2e/Pages/ODCSImportExport.spec.ts",
         "playwright/e2e/Pages/Users.spec.ts"
@@ -7798,6 +7811,7 @@
         "playwright/e2e/Features/AppMode/AppModeResolver.spec.ts",
         "playwright/e2e/Features/CustomizeNavigationNewItems.spec.ts",
         "playwright/e2e/Features/DataQuality/IncidentManagerLocaleLayout.spec.ts",
+        "playwright/e2e/Features/NavigationBlocker.spec.ts",
         "playwright/e2e/Features/RoleFixtureSessions.spec.ts",
         "playwright/e2e/Features/SettingsNavigationPage.spec.ts",
         "playwright/e2e/Pages/DataInsight.spec.ts"
@@ -8072,33 +8086,6 @@
         "playwright/e2e/Pages/SearchSettings.spec.ts"
       ]
     },
-    {
-      "sources": [
-        "openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.tsx"
-      ],
-      "specs": [
-        "playwright/e2e/Features/AIMode/ConnectionServiceDetails.spec.ts",
-        "playwright/e2e/Features/Container.spec.ts",
-        "playwright/e2e/Features/Dashboards.spec.ts",
-        "playwright/e2e/Features/DataQuality/DataQuality.spec.ts",
-        "playwright/e2e/Features/DataQuality/DataQualityListAfterReindex.spec.ts",
-        "playwright/e2e/Features/DataQuality/IncidentManagerAfterReindex.spec.ts",
-        "playwright/e2e/Features/DataQuality/TableTestCasePagination.spec.ts",
-        "playwright/e2e/Features/DataQuality/TestDefinitionFilters.spec.ts",
-        "playwright/e2e/Features/DataQuality/TestDefinitionSortAndSearch.spec.ts",
-        "playwright/e2e/Features/DataQuality/TestLibrary.spec.ts",
-        "playwright/e2e/Features/Glossary/LargeGlossaryPerformance.spec.ts",
-        "playwright/e2e/Features/IncidentManagerPagination.spec.ts",
-        "playwright/e2e/Features/IngestionListNameSorting.spec.ts",
-        "playwright/e2e/Features/Pagination.spec.ts",
-        "playwright/e2e/Features/QueryEntity.spec.ts",
-        "playwright/e2e/Features/Table.spec.ts",
-        "playwright/e2e/Flow/UsersPagination.spec.ts",
-        "playwright/e2e/Pages/DataContracts.spec.ts",
-        "playwright/e2e/Pages/TestSuite.spec.ts",
-        "playwright/e2e/Search/ExploreSearchCounts.spec.ts"
-      ]
-    },
     {
       "sources": [
         "openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.tsx"
@@ -8730,8 +8717,13 @@
         "openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx"
       ],
       "specs": [
+        "playwright/e2e/Features/ContextCenterDashboard.spec.ts",
+        "playwright/e2e/Features/ContextCenterDocument.spec.ts",
+        "playwright/e2e/Features/ContextCenterPermission.spec.ts",
         "playwright/e2e/Features/ProfileSsoSettings.spec.ts",
-        "playwright/e2e/Features/SSOConfiguration.spec.ts"
+        "playwright/e2e/Features/SSOConfiguration.spec.ts",
+        "playwright/e2e/Pages/DataContracts.spec.ts",
+        "playwright/e2e/Pages/ODCSImportExport.spec.ts"
       ]
     },
     {
@@ -8816,7 +8808,9 @@
       ],
       "specs": [
         "playwright/e2e/Features/BulkImport.spec.ts",
-        "playwright/e2e/Features/BulkImportWithDotInName.spec.ts"
+        "playwright/e2e/Features/BulkImportWithDotInName.spec.ts",
+        "playwright/e2e/Features/ClassificationImportExport.spec.ts",
+        "playwright/e2e/Features/MetricBulkImportExportEdit.spec.ts"
       ]
     },
     {
@@ -9834,6 +9828,7 @@
       ],
       "specs": [
         "playwright/e2e/Features/TeamsDragAndDrop.spec.ts",
+        "playwright/e2e/Pages/Entity.spec.ts",
         "playwright/e2e/Pages/ServiceListing.spec.ts"
       ]
     },
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/accordion/accordion.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/accordion/accordion.test.tsx
new file mode 100644
index 000000000000..4aa0de629d0b
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/accordion/accordion.test.tsx
@@ -0,0 +1,45 @@
+/*
+ *  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 { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+} from './accordion';
+
+describe('AccordionPanel', () => {
+  it('keeps validation fields mounted while collapsed', () => {
+    render(
+      <Accordion>
+        <AccordionItem id="advanced">
+          <AccordionHeader>Advanced</AccordionHeader>
+          <AccordionPanel>
+            <input aria-label="Token validity" defaultValue="3600" />
+          </AccordionPanel>
+        </AccordionItem>
+      </Accordion>
+    );
+
+    expect(screen.getByLabelText('Token validity')).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: 'Advanced' }));
+    fireEvent.change(screen.getByLabelText('Token validity'), {
+      target: { value: '7200' },
+    });
+    fireEvent.click(screen.getByRole('button', { name: 'Advanced' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Advanced' }));
+    expect(screen.getByLabelText('Token validity')).toHaveValue('7200');
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.test.tsx
new file mode 100644
index 000000000000..c91b5766d295
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.test.tsx
@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2026 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 { fireEvent, render, screen } from '@testing-library/react';
+import { RouterProvider } from 'react-aria-components';
+import { describe, expect, it, vi } from 'vitest';
+import { NavItemButton } from './nav-item-button';
+
+const Icon = () => <svg />;
+
+const renderButton = (navigate = vi.fn(), onClick = vi.fn()) => {
+  render(
+    <RouterProvider navigate={navigate}>
+      <NavItemButton
+        href="/settings"
+        icon={Icon}
+        label="Settings"
+        onClick={onClick}
+      />
+    </RouterProvider>
+  );
+
+  return { navigate, onClick, link: screen.getByRole('link') };
+};
+
+describe('NavItemButton', () => {
+  it('navigates through the client router instead of reloading the page', () => {
+    const { navigate, onClick, link } = renderButton();
+
+    const notPrevented = fireEvent.click(link);
+
+    expect(onClick).toHaveBeenCalled();
+    expect(navigate).toHaveBeenCalledWith('/settings', undefined);
+    expect(notPrevented).toBe(false);
+  });
+
+  it('leaves modified clicks to the browser', () => {
+    const { navigate, link } = renderButton();
+
+    fireEvent.click(link, { metaKey: true });
+
+    expect(navigate).not.toHaveBeenCalled();
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.tsx
index 50ffb0c949e3..356978628e85 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/app-navigation/base-components/nav-item-button.tsx
@@ -1,4 +1,5 @@
-import type { FC, MouseEventHandler } from 'react';
+import { shouldClientNavigate, useRouter } from '@react-aria/utils';
+import type { FC, MouseEvent, MouseEventHandler } from 'react';
 import { Pressable } from 'react-aria-components';
 import { Tooltip } from '@/components/base/tooltip/tooltip';
 import { cx } from '@/utils/cx';
@@ -45,6 +46,23 @@ export const NavItemButton = ({
   tooltipPlacement = 'right',
   onClick,
 }: NavItemButtonProps) => {
+  const router = useRouter();
+
+  // A plain anchor would reload the whole app; under a RouterProvider, hand
+  // same-tab clicks to the client router the way react-aria's Link does.
+  const handleClick = (event: MouseEvent<HTMLAnchorElement>) => {
+    onClick?.(event);
+    if (
+      href &&
+      !event.defaultPrevented &&
+      !router.isNative &&
+      shouldClientNavigate(event.currentTarget, event)
+    ) {
+      event.preventDefault();
+      router.open(event.currentTarget, event, href, undefined);
+    }
+  };
+
   return (
     <Tooltip placement={tooltipPlacement} title={label}>
       <Pressable>
@@ -52,13 +70,15 @@ export const NavItemButton = ({
           aria-label={label}
           className={cx(
             'tw:relative tw:flex tw:w-full tw:cursor-pointer tw:items-center tw:justify-center tw:rounded-md tw:bg-primary tw:dark:bg-transparent tw:p-2 tw:text-fg-quaternary tw:outline-focus-ring tw:transition tw:duration-100 tw:ease-linear tw:select-none tw:hover:bg-primary_hover tw:hover:text-fg-quaternary_hover tw:focus-visible:z-10 tw:focus-visible:outline-2 tw:focus-visible:outline-offset-2',
+            // Same current-page treatment as the expanded NavItemBase, so the
+            // collapsed rail still shows where the user is.
             current &&
-              'tw:bg-active tw:text-fg-quaternary_hover tw:hover:bg-secondary_hover',
+              'tw:bg-brand-primary_alt tw:text-fg-brand-secondary_alt tw:hover:bg-brand-primary_alt tw:hover:text-fg-brand-secondary_alt',
             styles[size].root,
             className
           )}
           href={href}
-          onClick={onClick}>
+          onClick={handleClick}>
           <Icon
             aria-hidden="true"
             className={cx(
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.test.tsx
index 1463e5c0e656..01b6db793e2c 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.test.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.test.tsx
@@ -10,8 +10,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { render, screen } from '@testing-library/react';
-import { describe, expect, it } from 'vitest';
+import { fireEvent, render, screen, within } from '@testing-library/react';
+import { beforeAll, describe, expect, it, vi } from 'vitest';
 import { DateRangePicker } from './date-range-picker';
 
 describe('DateRangePicker trigger', () => {
@@ -42,3 +42,86 @@ describe('DateRangePicker trigger', () => {
     expect(trigger).not.toHaveClass('tw:justify-center');
   });
 });
+
+describe('DateRangePicker apply', () => {
+  beforeAll(() => {
+    // jsdom has no matchMedia; the range calendar asks for the breakpoint.
+    vi.stubGlobal('matchMedia', () => ({
+      matches: true,
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
+    }));
+  });
+
+  it('passes the clicked preset key to onApply', () => {
+    const onApply = vi.fn();
+    render(<DateRangePicker onApply={onApply} />);
+
+    fireEvent.click(screen.getByRole('button'));
+    fireEvent.click(screen.getByRole('button', { name: 'Last month' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Apply' }));
+
+    expect(onApply).toHaveBeenCalledWith('lastMonth');
+  });
+
+  it('passes no key when the preset was cancelled', () => {
+    const onApply = vi.fn();
+    render(<DateRangePicker onApply={onApply} />);
+
+    fireEvent.click(screen.getByRole('button'));
+    fireEvent.click(screen.getByRole('button', { name: 'Last month' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Cancel' }));
+    fireEvent.click(screen.getByRole('button'));
+    fireEvent.click(screen.getByRole('button', { name: 'Apply' }));
+
+    expect(onApply).toHaveBeenCalledWith(undefined);
+  });
+});
+
+describe('DateRangePicker apply on small screens', () => {
+  beforeAll(() => {
+    // Below the md breakpoint the sidebar presets are hidden and the calendar
+    // shows its own preset buttons.
+    vi.stubGlobal('matchMedia', () => ({
+      matches: false,
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
+    }));
+  });
+
+  it('passes the preset key picked in the calendar to onApply', () => {
+    const onApply = vi.fn();
+    render(<DateRangePicker onApply={onApply} />);
+    fireEvent.click(screen.getByRole('button'));
+    fireEvent.click(
+      within(screen.getByRole('application')).getByRole('button', {
+        name: 'Last month',
+      })
+    );
+    fireEvent.click(screen.getByRole('button', { name: 'Apply' }));
+
+    expect(onApply).toHaveBeenCalledWith('lastMonth');
+  });
+});
+
+describe('DateRangePicker dismiss', () => {
+  beforeAll(() => {
+    vi.stubGlobal('matchMedia', () => ({
+      matches: true,
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
+    }));
+  });
+
+  it('forgets the preset when the picker is dismissed without Apply', () => {
+    const onApply = vi.fn();
+    render(<DateRangePicker onApply={onApply} />);
+    fireEvent.click(screen.getByRole('button'));
+    fireEvent.click(screen.getByRole('button', { name: 'Last month' }));
+    fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape' });
+    fireEvent.click(screen.getByRole('button'));
+    fireEvent.click(screen.getByRole('button', { name: 'Apply' }));
+
+    expect(onApply).toHaveBeenCalledWith(undefined);
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.tsx
index cd5afa031664..f0a2decafaf8 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/date-range-picker.tsx
@@ -28,13 +28,70 @@ import { DateInput } from './date-input';
 import { RangeCalendar } from './range-calendar';
 import { RangePresetButton } from './range-preset';
 
-const now = today(getLocalTimeZone());
+export const getDateRangePresets = (
+  locale: string,
+  now = today(getLocalTimeZone())
+) => ({
+  today: { label: 'Today', value: { start: now, end: now } },
+  yesterday: {
+    label: 'Yesterday',
+    value: {
+      start: now.subtract({ days: 1 }),
+      end: now.subtract({ days: 1 }),
+    },
+  },
+  thisWeek: {
+    label: 'This week',
+    value: { start: startOfWeek(now, locale), end: endOfWeek(now, locale) },
+  },
+  lastWeek: {
+    label: 'Last week',
+    value: {
+      start: startOfWeek(now, locale).subtract({ weeks: 1 }),
+      end: endOfWeek(now, locale).subtract({ weeks: 1 }),
+    },
+  },
+  thisMonth: {
+    label: 'This month',
+    value: { start: startOfMonth(now), end: endOfMonth(now) },
+  },
+  lastMonth: {
+    label: 'Last month',
+    value: {
+      start: startOfMonth(now).subtract({ months: 1 }),
+      end: endOfMonth(now).subtract({ months: 1 }),
+    },
+  },
+  thisYear: {
+    label: 'This year',
+    value: {
+      start: startOfMonth(now.set({ month: 1 })),
+      end: endOfMonth(now.set({ month: 12 })),
+    },
+  },
+  lastYear: {
+    label: 'Last year',
+    value: {
+      start: startOfMonth(now.set({ month: 1 }).subtract({ years: 1 })),
+      end: endOfMonth(now.set({ month: 12 }).subtract({ years: 1 })),
+    },
+  },
+  allTime: {
+    label: 'All time',
+    value: {
+      start: now.set({ year: 2000, month: 1, day: 1 }),
+      end: now,
+    },
+  },
+});
+
+export type DateRangePresetKey = keyof ReturnType<typeof getDateRangePresets>;
 
 const highlightedDates = [today(getLocalTimeZone())];
 
 interface DateRangePickerProps extends AriaDateRangePickerProps<DateValue> {
-  /** The function to call when the apply button is clicked. */
-  onApply?: () => void;
+  /** Called on Apply with the preset key when the range came from a preset. */
+  onApply?: (presetKey?: DateRangePresetKey) => void;
   /** The function to call when the cancel button is clicked. */
   onCancel?: () => void;
   /** Size of the trigger button, to line up with the inputs beside it. */
@@ -74,62 +131,8 @@ export const DateRangePicker = ({
     ? formatter.format(value.end.toDate(getLocalTimeZone()))
     : 'Select date';
 
-  const presets = useMemo(
-    () => ({
-      today: { label: 'Today', value: { start: now, end: now } },
-      yesterday: {
-        label: 'Yesterday',
-        value: {
-          start: now.subtract({ days: 1 }),
-          end: now.subtract({ days: 1 }),
-        },
-      },
-      thisWeek: {
-        label: 'This week',
-        value: { start: startOfWeek(now, locale), end: endOfWeek(now, locale) },
-      },
-      lastWeek: {
-        label: 'Last week',
-        value: {
-          start: startOfWeek(now, locale).subtract({ weeks: 1 }),
-          end: endOfWeek(now, locale).subtract({ weeks: 1 }),
-        },
-      },
-      thisMonth: {
-        label: 'This month',
-        value: { start: startOfMonth(now), end: endOfMonth(now) },
-      },
-      lastMonth: {
-        label: 'Last month',
-        value: {
-          start: startOfMonth(now).subtract({ months: 1 }),
-          end: endOfMonth(now).subtract({ months: 1 }),
-        },
-      },
-      thisYear: {
-        label: 'This year',
-        value: {
-          start: startOfMonth(now.set({ month: 1 })),
-          end: endOfMonth(now.set({ month: 12 })),
-        },
-      },
-      lastYear: {
-        label: 'Last year',
-        value: {
-          start: startOfMonth(now.set({ month: 1 }).subtract({ years: 1 })),
-          end: endOfMonth(now.set({ month: 12 }).subtract({ years: 1 })),
-        },
-      },
-      allTime: {
-        label: 'All time',
-        value: {
-          start: now.set({ year: 2000, month: 1, day: 1 }),
-          end: now,
-        },
-      },
-    }),
-    [locale]
-  );
+  const presets = useMemo(() => getDateRangePresets(locale), [locale]);
+  const [presetKey, setPresetKey] = useState<DateRangePresetKey>();
 
   return (
     <AriaDateRangePicker
@@ -137,7 +140,18 @@ export const DateRangePicker = ({
       shouldCloseOnSelect={false}
       {...props}
       value={value}
-      onChange={setValue}>
+      onChange={(range) => {
+        setPresetKey(undefined);
+        setValue(range);
+      }}
+      onOpenChange={(isOpen) => {
+        // Apply reads the key before closing, so a key still set here belongs
+        // to a dismissed picker and must not reach the next Apply.
+        if (!isOpen) {
+          setPresetKey(undefined);
+        }
+        props.onOpenChange?.(isOpen);
+      }}>
       <AriaGroup>
         {/* The picker's sm/md match input heights (36/40px): Button md/lg. */}
         <Button
@@ -173,11 +187,12 @@ export const DateRangePicker = ({
           {({ close }) => (
             <>
               <div className="tw:hidden tw:w-38 tw:flex-col tw:gap-0.5 tw:border-r tw:border-solid tw:border-secondary tw:p-3 tw:lg:flex">
-                {Object.values(presets).map((preset) => (
+                {Object.entries(presets).map(([key, preset]) => (
                   <RangePresetButton
-                    key={preset.label}
+                    key={key}
                     value={preset.value}
                     onClick={() => {
+                      setPresetKey(key as DateRangePresetKey);
                       setValue(preset.value);
                       setFocusedValue(preset.value.start);
                     }}>
@@ -195,6 +210,9 @@ export const DateRangePicker = ({
                     lastYear: presets.lastYear,
                   }}
                   onFocusChange={setFocusedValue}
+                  onPresetSelect={(key) =>
+                    setPresetKey(key as DateRangePresetKey)
+                  }
                 />
                 <div className="tw:flex tw:justify-between tw:gap-3 tw:border-t tw:border-secondary tw:p-4">
                   <div className="tw:hidden tw:items-center tw:gap-3 tw:md:flex">
@@ -216,7 +234,7 @@ export const DateRangePicker = ({
                       color="primary"
                       size="lg"
                       onClick={() => {
-                        onApply?.();
+                        onApply?.(presetKey);
                         close();
                       }}>
                       Apply
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/range-calendar.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/range-calendar.tsx
index e5c3304826e5..c8c996dcf95e 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/range-calendar.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/date-picker/range-calendar.tsx
@@ -65,10 +65,12 @@ const RangeCalendarTitle = ({ part }: { part: 'start' | 'end' }) => {
 
 const MobilePresetButton = ({
   value,
+  onSelect,
   children,
   ...props
 }: HTMLAttributes<HTMLButtonElement> & {
   value: { start: DateValue; end: DateValue };
+  onSelect?: () => void;
 }) => {
   const context = useContext(RangeCalendarStateContext);
 
@@ -81,6 +83,8 @@ const MobilePresetButton = ({
       onClick={() => {
         context?.setValue(value);
         context?.setFocusedDate(value.start as CalendarDate);
+        // After setValue: its change clears any selected preset upstream.
+        onSelect?.();
       }}>
       {children}
     </Button>
@@ -95,9 +99,15 @@ interface RangeCalendarProps extends AriaRangeCalendarProps<DateValue> {
     string,
     { label: string; value: { start: DateValue; end: DateValue } }
   >;
+  /** Called with the preset's key when a preset is picked. */
+  onPresetSelect?: (key: string) => void;
 }
 
-export const RangeCalendar = ({ presets, ...props }: RangeCalendarProps) => {
+export const RangeCalendar = ({
+  presets,
+  onPresetSelect,
+  ...props
+}: RangeCalendarProps) => {
   const isDesktop = useBreakpoint('md');
   const context = useSlottedContext(RangeCalendarContext);
 
@@ -144,8 +154,11 @@ export const RangeCalendar = ({ presets, ...props }: RangeCalendarProps) => {
 
           {!isDesktop && presets && (
             <div className="tw:mt-1 tw:flex tw:justify-between tw:gap-3 tw:px-2 tw:md:hidden">
-              {Object.values(presets).map((preset) => (
-                <MobilePresetButton key={preset.label} value={preset.value}>
+              {Object.entries(presets).map(([key, preset]) => (
+                <MobilePresetButton
+                  key={key}
+                  value={preset.value}
+                  onSelect={() => onPresetSelect?.(key)}>
                   {preset.label}
                 </MobilePresetButton>
               ))}
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.test.tsx
new file mode 100644
index 000000000000..40a595fe8603
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.test.tsx
@@ -0,0 +1,36 @@
+/*
+ *  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 { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { SlideoutMenu } from './slideout-menu';
+
+describe('SlideoutMenu', () => {
+  it('labels the dialog from its header and respects custom close controls', () => {
+    render(
+      <SlideoutMenu isOpen aria-labelledby="slideout-title">
+        <SlideoutMenu.Header id="slideout-title" showCloseButton={false}>
+          Reindex failures
+        </SlideoutMenu.Header>
+        <SlideoutMenu.Content>Details</SlideoutMenu.Content>
+      </SlideoutMenu>
+    );
+
+    expect(
+      screen.getByRole('dialog', { name: 'Reindex failures' })
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: /close/i })
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.tsx
index 241fa16043cd..3b61704b106a 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/slideout-menus/slideout-menu.tsx
@@ -27,7 +27,7 @@ export const ModalOverlay = (props: ModalOverlayProps) => {
       {...props}
       className={(state) =>
         cx(
-          'tw:fixed tw:inset-0 tw:flex tw:min-h-dvh tw:w-full tw:items-center tw:justify-end tw:bg-overlay/70 tw:pl-6 tw:outline-hidden tw:ease-linear tw:md:pl-10',
+          'tw:fixed tw:inset-0 tw:z-50 tw:flex tw:min-h-dvh tw:w-full tw:items-center tw:justify-end tw:bg-overlay/70 tw:pl-6 tw:outline-hidden tw:ease-linear tw:md:pl-10',
           state.isEntering && 'tw:duration-300 tw:animate-in tw:fade-in',
           state.isExiting && 'tw:duration-500 tw:animate-out tw:fade-out',
           typeof props.className === 'function'
@@ -83,6 +83,7 @@ interface SlideoutMenuProps
   extends Omit<AriaModalOverlayProps, 'children'>,
     RefAttributes<HTMLDivElement> {
   'aria-label'?: string;
+  'aria-labelledby'?: string;
   children:
     | ReactNode
     | ((children: AriaModalRenderProps & { close: () => void }) => ReactNode);
@@ -92,6 +93,7 @@ interface SlideoutMenuProps
 
 const Menu = ({
   'aria-label': ariaLabel,
+  'aria-labelledby': ariaLabelledBy,
   children,
   dialogClassName,
   width,
@@ -109,7 +111,10 @@ const Menu = ({
         }
         style={width !== undefined ? { maxWidth: width } : undefined}>
         {(state) => (
-          <Dialog aria-label={ariaLabel} className={dialogClassName}>
+          <Dialog
+            aria-label={ariaLabel}
+            aria-labelledby={ariaLabelledBy}
+            className={dialogClassName}>
             {({ close }) => {
               return typeof children === 'function'
                 ? children({ ...state, close })
@@ -139,12 +144,15 @@ Content.displayName = 'SlideoutContent';
 
 interface SlideoutHeaderProps extends ComponentPropsWithRef<'header'> {
   onClose?: () => void;
+  /** Omit the built-in close control when the caller already supplies one. */
+  showCloseButton?: boolean;
 }
 
 const Header = ({
   className,
   children,
   onClose,
+  showCloseButton = true,
   ...props
 }: SlideoutHeaderProps) => {
   return (
@@ -155,11 +163,13 @@ const Header = ({
         className
       )}>
       {children}
-      <CloseButton
-        className="tw:absolute tw:top-1/2 tw:right-3 tw:shrink-0 tw:-translate-y-1/2"
-        size="md"
-        onClick={onClose}
-      />
+      {showCloseButton && (
+        <CloseButton
+          className="tw:absolute tw:top-1/2 tw:right-3 tw:shrink-0 tw:-translate-y-1/2"
+          size="md"
+          onClick={onClose}
+        />
+      )}
     </header>
   );
 };
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select-migration.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select-migration.test.tsx
new file mode 100644
index 000000000000..e19c7dda4d91
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select-migration.test.tsx
@@ -0,0 +1,96 @@
+/*
+ *  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 { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { describe, expect, it, vi } from 'vitest';
+import { TreeSelect } from './tree-select';
+import { TreeSelectNode } from './tree-select.types';
+
+const children: TreeSelectNode[] = [
+  { id: 'a', label: 'A', value: 'a' },
+  { id: 'b', label: 'B', value: 'b' },
+];
+const parent: TreeSelectNode = {
+  id: 'all',
+  label: 'All',
+  value: 'all',
+  children,
+};
+const fetchData = async () => ({ nodes: [parent] });
+
+describe('TreeSelect migrated selection contracts', () => {
+  it('moves keyboard focus into asynchronously loaded options and selects with Enter', async () => {
+    const onChange = vi.fn();
+    const user = userEvent.setup();
+    render(
+      <TreeSelect
+        multiple
+        searchable
+        aria-label="Choose teams"
+        fetchData={async () => ({ nodes: children })}
+        id="teams"
+        onChange={onChange}
+      />
+    );
+    const input = screen.getByRole('combobox', { name: 'Choose teams' });
+    expect(input).toHaveAttribute('id', 'teams');
+    await user.click(input);
+    await user.keyboard('{ArrowDown}');
+    const firstRow = await screen.findByRole('row', { name: 'A' });
+    await waitFor(() => expect(firstRow).toHaveFocus());
+    expect(input).toHaveAttribute(
+      'aria-controls',
+      screen.getByRole('treegrid').id
+    );
+    await user.keyboard('{Enter}');
+    await waitFor(() => expect(onChange).toHaveBeenCalledWith([children[0]]));
+  });
+
+  it('limits visible chips without discarding hidden selections', () => {
+    render(
+      <TreeSelect
+        multiple
+        fetchData={fetchData}
+        maxVisibleItems={1}
+        placeholder="Teams"
+        value={children}
+      />
+    );
+    expect(screen.getByText('A')).toBeInTheDocument();
+    expect(screen.queryByText('B')).not.toBeInTheDocument();
+    expect(screen.getByText('+1')).toBeInTheDocument();
+  });
+  it('collapses a selected branch in the trigger and forwards focus events', async () => {
+    const onFocus = vi.fn();
+    const onBlur = vi.fn();
+    const user = userEvent.setup();
+    render(
+      <TreeSelect
+        cascadeSelection
+        multiple
+        fetchData={fetchData}
+        placeholder="Metrics"
+        selectedDisplayStrategy="parent"
+        value={[parent, ...children]}
+        onBlur={onBlur}
+        onFocus={onFocus}
+      />
+    );
+    expect(screen.getByText('All')).toBeInTheDocument();
+    expect(screen.queryByText('A')).not.toBeInTheDocument();
+    await user.click(screen.getByRole('combobox', { name: 'Metrics' }));
+    expect(onFocus).toHaveBeenCalled();
+    await user.tab();
+    expect(onBlur).toHaveBeenCalled();
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.tsx
index d3848f3c9be4..7331075c226b 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.tsx
@@ -23,6 +23,7 @@ import {
   type RefObject,
   useCallback,
   useEffect,
+  useId,
   useMemo,
   useRef,
   useState,
@@ -215,6 +216,8 @@ const collectSelectableNodes = <T,>(
 
 export const TreeSelect = <T = unknown,>({
   label,
+  id,
+  'aria-label': ariaLabel,
   placeholder,
   hint,
   tooltip,
@@ -247,6 +250,11 @@ export const TreeSelect = <T = unknown,>({
   fullWidthTrigger = false,
   onFetchError,
   renderSelectedItem,
+  isLoading = false,
+  maxVisibleItems,
+  selectedDisplayStrategy = 'all',
+  onFocus,
+  onBlur,
   bordered = false,
   showSelectAll = false,
   commitMode = 'immediate',
@@ -264,6 +272,11 @@ export const TreeSelect = <T = unknown,>({
   filterNode,
 }: TreeSelectProps<T>): ReactElement => {
   const { t } = useCoreTranslation();
+  const treeId = useId();
+  const inputId = id ?? `${treeId}-input`;
+  const [pendingTreeFocus, setPendingTreeFocus] = useState<
+    'first' | 'last' | null
+  >(null);
   const [internalOpen, setInternalOpen] = useState(false);
   const isOpen = controlledIsOpen ?? internalOpen;
   const [expandedKeys, setExpandedKeys] = useState<Set<Key>>(
@@ -321,7 +334,7 @@ export const TreeSelect = <T = unknown,>({
   // The button badge excludes root ids, so it needs the tree while closed.
   const {
     treeData,
-    loading,
+    loading: dataLoading,
     loadingNodes,
     loadChildren,
     loadMoreChildren,
@@ -337,6 +350,8 @@ export const TreeSelect = <T = unknown,>({
     enabled: hasOpened || isButtonVariant,
   });
 
+  const loading = dataLoading || isLoading;
+
   const visibleNodeIds = useMemo(
     () =>
       searchable ? getVisibleNodeIds(treeData, searchTerm, filterNode) : null,
@@ -756,6 +771,51 @@ export const TreeSelect = <T = unknown,>({
     [selectedData, toggleNodeSelection]
   );
 
+  const displayedNodes = useMemo(() => {
+    if (selectedDisplayStrategy === 'all') {
+      return selectedData;
+    }
+    const parents = new Map<string, string>();
+    const walk = (nodes: TreeSelectNode<T>[], parentId?: string) => {
+      nodes.forEach((node) => {
+        if (parentId) {
+          parents.set(node.id, parentId);
+        }
+        if (node.children) {
+          walk(node.children, node.id);
+        }
+      });
+    };
+    walk(treeData);
+    // Selected branches can arrive before their async options have loaded.
+    walk(selectedData);
+    selectedData.forEach((node) => {
+      if (node.parentId && !parents.has(node.id)) {
+        parents.set(node.id, node.parentId);
+      }
+    });
+    const selectedIds = new Set(selectedData.map((node) => node.id));
+
+    return selectedData.filter((node) => {
+      let parentId = parents.get(node.id);
+      while (parentId) {
+        if (selectedIds.has(parentId)) {
+          return false;
+        }
+        parentId = parents.get(parentId);
+      }
+
+      return true;
+    });
+  }, [selectedData, selectedDisplayStrategy, treeData]);
+  const visibleNodes = displayedNodes.slice(
+    0,
+    maxVisibleItems === undefined
+      ? displayedNodes.length
+      : Math.max(0, maxVisibleItems)
+  );
+  const hiddenNodes = displayedNodes.slice(visibleNodes.length);
+
   const displayValue = isOpen
     ? inputValue
     : !multiple && !renderSelectedItem
@@ -918,6 +978,27 @@ export const TreeSelect = <T = unknown,>({
     setShowSelectedOnly(false);
   }, [onChange, multiple, selectedData, clearSearch, setOpen]);
 
+  // Wait for async rows before handing focus to React Aria's keyboard navigation.
+  useEffect(() => {
+    if (!isOpen) {
+      setPendingTreeFocus(null);
+
+      return;
+    }
+    if (!pendingTreeFocus || loading) {
+      return;
+    }
+    const rows = popoverRef.current?.querySelectorAll<HTMLElement>(
+      '[role="row"]:not([aria-disabled="true"])'
+    );
+    const row =
+      pendingTreeFocus === 'first' ? rows?.[0] : rows?.[rows.length - 1];
+    if (row) {
+      row.focus();
+      setPendingTreeFocus(null);
+    }
+  }, [isOpen, pendingTreeFocus, loading, filteredTreeData]);
+
   const treeDropdownContent = (
     <div
       className="tw:contents"
@@ -967,8 +1048,9 @@ export const TreeSelect = <T = unknown,>({
           </div>
         ) : (
           <Tree
-            aria-label={label ?? placeholder ?? 'Tree select'}
+            aria-label={ariaLabel ?? label ?? placeholder ?? t('label.select')}
             expandedKeys={filteredExpandedKeys}
+            id={treeId}
             selectionMode="none"
             onAction={(key) => {
               const id = String(key);
@@ -1060,7 +1142,10 @@ export const TreeSelect = <T = unknown,>({
 
   if (renderTrigger) {
     return (
-      <div className={cx('tw:relative tw:inline-flex', className)}>
+      <div
+        className={cx('tw:relative tw:inline-flex', className)}
+        onBlur={onBlur}
+        onFocus={onFocus}>
         <div
           className={cx('tw:flex tw:min-w-0', fullWidthTrigger && 'tw:w-full')}
           ref={triggerRef}>
@@ -1082,7 +1167,10 @@ export const TreeSelect = <T = unknown,>({
     const triggerText = label ?? placeholder ?? '';
 
     return (
-      <div className={cx('tw:relative tw:inline-flex', className)}>
+      <div
+        className={cx('tw:relative tw:inline-flex', className)}
+        onBlur={onBlur}
+        onFocus={onFocus}>
         <div className="tw:flex" ref={triggerRef}>
           <Button
             className={cx(
@@ -1111,9 +1199,12 @@ export const TreeSelect = <T = unknown,>({
   }
 
   return (
-    <div className={cx('tw:flex tw:flex-col tw:gap-1.5', className)}>
+    <div
+      className={cx('tw:flex tw:flex-col tw:gap-1.5', className)}
+      onBlur={onBlur}
+      onFocus={onFocus}>
       {label && (
-        <Label isRequired={required} tooltip={tooltip}>
+        <Label htmlFor={inputId} isRequired={required} tooltip={tooltip}>
           {label}
         </Label>
       )}
@@ -1139,14 +1230,14 @@ export const TreeSelect = <T = unknown,>({
           <Search className="tw:size-4 tw:shrink-0 tw:text-fg-quaternary" />
 
           {renderSelectedItem
-            ? selectedData.map((node) => (
+            ? visibleNodes.map((node) => (
                 <Fragment key={node.id}>{renderSelectedItem(node)}</Fragment>
               ))
             : null}
 
           {!renderSelectedItem &&
             multiple &&
-            selectedData.map((node) => (
+            visibleNodes.map((node) => (
               <span
                 className="tw:flex tw:max-w-full tw:min-w-0 tw:items-center tw:gap-1 tw:rounded-md tw:bg-primary tw:py-0.5 tw:pr-1 tw:pl-1.5 tw:outline-1 tw:-outline-offset-1 tw:outline-primary"
                 key={node.id}>
@@ -1154,7 +1245,7 @@ export const TreeSelect = <T = unknown,>({
                   {node.label}
                 </p>
                 <button
-                  aria-label={`Remove ${node.label}`}
+                  aria-label={`${t('label.remove')} ${node.label}`}
                   className="tw:flex tw:cursor-pointer tw:rounded-[3px] tw:p-0.5 tw:text-fg-quaternary tw:outline-transparent tw:transition tw:duration-100 tw:ease-linear tw:hover:bg-primary_hover tw:hover:text-fg-quaternary_hover tw:disabled:cursor-not-allowed"
                   disabled={disabled}
                   type="button"
@@ -1167,12 +1258,28 @@ export const TreeSelect = <T = unknown,>({
               </span>
             ))}
 
+          {hiddenNodes.length > 0 && (
+            <span
+              className="tw:text-sm tw:text-secondary"
+              title={hiddenNodes.map((node) => node.label).join(', ')}>
+              +{hiddenNodes.length}
+            </span>
+          )}
+
           <FocusScope autoFocus={false} contain={false} restoreFocus={false}>
             <input
-              aria-label={label ?? placeholder}
+              aria-controls={isOpen ? treeId : undefined}
+              aria-expanded={isOpen}
+              aria-haspopup="grid"
+              aria-invalid={isInvalid || undefined}
+              aria-label={
+                ariaLabel ?? label ?? placeholder ?? t('label.select')
+              }
+              aria-required={required || undefined}
               autoFocus={autoFocus}
               className="tw:min-w-[6rem] tw:flex-1 tw:appearance-none tw:bg-transparent tw:text-sm tw:text-primary tw:outline-hidden tw:placeholder:text-placeholder tw:disabled:cursor-not-allowed"
               disabled={disabled}
+              id={inputId}
               placeholder={
                 selectedData.length > 0
                   ? undefined
@@ -1180,12 +1287,22 @@ export const TreeSelect = <T = unknown,>({
               }
               readOnly={!searchable}
               ref={inputRef}
+              role="combobox"
               value={displayValue}
               onChange={(event) =>
                 searchable && setInputValue(event.target.value)
               }
               onFocus={openOnFocus}
               onKeyDown={(event) => {
+                if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+                  event.preventDefault();
+                  openTrigger();
+                  setPendingTreeFocus(
+                    event.key === 'ArrowDown' ? 'first' : 'last'
+                  );
+
+                  return;
+                }
                 if (event.key === 'Escape') {
                   dismiss();
 
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.types.ts b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.types.ts
index e547883f70d9..347df549af2b 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.types.ts
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/tree-select.types.ts
@@ -10,7 +10,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import type { FC, ReactNode } from 'react';
+import type { FC, FocusEventHandler, ReactNode } from 'react';
 import type { Placement } from 'react-aria';
 
 export interface TreeSelectNode<T = unknown> {
@@ -84,6 +84,8 @@ export interface TreeSelectTriggerRenderProps {
 }
 
 export interface TreeSelectProps<T = unknown> {
+  id?: string;
+  'aria-label'?: string;
   /** Label text rendered above the field. */
   label?: string;
   /** Placeholder shown in the trigger when nothing is selected. */
@@ -93,6 +95,7 @@ export interface TreeSelectProps<T = unknown> {
   tooltip?: string;
   required?: boolean;
   disabled?: boolean;
+  isLoading?: boolean;
   isInvalid?: boolean;
   size?: 'sm' | 'md';
   autoFocus?: boolean;
@@ -159,6 +162,11 @@ export interface TreeSelectProps<T = unknown> {
    * cannot disagree.
    */
   renderSelectedItem?: (node: TreeSelectNode<T>) => ReactNode;
+  maxVisibleItems?: number;
+  /** Condense selected descendants under a selected parent in the trigger only. */
+  selectedDisplayStrategy?: 'all' | 'parent';
+  onFocus?: FocusEventHandler<HTMLDivElement>;
+  onBlur?: FocusEventHandler<HTMLDivElement>;
   /**
    * Handle a failed `fetchData` yourself. Without this the raw error message
    * is toasted, which for an HTTP transport is an untranslated string like
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.test.ts b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.test.ts
new file mode 100644
index 000000000000..6e8e5715b545
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.test.ts
@@ -0,0 +1,48 @@
+/*
+ *  Copyright 2026 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 { describe, expect, it } from 'vitest';
+import type { TreeSelectNode } from './tree-select.types';
+import { getVisibleNodeIds } from './use-tree-select-search';
+
+const tree: TreeSelectNode[] = [
+  {
+    id: 'finance',
+    label: 'Finance',
+    children: [
+      {
+        id: 'accounting',
+        label: 'Accounting',
+        children: [{ id: 'payroll', label: 'Payroll' }],
+      },
+    ],
+  },
+  { id: 'legal', label: 'Legal' },
+];
+
+describe('getVisibleNodeIds', () => {
+  it('keeps the subtree of a matching node', () => {
+    expect(getVisibleNodeIds(tree, 'fin')).toEqual(
+      new Set(['finance', 'accounting', 'payroll'])
+    );
+  });
+
+  it('keeps the ancestors of a matching descendant', () => {
+    expect(getVisibleNodeIds(tree, 'payroll')).toEqual(
+      new Set(['finance', 'accounting', 'payroll'])
+    );
+  });
+
+  it('returns null without a search term', () => {
+    expect(getVisibleNodeIds(tree, '')).toBeNull();
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.ts b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.ts
index 8094f85ee5dc..1e68dd73b9a1 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.ts
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/application/tree-select/use-tree-select-search.ts
@@ -70,6 +70,8 @@ const defaultFilterNode = <T>(node: TreeSelectNode<T>, term: string) =>
 /**
  * Pure client-side visibility computation over already-loaded tree data.
  * A node (and its ancestors) stay visible if it matches, or any descendant matches.
+ * A matching node keeps its whole subtree, so searching for a parent still
+ * offers its children (e.g. a team's sub-teams).
  */
 export const getVisibleNodeIds = <T>(
   treeData: TreeSelectNode<T>[],
@@ -83,12 +85,16 @@ export const getVisibleNodeIds = <T>(
   const visible = new Set<string>();
   const filterFn = filterNode ?? defaultFilterNode;
 
-  const walk = (nodes: TreeSelectNode<T>[], ancestors: string[]): boolean => {
+  const walk = (
+    nodes: TreeSelectNode<T>[],
+    ancestors: string[],
+    ancestorMatches: boolean
+  ): boolean => {
     let hasVisibleChild = false;
     nodes.forEach((node) => {
-      const matches = filterFn(node, searchTerm);
+      const matches = ancestorMatches || filterFn(node, searchTerm);
       const childVisible = node.children
-        ? walk(node.children, [...ancestors, node.id])
+        ? walk(node.children, [...ancestors, node.id], matches)
         : false;
 
       if (matches || childVisible) {
@@ -101,7 +107,7 @@ export const getVisibleNodeIds = <T>(
     return hasVisibleChild;
   };
 
-  walk(treeData, []);
+  walk(treeData, [], false);
 
   return visible;
 };
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/input/input.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/input/input.tsx
index 6250453b6223..f47f49509aa8 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/input/input.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/input/input.tsx
@@ -40,6 +40,8 @@ export interface InputBaseProps extends TextFieldProps {
   placeholder?: string;
   /** Increment used by numeric inputs. */
   step?: AriaInputProps['step'];
+  'aria-valuemin'?: number;
+  'aria-valuemax'?: number;
   /** Class name for the icon. */
   iconClassName?: string;
   /** Class name for the input. */
@@ -302,6 +304,8 @@ export const Input = forwardRef<HTMLInputElement, Omit<InputProps, 'ref'>>(
     {
       size = 'sm',
       fontSize = 'sm',
+      'aria-valuemin': ariaValueMin,
+      'aria-valuemax': ariaValueMax,
       placeholder,
       step,
       icon: Icon,
@@ -340,6 +344,8 @@ export const Input = forwardRef<HTMLInputElement, Omit<InputProps, 'ref'>>(
             )}
 
             <InputBase
+              aria-valuemax={ariaValueMax}
+              aria-valuemin={ariaValueMin}
               ref={ref}
               {...{
                 // The group only restyles the outline; the input text, leading
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.test.tsx
new file mode 100644
index 000000000000..9d4f9239ec9b
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.test.tsx
@@ -0,0 +1,33 @@
+/*
+ *  Copyright 2023 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 { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { ProgressBarCircle } from './progress-circles';
+
+describe('ProgressBarCircle', () => {
+  it('preserves status colors on the circle and value', () => {
+    const { container } = render(
+      <ProgressBarCircle color="success" size="xxs" value={25} />
+    );
+
+    expect(container.querySelectorAll('circle')[1]).toHaveClass(
+      'tw:stroke-fg-success-primary'
+    );
+    expect(screen.getByText('25%')).toHaveClass('tw:text-success-primary');
+    expect(screen.getByRole('progressbar')).toHaveAttribute(
+      'aria-valuenow',
+      '25'
+    );
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.tsx
index 356fca9aebe1..df68af61279b 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-circles.tsx
@@ -6,12 +6,34 @@ interface ProgressBarProps {
   max?: number;
   size: 'xxs' | 'xs' | 'sm' | 'md' | 'lg';
   label?: string;
+  /** Status colors belong to the data, independently of the default brand treatment. */
+  color?: 'brand' | 'success' | 'error' | 'warning' | 'purple';
   valueFormatter?: (
     value: number,
     valueInPercentage: number
   ) => string | number;
 }
 
+const colors = sortCx({
+  brand: { stroke: 'tw:stroke-fg-brand-primary', text: 'tw:text-primary' },
+  success: {
+    stroke: 'tw:stroke-fg-success-primary',
+    text: 'tw:text-success-primary',
+  },
+  error: {
+    stroke: 'tw:stroke-fg-error-primary',
+    text: 'tw:text-error-primary',
+  },
+  warning: {
+    stroke: 'tw:stroke-fg-warning-primary',
+    text: 'tw:text-warning-primary',
+  },
+  purple: {
+    stroke: 'tw:stroke-utility-purple-500',
+    text: 'tw:text-utility-purple-500',
+  },
+});
+
 const sizes = sortCx({
   xxs: {
     strokeWidth: 6,
@@ -57,6 +79,7 @@ export const ProgressBarCircle = ({
   size,
   label,
   valueFormatter,
+  color = 'brand',
 }: ProgressBarProps) => {
   const percentage = Math.round(((value - min) * 100) / (max - min));
 
@@ -71,7 +94,9 @@ export const ProgressBarCircle = ({
   const cx = diameter / 2;
   const cy = diameter / 2;
 
-  const textPosition = label ? 'absolute text-center' : 'absolute text-primary';
+  const textPosition = label
+    ? 'tw:absolute tw:text-center'
+    : 'tw:absolute tw:text-primary';
   const strokeDashoffset = 100 - percentage;
 
   return (
@@ -102,7 +127,7 @@ export const ProgressBarCircle = ({
 
           {/* Foreground circle */}
           <circle
-            className="tw:stroke-fg-brand-primary"
+            className={colors[color].stroke}
             cx={cx}
             cy={cy}
             fill="none"
@@ -117,14 +142,14 @@ export const ProgressBarCircle = ({
         {label && size !== 'xxs' ? (
           <div className="tw:absolute tw:text-center">
             <div className={labelClass}>{label}</div>
-            <div className={valueClass}>
+            <div className={clx(valueClass, colors[color].text)}>
               {valueFormatter
                 ? valueFormatter(value, percentage)
                 : `${percentage}%`}
             </div>
           </div>
         ) : (
-          <span className={clx(textPosition, valueClass)}>
+          <span className={clx(textPosition, valueClass, colors[color].text)}>
             {valueFormatter
               ? valueFormatter(value, percentage)
               : `${percentage}%`}
@@ -139,6 +164,7 @@ export const ProgressBarCircle = ({
 
 export const ProgressBarHalfCircle = ({
   value,
+  color = 'brand',
   min = 0,
   max = 100,
   size,
@@ -190,7 +216,10 @@ export const ProgressBarHalfCircle = ({
 
           {/* Foreground half-circle */}
           <circle
-            className="tw:origin-center tw:-scale-x-100 tw:stroke-fg-brand-primary"
+            className={clx(
+              'tw:origin-center tw:-scale-x-100',
+              colors[color].stroke
+            )}
             cx={cx}
             cy={cy}
             fill="none"
@@ -206,7 +235,7 @@ export const ProgressBarHalfCircle = ({
         {label && size !== 'xxs' ? (
           <div className={halfCircleTextPosition}>
             <div className={labelClass}>{label}</div>
-            <div className={valueClass}>
+            <div className={clx(valueClass, colors[color].text)}>
               {valueFormatter
                 ? valueFormatter(value, percentage)
                 : `${percentage}%`}
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.test.tsx
new file mode 100644
index 000000000000..99d62f064827
--- /dev/null
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.test.tsx
@@ -0,0 +1,29 @@
+/*
+ *  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 { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { ProgressBar } from './progress-indicators';
+
+describe('ProgressBar', () => {
+  it('retains chart-series colors through the labeled component', () => {
+    render(<ProgressBar color="#123456" labelPosition="right" value={42} />);
+    expect(screen.getByRole('progressbar')).toHaveAttribute(
+      'aria-valuenow',
+      '42'
+    );
+    expect(screen.getByRole('progressbar').firstElementChild).toHaveStyle({
+      backgroundColor: '#123456',
+    });
+    expect(screen.getByText('42%')).toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.tsx
index 5e99dd45911e..a13f11aa9010 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/progress-indicators/progress-indicators.tsx
@@ -5,6 +5,8 @@ export interface ProgressBarProps {
    * The current value of the progress bar.
    */
   value: number;
+  /** Chart-series color; omitted bars use the semantic brand color. */
+  color?: string;
   /**
    * The minimum value of the progress bar.
    * @default 0
@@ -38,6 +40,7 @@ export interface ProgressBarProps {
  */
 export const ProgressBarBase = ({
   value,
+  color,
   min = 0,
   max = 100,
   className,
@@ -61,7 +64,10 @@ export const ProgressBarBase = ({
           'tw:size-full tw:rounded-md tw:bg-fg-brand-primary tw:transition tw:duration-75 tw:ease-linear',
           progressClassName
         )}
-        style={{ transform: `translateX(-${100 - percentage}%)` }}
+        style={{
+          backgroundColor: color,
+          transform: `translateX(-${100 - percentage}%)`,
+        }}
       />
     </div>
   );
@@ -89,6 +95,7 @@ export interface ProgressIndicatorWithTextProps extends ProgressBarProps {
  */
 export const ProgressBar = ({
   value,
+  color,
   min = 0,
   max = 100,
   valueFormatter,
@@ -104,6 +111,7 @@ export const ProgressBar = ({
   const baseProgressBar = (
     <ProgressBarBase
       className={className}
+      color={color}
       max={max}
       min={min}
       progressClassName={progressClassName}
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.test.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.test.tsx
index 7c1fb8d193c5..5f8339712067 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.test.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.test.tsx
@@ -187,6 +187,26 @@ describe('Tooltip — show/hide behaviour', () => {
     expect(screen.getByText('Always visible')).toBeInTheDocument();
   });
 
+  // Pointer events are blocked only while a tooltip enters (see tooltip.tsx);
+  // a settled tooltip must take the pointer so links and "view more" buttons
+  // in it stay hoverable and clickable.
+  it('keeps a settled tooltip interactive', async () => {
+    const onPress = vi.fn();
+    render(
+      <Tooltip isOpen title={<Button onPress={onPress}>View more</Button>}>
+        <button>trigger</button>
+      </Tooltip>
+    );
+
+    expect(screen.getByRole('tooltip')).not.toHaveClass(
+      'tw:pointer-events-none'
+    );
+
+    await userEvent.click(screen.getByRole('button', { name: 'View more' }));
+
+    expect(onPress).toHaveBeenCalled();
+  });
+
   it('does not show tooltip on interaction when trigger is disabled', async () => {
     const user = userEvent.setup();
     setupPointerModality();
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.tsx b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.tsx
index 0cf79c1c781e..55386ee575b8 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.tsx
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/base/tooltip/tooltip.tsx
@@ -266,7 +266,11 @@ export const Tooltip = ({
         {...tooltipProps}
         className={({ isEntering, isExiting }) =>
           cx(
-            isEntering && 'tw:ease-out tw:animate-in',
+            // While it is first positioned, an overlay that flips (top → bottom)
+            // can sit under the cursor for a frame; taking the pointer then ends
+            // the hover and closes the tooltip. Ignore the pointer only until it
+            // has entered, so a settled tooltip stays hoverable and clickable.
+            isEntering && 'tw:ease-out tw:animate-in tw:pointer-events-none',
             isExiting && 'tw:ease-in tw:animate-out',
             'tw:break-words' // Ensure long words in the tooltip wrap instead of overflowing.
           )
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/components/index.ts b/openmetadata-ui-core-components/src/main/resources/ui/src/components/index.ts
index 6eb5b1f891d5..402053c23137 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/components/index.ts
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/components/index.ts
@@ -212,3 +212,5 @@ export type {
   OwnerChipProps,
   OwnerAvatarStackProps,
 } from './application/owner/owner.types';
+
+export * from './base/input/number-input';
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ar-sa.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ar-sa.json
index dabdcbca750d..5abe0338b30b 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ar-sa.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ar-sa.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "تنقل ترقيم الصفحات",
     "previous-page": "الانتقال إلى الصفحة السابقة",
     "records": "السجلات",
+    "remove": "إزالة",
     "remove-entity": "إزالة {{entity}}",
     "remove-filter": "إزالة التصفية",
     "search": "بحث",
+    "select": "تحديد",
     "select-all": "تحديد الكل",
     "select-date": "اختر التاريخ",
     "select-dates": "اختر التواريخ",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/de-de.json
index e77cc6c4715e..3b7d24f2c190 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/de-de.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/de-de.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Seitennummerierungsnavigation",
     "previous-page": "Zur vorherigen Seite",
     "records": "Datensätze",
+    "remove": "Entfernen",
     "remove-entity": "{{entity}} entfernen",
     "remove-filter": "Filter entfernen",
     "search": "Suchen",
+    "select": "Auswählen",
     "select-all": "Alle auswählen",
     "select-date": "Datum auswählen",
     "select-dates": "Daten auswählen",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/en-us.json
index 9e8d96e54241..a4d006ae0022 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/en-us.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Pagination Navigation",
     "previous-page": "Go to previous page",
     "records": "Records",
+    "remove": "Remove",
     "remove-entity": "Remove {{entity}}",
     "remove-filter": "Remove filter",
     "search": "Search",
+    "select": "Select",
     "select-all": "Select all",
     "select-date": "Select date",
     "select-dates": "Select dates",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/es-es.json
index ba8b1097409c..d78d481f0028 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/es-es.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/es-es.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Navegación de paginación",
     "previous-page": "Ir a la página anterior",
     "records": "Registros",
+    "remove": "Eliminar",
     "remove-entity": "Eliminar {{entity}}",
     "remove-filter": "Eliminar filtro",
     "search": "Buscar",
+    "select": "Seleccionar",
     "select-all": "Seleccionar todo",
     "select-date": "Seleccionar fecha",
     "select-dates": "Seleccionar fechas",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/fr-fr.json
index 6c1acf53d808..6b1cb3d70e3d 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/fr-fr.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/fr-fr.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Navigation de pagination",
     "previous-page": "Aller à la page précédente",
     "records": "Enregistrements",
+    "remove": "Retirer",
     "remove-entity": "Supprimer {{entity}}",
     "remove-filter": "Supprimer le filtre",
     "search": "Rechercher",
+    "select": "Sélectionner",
     "select-all": "Tout sélectionner",
     "select-date": "Sélectionner une date",
     "select-dates": "Sélectionner les dates",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/gl-es.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/gl-es.json
index 629c10639e10..c623a01afb1c 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/gl-es.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/gl-es.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Navegación de paxinación",
     "previous-page": "Ir á páxina anterior",
     "records": "Rexistros",
+    "remove": "Eliminar",
     "remove-entity": "Eliminar {{entity}}",
     "remove-filter": "Eliminar filtro",
     "search": "Buscar",
+    "select": "Seleccionar",
     "select-all": "Seleccionar todo",
     "select-date": "Seleccionar data",
     "select-dates": "Seleccionar datas",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/he-he.json
index fa7f638a226e..da5393516152 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/he-he.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/he-he.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "ניווט מספור עמודים",
     "previous-page": "עבור לעמוד הקודם",
     "records": "רשומות",
+    "remove": "הסר",
     "remove-entity": "הסר {{entity}}",
     "remove-filter": "הסר סינון",
     "search": "חיפוש",
+    "select": "בחר",
     "select-all": "בחר הכל",
     "select-date": "בחר תאריך",
     "select-dates": "בחר תאריכים",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ja-jp.json
index dfcc6c11544f..71401a8e0e03 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ja-jp.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ja-jp.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "ページネーションナビゲーション",
     "previous-page": "前のページへ",
     "records": "レコード",
+    "remove": "削除",
     "remove-entity": "{{entity}}を削除",
     "remove-filter": "フィルターを削除",
     "search": "検索",
+    "select": "選択",
     "select-all": "すべて選択",
     "select-date": "日付を選択",
     "select-dates": "日付を選択",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ko-kr.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ko-kr.json
index 635381891bae..7bf3bb28aa46 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ko-kr.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ko-kr.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "페이지 매김 탐색",
     "previous-page": "이전 페이지로 이동",
     "records": "레코드",
+    "remove": "제거",
     "remove-entity": "{{entity}} 제거",
     "remove-filter": "필터 제거",
     "search": "검색",
+    "select": "선택",
     "select-all": "모두 선택",
     "select-date": "날짜 선택",
     "select-dates": "날짜 선택",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/mr-in.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/mr-in.json
index 1559cca6f4b3..320fef2f9bb4 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/mr-in.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/mr-in.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "पृष्ठांकन नेव्हिगेशन",
     "previous-page": "मागील पृष्ठावर जा",
     "records": "रेकॉर्ड",
+    "remove": "काढा",
     "remove-entity": "{{entity}} काढा",
     "remove-filter": "फिल्टर काढा",
     "search": "शोधा",
+    "select": "निवडा",
     "select-all": "सर्व निवडा",
     "select-date": "तारीख निवडा",
     "select-dates": "तारखा निवडा",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/nl-nl.json
index 661c7b2048db..5f9561526f96 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/nl-nl.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/nl-nl.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Pagineringsnavigatie",
     "previous-page": "Naar vorige pagina",
     "records": "Records",
+    "remove": "Verwijderen",
     "remove-entity": "{{entity}} verwijderen",
     "remove-filter": "Filter verwijderen",
     "search": "Zoeken",
+    "select": "Selecteren",
     "select-all": "Alles selecteren",
     "select-date": "Datum selecteren",
     "select-dates": "Datums selecteren",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pr-pr.json
index c35936f5728c..3e37657f252b 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pr-pr.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pr-pr.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "ناوبری صفحه‌بندی",
     "previous-page": "رفتن به صفحه قبل",
     "records": "رکوردها",
+    "remove": "حذف",
     "remove-entity": "حذف {{entity}}",
     "remove-filter": "حذف فیلتر",
     "search": "جستجو",
+    "select": "انتخاب کنید",
     "select-all": "انتخاب همه",
     "select-date": "انتخاب تاریخ",
     "select-dates": "انتخاب تاریخ‌ها",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-br.json
index 87e9ecb26693..ff442ebdb28e 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-br.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-br.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Navegação de paginação",
     "previous-page": "Ir para a página anterior",
     "records": "Registros",
+    "remove": "Remover",
     "remove-entity": "Remover {{entity}}",
     "remove-filter": "Remover filtro",
     "search": "Pesquisar",
+    "select": "Selecionar",
     "select-all": "Selecionar tudo",
     "select-date": "Selecionar data",
     "select-dates": "Selecionar datas",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-pt.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-pt.json
index afa35588e360..3fa8950583c6 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-pt.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/pt-pt.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Navegação de paginação",
     "previous-page": "Ir para a página anterior",
     "records": "Registos",
+    "remove": "Remover",
     "remove-entity": "Remover {{entity}}",
     "remove-filter": "Remover filtro",
     "search": "Pesquisar",
+    "select": "Selecionar",
     "select-all": "Selecionar tudo",
     "select-date": "Selecionar data",
     "select-dates": "Selecionar datas",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ru-ru.json
index 17973cab0f28..62009ec30d35 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ru-ru.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/ru-ru.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Навигация по страницам",
     "previous-page": "Перейти на предыдущую страницу",
     "records": "Записи",
+    "remove": "Удалить",
     "remove-entity": "Удалить {{entity}}",
     "remove-filter": "Удалить фильтр",
     "search": "Поиск",
+    "select": "Выбрать",
     "select-all": "Выбрать все",
     "select-date": "Выбрать дату",
     "select-dates": "Выбрать даты",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/sv-se.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/sv-se.json
index d4cc30cae13e..d68d49a36f4c 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/sv-se.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/sv-se.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Navigering för sidnumrering",
     "previous-page": "Gå till föregående sida",
     "records": "Poster",
+    "remove": "Ta bort",
     "remove-entity": "Ta bort {{entity}}",
     "remove-filter": "Ta bort filter",
     "search": "Sök",
+    "select": "Välj",
     "select-all": "Välj alla",
     "select-date": "Välj datum",
     "select-dates": "Välj datum",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/th-th.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/th-th.json
index 3a024ff655e4..4b43f35eae42 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/th-th.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/th-th.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "การนำทางการแบ่งหน้า",
     "previous-page": "ไปที่หน้าก่อนหน้า",
     "records": "บันทึก",
+    "remove": "ลบ",
     "remove-entity": "ลบ {{entity}}",
     "remove-filter": "ลบตัวกรอง",
     "search": "ค้นหา",
+    "select": "เลือก",
     "select-all": "เลือกทั้งหมด",
     "select-date": "เลือกวันที่",
     "select-dates": "เลือกวันที่",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/tr-tr.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/tr-tr.json
index 6d2d9a2be001..61e72a2525d4 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/tr-tr.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/tr-tr.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "Sayfalandırma gezintisi",
     "previous-page": "Önceki sayfaya git",
     "records": "Kayıtlar",
+    "remove": "Kaldır",
     "remove-entity": "{{entity}} kaldır",
     "remove-filter": "Filtreyi kaldır",
     "search": "Ara",
+    "select": "Seç",
     "select-all": "Tümünü seç",
     "select-date": "Tarih seç",
     "select-dates": "Tarihleri seç",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-cn.json
index df43450363f2..96d65dc4b048 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-cn.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-cn.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "分页导航",
     "previous-page": "转到上一页",
     "records": "记录",
+    "remove": "删除",
     "remove-entity": "移除 {{entity}}",
     "remove-filter": "移除筛选",
     "search": "搜索",
+    "select": "选择",
     "select-all": "全选",
     "select-date": "选择日期",
     "select-dates": "选择日期",
diff --git a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-tw.json b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-tw.json
index 5e40f2a7a4db..649bf23d2ca3 100644
--- a/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-tw.json
+++ b/openmetadata-ui-core-components/src/main/resources/ui/src/locale/languages/zh-tw.json
@@ -31,9 +31,11 @@
     "pagination-navigation": "分頁導覽",
     "previous-page": "前往上一頁",
     "records": "記錄",
+    "remove": "移除",
     "remove-entity": "移除 {{entity}}",
     "remove-filter": "移除篩選器",
     "search": "搜尋",
+    "select": "選取",
     "select-all": "全選",
     "select-date": "選取日期",
     "select-dates": "選取日期",
diff --git a/openmetadata-ui/src/main/resources/ui/eslint-rules/openmetadata-antd.test.mjs b/openmetadata-ui/src/main/resources/ui/eslint-rules/openmetadata-antd.test.mjs
index b6186fa5ac91..19896d32e962 100644
--- a/openmetadata-ui/src/main/resources/ui/eslint-rules/openmetadata-antd.test.mjs
+++ b/openmetadata-ui/src/main/resources/ui/eslint-rules/openmetadata-antd.test.mjs
@@ -163,7 +163,7 @@ test('the app config never suppresses a migrated component', async () => {
 
   // Exact, so re-running --suppress-rule cannot quietly absorb new antd usage.
   // Lower this when a PR removes antd imports and prunes the baseline.
-  const EXPECTED_SUPPRESSED_ANTD_SYMBOLS = 246;
+  const EXPECTED_SUPPRESSED_ANTD_SYMBOLS = 148;
   const suppressedSymbols = Object.values(suppressions).reduce(
     (total, rules) =>
       total + (rules['openmetadata-antd/no-antd-import']?.count ?? 0),
diff --git a/openmetadata-ui/src/main/resources/ui/eslint-suppressions.json b/openmetadata-ui/src/main/resources/ui/eslint-suppressions.json
index 3d8bd016f676..773275daa056 100644
--- a/openmetadata-ui/src/main/resources/ui/eslint-suppressions.json
+++ b/openmetadata-ui/src/main/resources/ui/eslint-suppressions.json
@@ -21,7 +21,7 @@
   },
   "playwright/e2e/Features/ActivityFeed.spec.ts": {
     "om-playwright/no-positional-locator": {
-      "count": 9
+      "count": 8
     }
   },
   "playwright/e2e/Features/ActivityStream.spec.ts": {
@@ -104,7 +104,7 @@
   },
   "playwright/e2e/Features/CustomizeNavigationNewItems.spec.ts": {
     "om-playwright/no-positional-locator": {
-      "count": 8
+      "count": 4
     }
   },
   "playwright/e2e/Features/DataAssetRulesDisabled.spec.ts": {
@@ -580,7 +580,7 @@
   },
   "playwright/e2e/Pages/UserDetails.spec.ts": {
     "om-playwright/no-positional-locator": {
-      "count": 3
+      "count": 2
     }
   },
   "playwright/e2e/Pages/Users.spec.ts": {
@@ -795,11 +795,6 @@
   },
   "playwright/utils/userDetails.ts": {
     "om-playwright/no-positional-locator": {
-      "count": 3
-    }
-  },
-  "src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel.tsx": {
-    "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
@@ -808,11 +803,6 @@
       "count": 3
     }
   },
-  "src/components/AppContainer/AppContainer.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/ContextCenter/CreateMemoryModal/CreateMemoryModal.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -825,15 +815,10 @@
   },
   "src/components/DataAssetRules/DataAssetRules.component.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/DataInsight/DataInsightProgressBar.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/components/DataInsight/EntitySummaryProgressBar.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
@@ -845,7 +830,7 @@
   },
   "src/components/DataInsight/KPILatestResultsV1.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 3
+      "count": 2
     }
   },
   "src/components/DataInsight/TotalEntityInsightSummary.component.tsx": {
@@ -853,21 +838,6 @@
       "count": 1
     }
   },
-  "src/components/Database/ColumnDetailPanel/ColumnDetailPanel.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/components/Database/ColumnFilter/ColumnFilter.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 3
-    }
-  },
-  "src/components/Database/SampleDataWithMessages/MessageCard.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/Database/TableQueries/TableQueries.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 3
@@ -875,7 +845,7 @@
   },
   "src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx": {
@@ -893,21 +863,11 @@
       "count": 1
     }
   },
-  "src/components/Explore/EntitySummaryPanel/APIEndpointSummary/APIEndpointSummary.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
   "src/components/Explore/EntitySummaryPanel/CommonEntitySummaryInfo/CommonEntitySummaryInfo.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
   "src/components/GlobalSearchBar/GlobalSearchBar.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -948,56 +908,21 @@
       "count": 1
     }
   },
-  "src/components/MyData/LeftSidebar/LeftSidebar.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 4
-    }
-  },
-  "src/components/MyData/LeftSidebar/LeftSidebarItem.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/components/NavBar/NavBar.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 3
-    }
-  },
   "src/components/NotificationBox/NotificationBox.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 3
-    }
-  },
-  "src/components/NotificationBox/NotificationBox.utils.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/components/NotificationBox/NotificationFeedCard.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/components/PageHeader/PageHeader.component.tsx": {
+  "src/components/NotificationBox/NotificationBox.utils.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/components/PaginationComponent/PaginationComponent.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 3
-    }
-  },
   "src/components/Pipeline/Execution/Execution.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 2
     }
   },
-  "src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/Pipeline/PipelineTaskTab/PipelineTaskTab.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1005,17 +930,17 @@
   },
   "src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 3
+      "count": 1
     }
   },
   "src/components/SearchSettings/FieldConfiguration/FieldConfiguration.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 4
+      "count": 1
     }
   },
   "src/components/SearchSettings/FieldValueBoostList/FieldValueBoostList.tsx": {
@@ -1028,11 +953,6 @@
       "count": 1
     }
   },
-  "src/components/ServiceInsights/AgentsStatusWidget/AgentsStatusWidget.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/Settings/Applications/AppDetails/AppDetails.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 5
@@ -1040,12 +960,7 @@
   },
   "src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 5
-    }
-  },
-  "src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
+      "count": 3
     }
   },
   "src/components/Settings/Applications/ApplicationCard/ApplicationCard.component.tsx": {
@@ -1055,7 +970,7 @@
   },
   "src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 3
+      "count": 1
     }
   },
   "src/components/Settings/Bot/BotDetails/AuthMechanism.tsx": {
@@ -1073,24 +988,9 @@
       "count": 2
     }
   },
-  "src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/Settings/SettingItemCard/SettingItemCard.component.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx": {
@@ -1103,56 +1003,16 @@
       "count": 3
     }
   },
-  "src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/components/Settings/Team/TeamsSelectable/TeamsSelectableNew.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/SettingsSso/ProviderSelector/ProviderSelector.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/SettingsSso/SSOGroupedFieldTemplate/SSOGroupedFieldTemplate.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/components/Topic/TopicSchema/TopicSchema.interface.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/components/UploadFile/UploadFile.interface.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/components/UploadFile/UploadFile.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 3
-    }
-  },
   "src/components/common/AsyncSelect/AsyncSelect.test.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1185,12 +1045,12 @@
   },
   "src/components/common/FilterPattern/FilterPattern.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/common/Form/FormItemLabel.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/common/Form/JSONSchema/JSONSchemaTemplate/ArrayFieldTemplate.tsx": {
@@ -1199,16 +1059,11 @@
     }
   },
   "src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/components/common/Form/JSONSchema/JsonSchemaWidgets/LdapRoleMappingWidget/LdapRoleMappingWidget.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/components/common/Form/JSONSchema/JsonSchemaWidgets/ManifestJsonWidget/ManifestJsonWidget.tsx": {
+  "src/components/common/Form/JSONSchema/JsonSchemaWidgets/LdapRoleMappingWidget/LdapRoleMappingWidget.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
@@ -1220,7 +1075,7 @@
   },
   "src/components/common/LimitBanner/LimitBanner.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/components/common/ListView/ListView.component.tsx": {
@@ -1248,21 +1103,11 @@
       "count": 2
     }
   },
-  "src/components/common/SummaryCard/SummaryCard.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/common/Table/DraggableMenu/DraggableMenuItem.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 2
     }
   },
-  "src/components/common/TabsLabel/TabsLabel.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/components/common/TagRenderer/TagRenderer.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1298,11 +1143,6 @@
       "count": 1
     }
   },
-  "src/pages/AuditLogsPage/AuditLogsPage.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/pages/Configuration/LoginConfigurationDetails/LoginConfigurationPage.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 2
@@ -1318,32 +1158,12 @@
       "count": 3
     }
   },
-  "src/pages/DataInsightPage/DataInsightClassBase.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
   "src/pages/EmailConfigSettingsPage/EmailConfigSettingsPage.component.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/pages/EntityImport/BulkEntityImportPage/BulkEntityImportPage.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/pages/LearningResourcesPage/LearningResourceForm.component.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 2
-    }
-  },
-  "src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
@@ -1364,20 +1184,10 @@
     }
   },
   "src/pages/SearchSettingsPage/SearchSettingsPage.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 3
-    }
-  },
-  "src/pages/SettingsNavigationPage/SettingsNavigationPage.test.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
     }
   },
-  "src/pages/SettingsNavigationPage/SettingsNavigationPage.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 4
-    }
-  },
   "src/pages/TableDetailsPageV1/TableConstraints/ConstraintIcon.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1390,12 +1200,12 @@
   },
   "src/pages/TaskFormSettingsPage/TaskFormSettingsPage.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/pages/TaskFormSettingsPage/components/TaskFormBuilderSection.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 3
+      "count": 2
     }
   },
   "src/utils/Alerts/AlertsUtilPure.ts": {
@@ -1413,11 +1223,6 @@
       "count": 1
     }
   },
-  "src/utils/CustomizaNavigation/CustomizeNavigation.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/utils/DataAssetsVersionHeaderUtils.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1438,16 +1243,6 @@
       "count": 1
     }
   },
-  "src/utils/EntitySummaryPanelUtilsV1.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/utils/EntityUtilClassBase.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/utils/FeedUtils.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1458,11 +1253,6 @@
       "count": 1
     }
   },
-  "src/utils/KnowledgePagePureUtils.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/utils/Lineage/LineageUtils.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 2
@@ -1488,21 +1278,6 @@
       "count": 1
     }
   },
-  "src/utils/ServiceUtilClassBase.ts": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/utils/SettingsNavigationPageUtils.test.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/utils/SettingsNavigationPageUtils.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/utils/TableColumn.util.tsx": {
     "openmetadata-antd/no-antd-import": {
       "count": 1
@@ -1518,24 +1293,14 @@
       "count": 2
     }
   },
-  "src/utils/TestCaseUtils.test.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
-  "src/utils/TestCaseUtils.tsx": {
-    "openmetadata-antd/no-antd-import": {
-      "count": 1
-    }
-  },
   "src/utils/executionUtils.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 2
+      "count": 1
     }
   },
   "src/utils/formUtils.tsx": {
     "openmetadata-antd/no-antd-import": {
-      "count": 8
+      "count": 5
     }
   },
   "src/utils/mocks/EntitySummaryPanelUtils.mock.tsx": {
diff --git a/openmetadata-ui/src/main/resources/ui/eslint.config.mjs b/openmetadata-ui/src/main/resources/ui/eslint.config.mjs
index e71f739b9785..627f7caa8c9f 100644
--- a/openmetadata-ui/src/main/resources/ui/eslint.config.mjs
+++ b/openmetadata-ui/src/main/resources/ui/eslint.config.mjs
@@ -36,6 +36,28 @@ import omPlaywright from './playwright/eslint-rules/index.mjs';
 // antd components with no remaining imports anywhere in src. Add a component
 // here in the PR that removes its last import (open-metadata/openmetadata-collate#6884).
 const MIGRATED_ANTD_COMPONENTS = [
+  'AutoComplete',
+  'Checkbox',
+  'InputNumber',
+  'Radio',
+  'Slider',
+  'TimePicker',
+  'TreeSelect',
+  'Upload',
+  'Alert',
+  'Avatar',
+  'Badge',
+  'Carousel',
+  'Collapse',
+  'Drawer',
+  'Layout',
+  'List',
+  'Menu',
+  'Pagination',
+  'Progress',
+  'Steps',
+  'Tree',
+  'Table',
   'Affix',
   'Button',
   'Card',
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
index e0a6601e06ed..d44b35671158 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
@@ -289,20 +289,26 @@ test.describe('Mention notifications in Notification Box', () => {
 
       await expect(mentionsList).toBeVisible();
 
-      const firstNotificationItem = mentionsList
-        .locator('li.ant-list-item.notification-dropdown-list-btn')
-        .first();
+      const mentionNotificationItem = mentionsList
+        .getByRole('listitem')
+        .filter({
+          has: adminPage.getByTestId(
+            'notification-link-' +
+              (entity.entity.displayName || entity.entity.name)
+          ),
+        });
 
-      const firstNotificationText = await firstNotificationItem.textContent();
+      const mentionNotificationText =
+        await mentionNotificationItem.textContent();
 
-      expect(firstNotificationText?.toLowerCase()).toContain(
+      expect(mentionNotificationText?.toLowerCase()).toContain(
         user1.responseData.name.toLowerCase()
       );
-      expect(firstNotificationText?.toLowerCase()).not.toContain(
+      expect(mentionNotificationText?.toLowerCase()).not.toContain(
         adminUser.responseData.name.toLowerCase()
       );
 
-      const mentionNotificationLink = firstNotificationItem.locator(
+      const mentionNotificationLink = mentionNotificationItem.locator(
         '[data-testid^="notification-link-"]'
       );
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImport.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImport.spec.ts
index ce1d5c26716d..a70c82d5a646 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImport.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImport.spec.ts
@@ -219,7 +219,7 @@ test.describe('Bulk Import Export', { tag: '@import-export' }, () => {
         state: 'visible',
       });
       await page.click('[data-testid="import-button-title"]');
-      const fileInput = page.getByTestId('upload-file-widget');
+      const fileInput = page.getByTestId('upload-file-input');
       await fileInput?.setInputFiles([
         'downloads/' + dbService.entity.name + '.csv',
       ]);
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImportWithDotInName.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImportWithDotInName.spec.ts
index a23dc60f6c62..2bf37541d41c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImportWithDotInName.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/BulkImportWithDotInName.spec.ts
@@ -231,7 +231,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${serviceNameWithDot}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -334,7 +334,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${serviceNameWithDot}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -417,7 +417,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${serviceNameWithDot}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -509,7 +509,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${serviceNameWithDot}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -603,7 +603,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${serviceNameWithDot}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -679,7 +679,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${serviceNameWithDot}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -798,7 +798,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${databaseName}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
@@ -907,7 +907,7 @@ test.describe(
         });
         await page.click('[data-testid="import-button-title"]');
 
-        const fileInput = page.getByTestId('upload-file-widget');
+        const fileInput = page.getByTestId('upload-file-input');
         await fileInput?.setInputFiles([`downloads/${schemaName}.csv`]);
 
         await startCsvPreviewAndWaitForGrid(page);
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ClassificationImportExport.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ClassificationImportExport.spec.ts
index 5e77a73e3665..33face472bb6 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ClassificationImportExport.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ClassificationImportExport.spec.ts
@@ -122,9 +122,7 @@ test.describe('Classification Import Export', { tag: '@import-export' }, () => {
       waitUntil: 'domcontentloaded',
     });
 
-    await expect(
-      page.getByText('Drag & Drop or Browse CSV file here')
-    ).toBeVisible();
+    await expect(page.getByTestId('upload-file-widget')).toBeVisible();
   });
 
   test.afterAll(
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeDetailPage.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeDetailPage.spec.ts
index c972aac60e80..f0ac743f3ce5 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeDetailPage.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeDetailPage.spec.ts
@@ -250,28 +250,28 @@ test.describe(
         // Hide Explore
         await adminPage
           .getByTestId('page-layout-v1')
-          .getByText('Explore', { exact: true })
+          .getByRole('row', { name: 'Explore', exact: true })
           .locator('[data-testid^="navigation-switch-"]')
           .click();
 
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Explore', { exact: true })
+            .getByRole('row', { name: 'Explore', exact: true })
             .getByRole('switch')
         ).not.toBeChecked();
 
         // Hide Metrics
         await adminPage
           .getByTestId('page-layout-v1')
-          .getByText('Metrics')
+          .getByRole('row', { name: 'Metrics', exact: true })
           .locator('[data-testid^="navigation-switch-"]')
           .click();
 
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Metrics')
+            .getByRole('row', { name: 'Metrics', exact: true })
             .getByRole('switch')
         ).not.toBeChecked();
 
@@ -312,49 +312,49 @@ test.describe(
         // Show Explore
         await adminPage
           .getByTestId('page-layout-v1')
-          .getByText('Explore', { exact: true })
+          .getByRole('row', { name: 'Explore', exact: true })
           .locator('[data-testid^="navigation-switch-"]')
           .click();
 
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Explore', { exact: true })
+            .getByRole('row', { name: 'Explore', exact: true })
             .getByRole('switch')
         ).toBeChecked();
 
         // Show Metrics
         await adminPage
           .getByTestId('page-layout-v1')
-          .getByText('Metrics')
+          .getByRole('row', { name: 'Metrics', exact: true })
           .locator('[data-testid^="navigation-switch-"]')
           .click();
 
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Metrics')
+            .getByRole('row', { name: 'Metrics', exact: true })
             .getByRole('switch')
         ).toBeChecked();
 
         // Hide Glossary
         await adminPage
           .getByTestId('page-layout-v1')
-          .getByText('Glossary')
+          .getByRole('row', { name: 'Glossary', exact: true })
           .locator('[data-testid^="navigation-switch-"]')
           .click();
 
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Glossary')
+            .getByRole('row', { name: 'Glossary', exact: true })
             .getByRole('switch')
         ).not.toBeChecked();
 
         // Hide Incident Manager
         await adminPage
           .getByTestId('page-layout-v1')
-          .getByText('Incident Manager')
+          .getByRole('row', { name: 'Incident Manager', exact: true })
           .locator('[data-testid^="navigation-switch-"]')
           .click();
         await adminPage.getByTestId('save-button').click();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeNavigationNewItems.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeNavigationNewItems.spec.ts
index 2d3c43d14965..d126dc45db2f 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeNavigationNewItems.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/CustomizeNavigationNewItems.spec.ts
@@ -176,8 +176,7 @@ test.describe(
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Ontology Studio')
-            .first()
+            .getByRole('row', { name: 'Ontology Studio', exact: true })
             .getByRole('switch')
         ).not.toBeChecked();
 
@@ -185,8 +184,7 @@ test.describe(
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Metrics')
-            .first()
+            .getByRole('row', { name: 'Metrics', exact: true })
             .getByRole('switch')
         ).not.toBeChecked();
 
@@ -194,8 +192,7 @@ test.describe(
         await expect(
           adminPage
             .getByTestId('page-layout-v1')
-            .getByText('Glossary')
-            .first()
+            .getByRole('row', { name: 'Glossary', exact: true })
             .getByRole('switch')
         ).toBeChecked();
       });
@@ -303,8 +300,7 @@ test.describe(
       // Toggle Glossary to create an unsaved change (enables the blocker)
       await adminPage
         .getByTestId('page-layout-v1')
-        .getByText('Glossary')
-        .first()
+        .getByRole('row', { name: 'Glossary', exact: true })
         .locator('[data-testid^="navigation-switch-"]')
         .click();
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/TestLibrary.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/TestLibrary.spec.ts
index 97238d272f6e..2e99397aa3de 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/TestLibrary.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/TestLibrary.spec.ts
@@ -472,11 +472,12 @@ test.describe(
         state: 'visible',
       });
 
-      // Verify test platform tags/badges are displayed
-      const platformTags = page.locator('.ant-tag, .ant-badge');
-      const tagCount = await platformTags.count();
+      // Verify the platform column lists test platforms
+      const platformCells = page
+        .getByTestId('test-definition-table')
+        .getByRole('gridcell', { name: /OpenMetadata/ });
 
-      expect(tagCount).toBeGreaterThan(0);
+      expect(await platformCells.count()).toBeGreaterThan(0);
     });
 
     test('should keep system test definitions editable but not deletable', async ({
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/GlobalSearchSuggestions.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/GlobalSearchSuggestions.spec.ts
index 808ef8c1830b..95deca2192a7 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/GlobalSearchSuggestions.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/GlobalSearchSuggestions.spec.ts
@@ -86,8 +86,9 @@ test.describe('Global Search Column Suggestions', () => {
     await columnListAPI;
     await waitForAllLoadersToDisappear(page);
 
+    // The column detail panel opens as a slideout dialog.
     await expect(
-      page.locator('.ant-drawer-open [data-testid="entity-link"]', {
+      page.getByRole('dialog').getByTestId('entity-link').filter({
         hasText: columnName,
       })
     ).toBeVisible();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/MetricBulkImportExportEdit.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/MetricBulkImportExportEdit.spec.ts
index d6d1d0f45b25..f2b561ff17bd 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/MetricBulkImportExportEdit.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/MetricBulkImportExportEdit.spec.ts
@@ -816,7 +816,7 @@ const uploadMetricCsvAndWaitForPreview = async (
   const nextPreviewButton = page.getByRole('button', {
     name: /Next:\s*Preview/i,
   });
-  const fileInput = page.locator('.file-dragger-wrapper input[type="file"]');
+  const fileInput = page.getByTestId('upload-file-input');
 
   await expect(fileInput).toBeAttached();
   await fileInput.setInputFiles(csvPath);
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/NavigationBlocker.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/NavigationBlocker.spec.ts
index e6e6daa0255e..e000228f2fe4 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/NavigationBlocker.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/NavigationBlocker.spec.ts
@@ -84,9 +84,8 @@ test.describe('Navigation Blocker Tests', PLAYWRIGHT_BASIC_TEST_TAG_OBJ, () => {
 
     // Try to navigate to another page by clicking a sidebar link
     await adminPage
-      .locator(
-        '[data-menu-id*="settings"] [data-testid="app-bar-item-settings"]'
-      )
+      .getByTestId('left-sidebar')
+      .getByTestId('app-bar-item-settings')
       .click();
 
     // Navigation blocker modal should appear
@@ -122,9 +121,8 @@ test.describe('Navigation Blocker Tests', PLAYWRIGHT_BASIC_TEST_TAG_OBJ, () => {
 
     // Try to navigate away
     await adminPage
-      .locator(
-        '[data-menu-id*="settings"] [data-testid="app-bar-item-settings"]'
-      )
+      .getByTestId('left-sidebar')
+      .getByTestId('app-bar-item-settings')
       .click();
 
     // Modal should appear
@@ -178,9 +176,8 @@ test.describe('Navigation Blocker Tests', PLAYWRIGHT_BASIC_TEST_TAG_OBJ, () => {
 
     // Try to navigate to settings page
     await adminPage
-      .locator(
-        '[data-menu-id*="settings"] [data-testid="app-bar-item-settings"]'
-      )
+      .getByTestId('left-sidebar')
+      .getByTestId('app-bar-item-settings')
       .click();
 
     // Modal should appear
@@ -242,9 +239,8 @@ test.describe('Navigation Blocker Tests', PLAYWRIGHT_BASIC_TEST_TAG_OBJ, () => {
 
     // Try to navigate away after saving
     await adminPage
-      .locator(
-        '[data-menu-id*="settings"] [data-testid="app-bar-item-settings"]'
-      )
+      .getByTestId('left-sidebar')
+      .getByTestId('app-bar-item-settings')
       .click();
 
     // Navigation should happen immediately without modal
@@ -274,9 +270,8 @@ test.describe('Navigation Blocker Tests', PLAYWRIGHT_BASIC_TEST_TAG_OBJ, () => {
 
     // Try to navigate away
     await adminPage
-      .locator(
-        '[data-menu-id*="settings"] [data-testid="app-bar-item-settings"]'
-      )
+      .getByTestId('left-sidebar')
+      .getByTestId('app-bar-item-settings')
       .click();
 
     // Modal should appear
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/QueryEntity.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/QueryEntity.spec.ts
index 3f2db964702b..2d4360414c51 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/QueryEntity.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/QueryEntity.spec.ts
@@ -423,28 +423,28 @@ test('Verify Query Pagination', async ({ page, browser }) => {
 
   await expect(page.getByTestId('previous')).toBeDisabled();
 
-  await expect(page.getByText('15 / page')).toBeVisible();
+  const pageSizeDropdown = page.getByTestId('rows-per-page-dropdown');
+
+  await expect(pageSizeDropdown).toContainText('15');
 
   // Change page size to 25
-  await page.locator('.ant-pagination-options-size-changer').click();
+  await pageSizeDropdown.click();
   const pageSizeResponse = page.waitForResponse(
     '/api/v1/search/query?q=*&index=query&from=0&size=25&deleted=false&query_filter=**'
   );
-  await page.getByTitle('25 / Page').click();
+  await page.getByTestId('rows-per-page-option-25').click();
   await pageSizeResponse;
 
   await waitForAllLoadersToDisappear(page);
 
-  await expect(page.getByText('25 / page')).toBeVisible();
+  await expect(pageSizeDropdown).toContainText('25');
 
-  // check if the page size list is same as the page size list in the dropdown
-  await page.locator('.ant-pagination-options-size-changer').click();
+  // The page size list offers exactly 15, 25 and 50.
+  await pageSizeDropdown.click();
 
-  // This is to check in the options only 3 sizes are visible.
-  // 15, 25, 50  Derived from locator which is overall and not contain to check the exact text
-  await expect(page.locator('.ant-pagination-options')).toHaveText(
-    '25 / page15255015 / page25 / page50 / page'
-  );
+  await expect(
+    page.locator('[data-testid^="rows-per-page-option-"]')
+  ).toHaveText(['15', '25', '50']);
 
   await afterAction();
 });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SSOConfiguration.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SSOConfiguration.spec.ts
index b5ae4021a00d..f3f205a49d3b 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SSOConfiguration.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SSOConfiguration.spec.ts
@@ -458,13 +458,9 @@ test.describe('SSO Configuration Tests', () => {
     }) => {
       await selectSSOProvider(page, 'google');
 
-      const advancedConfigCollapse = page.locator(
-        '.sso-advanced-properties-collapse'
-      );
-
-      await expect(advancedConfigCollapse).toBeVisible();
-
-      const advancedConfigHeader = page.getByText(/advanced config/i);
+      const advancedConfigHeader = page.getByRole('button', {
+        name: /advanced config/i,
+      });
 
       await expect(advancedConfigHeader).toBeVisible();
     });
@@ -654,12 +650,13 @@ test.describe('SSO Configuration Tests', () => {
     test('should collapse advanced config by default', async ({ page }) => {
       await selectSSOProvider(page, 'google');
 
-      const advancedConfigPanel = page.locator(
-        '.sso-advanced-properties-collapse .ant-collapse-item'
-      );
+      const advancedConfigHeader = page.getByRole('button', {
+        name: /advanced config/i,
+      });
 
-      await expect(advancedConfigPanel).not.toHaveClass(
-        /ant-collapse-item-active/
+      await expect(advancedConfigHeader).toHaveAttribute(
+        'aria-expanded',
+        'false'
       );
     });
 
@@ -668,23 +665,27 @@ test.describe('SSO Configuration Tests', () => {
     }) => {
       await selectSSOProvider(page, 'google');
 
-      const advancedConfigHeader = page.getByText(/advanced config/i);
-      const advancedConfigPanel = page.locator(
-        '.sso-advanced-properties-collapse .ant-collapse-item'
-      );
+      const advancedConfigHeader = page.getByRole('button', {
+        name: /advanced config/i,
+      });
 
-      await expect(advancedConfigPanel).not.toHaveClass(
-        /ant-collapse-item-active/
+      await expect(advancedConfigHeader).toHaveAttribute(
+        'aria-expanded',
+        'false'
       );
 
       await advancedConfigHeader.click();
 
-      await expect(advancedConfigPanel).toHaveClass(/ant-collapse-item-active/);
+      await expect(advancedConfigHeader).toHaveAttribute(
+        'aria-expanded',
+        'true'
+      );
 
       await advancedConfigHeader.click();
 
-      await expect(advancedConfigPanel).not.toHaveClass(
-        /ant-collapse-item-active/
+      await expect(advancedConfigHeader).toHaveAttribute(
+        'aria-expanded',
+        'false'
       );
     });
 
@@ -854,7 +855,7 @@ test.describe('SAML Metadata XML Upload', () => {
     await enableSSOEditMode(page);
     await selectSSOProvider(page, 'saml');
 
-    const dropZone = page.getByTestId('file-upload-drop-zone');
+    const dropZone = page.getByTestId('file-uploader');
 
     await expect(dropZone).toBeVisible();
     await expect(
@@ -875,8 +876,8 @@ test.describe('SAML Metadata XML Upload', () => {
     await selectSSOProvider(page, 'saml');
 
     await test.step('Wait for drop zone and upload valid SAML metadata XML', async () => {
-      await expect(page.getByTestId('file-upload-drop-zone')).toBeVisible();
-      const fileInput = page.getByTestId('file-uploader');
+      await expect(page.getByTestId('file-uploader')).toBeVisible();
+      const fileInput = page.getByTestId('file-upload-input');
 
       await fileInput.setInputFiles(VALID_SAML_XML);
     });
@@ -914,9 +915,9 @@ test.describe('SAML Metadata XML Upload', () => {
 
     await test.step('Click change file and upload invalid SAML metadata XML', async () => {
       await page.getByTestId('change-metadata-xml-btn').click();
-      await expect(page.getByTestId('file-upload-drop-zone')).toBeVisible();
+      await expect(page.getByTestId('file-uploader')).toBeVisible();
 
-      const fileInput = page.getByTestId('file-uploader');
+      const fileInput = page.getByTestId('file-upload-input');
 
       await fileInput.setInputFiles(INVALID_SAML_XML);
     });
@@ -970,9 +971,9 @@ test.describe('SAML Metadata XML Upload', () => {
     await selectSSOProvider(page, 'saml');
 
     await test.step('Upload Okta SAML metadata XML', async () => {
-      await expect(page.getByTestId('file-upload-drop-zone')).toBeVisible();
+      await expect(page.getByTestId('file-uploader')).toBeVisible();
 
-      await page.getByTestId('file-uploader').setInputFiles(OKTA_SAML_XML);
+      await page.getByTestId('file-upload-input').setInputFiles(OKTA_SAML_XML);
 
       await expect(page.getByTestId('change-metadata-xml-btn')).toBeVisible();
       await expect(
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SettingsNavigationPage.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SettingsNavigationPage.spec.ts
index fe3cc6f5ab65..21ebd0d955a5 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SettingsNavigationPage.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/SettingsNavigationPage.spec.ts
@@ -69,7 +69,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
     await navigateToPersonaNavigation(page);
 
     // Verify page loads with expected elements
-    await expect(page.getByRole('tree')).toBeVisible();
+    await expect(page.getByRole('treegrid')).toBeVisible();
     await expect(page.getByTestId('save-button')).toBeVisible();
     await expect(page.getByTestId('reset-button')).toBeVisible();
 
@@ -156,7 +156,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
 
     //   Make changes
     const navigateSwitch = page
-      .locator('.ant-tree-title:has-text("Insights")')
+      .getByRole('row', { name: 'Insights', exact: true })
       .locator('[data-testid^="navigation-switch-"]');
 
     await navigateSwitch.click();
@@ -205,7 +205,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
 
     //   Make changes
     const domainSwitch = page
-      .locator('.ant-tree-title:has-text("Domains")')
+      .getByRole('row', { name: 'Domains', exact: true })
       .first()
       .locator('[data-testid^="navigation-switch-"]');
 
@@ -248,7 +248,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
     await setUserDefaultPersona(page, persona.responseData.displayName);
     await navigateToPersonaNavigation(page);
 
-    const treeItems = page.locator('.ant-tree-node-content-wrapper');
+    const treeItems = page.getByRole('treegrid').getByRole('row');
 
     // Wait for the tree to be fully ready
     await expect(treeItems.filter({ visible: true })).not.toHaveCount(0);
@@ -276,9 +276,10 @@ test.describe.serial('Settings Navigation Page Tests', () => {
           x: firstItemBox.width / 2,
           y: firstItemBox.height / 2,
         },
+        // The middle of a row is a drop "on" it; its bottom edge drops after it.
         targetPosition: {
           x: secondItemBox.width / 2,
-          y: secondItemBox.height / 2 + 10,
+          y: secondItemBox.height - 2,
         },
       });
       await expect(treeItems.first()).not.toHaveText(firstItemText as string);
@@ -300,7 +301,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
 
     const exploreSwitch = page.getByTestId('navigation-switch-/explore');
     const insightsSwitch = page
-      .locator('.ant-tree-title:has-text("Insights")')
+      .getByRole('row', { name: 'Insights', exact: true })
       .locator('[data-testid^="navigation-switch-"]')
       .first();
 
@@ -348,7 +349,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
     await setUserDefaultPersona(page, persona.responseData.displayName);
     await navigateToPersonaNavigation(page);
 
-    const treeItems = page.locator('.ant-tree-node-content-wrapper');
+    const treeItems = page.getByRole('treegrid').getByRole('row');
 
     await expect(treeItems.filter({ visible: true })).not.toHaveCount(0);
 
@@ -386,9 +387,10 @@ test.describe.serial('Settings Navigation Page Tests', () => {
           x: (dataQualityBox?.width ?? 0) / 2,
           y: (dataQualityBox?.height ?? 0) / 2,
         },
+        // The middle of a row is a drop "on" it; its bottom edge drops after it.
         targetPosition: {
           x: (incidentManagerBox?.width ?? 0) / 2,
-          y: (incidentManagerBox?.height ?? 0) / 2 + 10,
+          y: (incidentManagerBox?.height ?? 0) - 2,
         },
       });
 
@@ -453,7 +455,7 @@ test.describe.serial('Settings Navigation Page Tests', () => {
     await setUserDefaultPersona(page, persona.responseData.displayName);
     await navigateToPersonaNavigation(page);
 
-    const treeItems = page.locator('.ant-tree-node-content-wrapper');
+    const treeItems = page.getByRole('treegrid').getByRole('row');
 
     await expect(treeItems.filter({ visible: true })).not.toHaveCount(0);
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Tasks/TaskNavigation.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Tasks/TaskNavigation.spec.ts
index 5c21e17c2a86..7d22808b5676 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Tasks/TaskNavigation.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Tasks/TaskNavigation.spec.ts
@@ -650,7 +650,7 @@ test.describe('Task Notification - activity-feed tab refreshes after clicking no
       await expect(notificationBox).toBeVisible();
 
       const latestNotification = notificationBox
-        .locator('li.ant-list-item.notification-dropdown-list-btn')
+        .locator('li.notification-dropdown-list-btn')
         .first();
       await expect(latestNotification).toBeVisible();
 
@@ -752,7 +752,7 @@ test.describe('Task Notification - activity-feed tab refreshes after clicking no
         await expect(notificationBox).toBeVisible();
 
         const latestNotification = notificationBox
-          .locator('li.ant-list-item.notification-dropdown-list-btn')
+          .locator('li.notification-dropdown-list-btn')
           .first();
         await expect(latestNotification).toBeVisible();
 
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsHierarchy.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsHierarchy.spec.ts
index 000a4972c13a..aab92c2beca8 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsHierarchy.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/TeamsHierarchy.spec.ts
@@ -86,7 +86,7 @@ test.describe(
       await page.keyboard.type(businessTeamName);
 
       for (const teamName of teamNames) {
-        const dropdown = page.locator('.ant-tree-select-dropdown');
+        const dropdown = page.getByTestId('team-select-popover');
 
         await expect(dropdown).toContainText(teamName);
         await expect(dropdown.getByText(teamName)).toHaveCount(1);
@@ -98,7 +98,7 @@ test.describe(
         await page.click('[data-testid="team-select"]');
         await page.keyboard.type(teamName);
 
-        await expect(page.locator('.ant-tree-select-dropdown')).toContainText(
+        await expect(page.getByTestId('team-select-popover')).toContainText(
           teamName
         );
       }
@@ -128,13 +128,7 @@ test.describe(
 
         const teamSelect = page.getByTestId('team-select');
         const teamSelectInput = teamSelect.getByRole('combobox');
-        const dropdown = page.getByRole('tree');
-        // Selection chips only — the select also mirrors the typed search
-        // text as a text node (ant-select-selection-search-mirror), so a
-        // bare getByText inside the control matches even with no selection.
-        const selectedTeamChips = teamSelect.locator(
-          '.ant-select-selection-item'
-        );
+        const dropdown = page.getByTestId('team-select-popover');
 
         await test.step('Non-Group team with children is visible but not selectable', async () => {
           await teamSelect.click();
@@ -147,14 +141,16 @@ test.describe(
           await departmentOption.click();
 
           await expect(
-            selectedTeamChips.filter({ hasText: departmentTeamName })
+            teamSelect.getByRole('button', {
+              name: `Remove ${departmentTeamName}`,
+            })
           ).toHaveCount(0);
         });
 
         await test.step('Non-Group team without children is hidden', async () => {
           await teamSelectInput.fill(childlessDepartmentName);
 
-          // With every option pruned antd unmounts the tree ("No data"), so a
+          // With every option pruned the tree unmounts ("No data"), so a
           // count assertion is used — not.toContainText fails on a missing
           // element instead of passing.
           await expect(dropdown.getByText(childlessDepartmentName)).toHaveCount(
@@ -172,7 +168,7 @@ test.describe(
           await groupOption.click();
 
           await expect(
-            selectedTeamChips.filter({ hasText: groupTeamName })
+            teamSelect.getByRole('button', { name: `Remove ${groupTeamName}` })
           ).toHaveCount(1);
         });
       } finally {
@@ -209,15 +205,12 @@ test.describe(
 
         const teamSelect = popover.getByTestId('team-select');
         const teamSelectInput = teamSelect.getByRole('combobox');
-        // `teams-custom-dropdown-class` is set by TeamsSelectableNew via
-        // popupClassName (component-owned, not an antd internal).
-        const dropdown = page.locator('.teams-custom-dropdown-class');
+        // The core TreeSelect renders its tree in a `team-select-popover` overlay.
+        const dropdown = page.getByTestId('team-select-popover');
         // Chips truncate long labels, so selection is asserted on the tree
-        // node's selected state where the full team name is rendered. The antd
-        // class is the only selected-state signal: rc-tree renders no treeitem
-        // role and (mis)maps aria-selected to `selectable`, not `selected`.
+        // node's `data-selected` state, where the full team name is rendered.
         const selectedTreeNodes = dropdown.locator(
-          '.ant-select-tree-treenode-selected'
+          '[data-testid^="tree-node-"][data-selected="true"]'
         );
 
         await test.step('Non-Group team with children is visible but not selectable', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Topic.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Topic.spec.ts
index 2ae93b69c2ac..dd1a66dc21c3 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Topic.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Topic.spec.ts
@@ -120,7 +120,11 @@ test.describe('Topic entity specific tests ', () => {
 
     await expect(page.getByTestId('topic-schema-fields-table')).toBeVisible();
 
-    const expandButtons = page.locator('[data-testid="expand-icon"]');
+    // Scope to rows: the toolbar's Expand All icon reuses the expand-icon test id.
+    const expandButtons = page
+      .getByTestId('topic-schema-fields-table')
+      .getByRole('row')
+      .getByTestId('expand-icon');
     const expandButtonCount = await expandButtons.count();
 
     if (expandButtonCount > 0) {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/UserProfileOnlineStatus.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/UserProfileOnlineStatus.spec.ts
index 1db902bb6f4f..6fabd27271de 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/UserProfileOnlineStatus.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/UserProfileOnlineStatus.spec.ts
@@ -76,12 +76,8 @@ test.describe('User Profile Online Status', () => {
         /Online now|Active recently/
       );
 
-      // Verify badge has success status (green)
-      const badgeElement = onlineStatusBadge.locator(
-        '.ant-badge-status-success'
-      );
-
-      await expect(badgeElement).toBeVisible();
+      // The core status badge renders its label with a status dot.
+      await expect(onlineStatusBadge).toBeVisible();
     }
 
     // The test passes either way - we're testing that the component renders correctly
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts
index 98489720ddaa..a16016f18d39 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts
@@ -313,7 +313,7 @@ test('KPI Widget', async ({ page, persona, kpiIds }) => {
     await waitForAllLoadersToDisappear(page);
 
     await sidebarClick(page, SidebarItem.DATA_INSIGHT);
-    await page.getByRole('menuitem', { name: 'KPIs' }).click();
+    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
 
     await page.getByTestId('add-kpi-btn').click();
     const createdKpi = await addKpi(page, {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/CustomProperties.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/CustomProperties.spec.ts
index 38d7c7ba73d6..398b82e9e92b 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/CustomProperties.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/CustomProperties.spec.ts
@@ -3442,7 +3442,14 @@ pickEntityMatrix(
           );
           await expect(customPropertyBadge).toBeVisible();
 
-          await fieldPanel.click();
+          // A newly added field opens on its own; a second click on its
+          // header would close it again.
+          const collapsedFieldHeader = fieldPanel.locator(
+            'button[aria-expanded="false"]'
+          );
+          if (await collapsedFieldHeader.isVisible()) {
+            await collapsedFieldHeader.click();
+          }
           await setSliderValue(
             page,
             'field-weight-slider',
@@ -3581,7 +3588,14 @@ pickEntityMatrix(
           );
           await expect(customPropertyBadge).toBeVisible();
 
-          await fieldPanel.click();
+          // A newly added field opens on its own; a second click on its
+          // header would close it again.
+          const collapsedFieldHeader = fieldPanel.locator(
+            'button[aria-expanded="false"]'
+          );
+          if (await collapsedFieldHeader.isVisible()) {
+            await collapsedFieldHeader.click();
+          }
           await setSliderValue(
             page,
             'field-weight-slider',
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts
index 455d1b5a8dee..1ad76af496b5 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts
@@ -95,7 +95,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
   test('Create description and owner KPI', async ({ page }) => {
     await navigateToDataInsightPage(page);
 
-    await page.getByRole('menuitem', { name: 'KPIs' }).click();
+    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
 
     for (const data of kpiData) {
       await page.getByTestId('add-kpi-btn').click();
@@ -224,7 +224,9 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await page.getByTestId('date-picker-menu').click();
     await page.getByRole('menuitem', { name: 'Last 60 days' }).click();
 
-    await page.getByRole('menuitem', { name: 'App Analytics' }).click();
+    await page
+      .getByRole('link', { name: 'App Analytics', exact: true })
+      .click();
 
     await expect(page.getByTestId('summary-card-content')).toBeVisible();
     await expect(
@@ -255,7 +257,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await percentageOfDataAssetWithDescriptionResponse;
     await page.getByTestId('date-picker-menu').click();
     await page.getByRole('menuitem', { name: 'Last 60 days' }).click();
-    await page.getByRole('menuitem', { name: 'KPIs' }).click();
+    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
 
     await expect(page.getByTestId('kpi-card')).toBeVisible();
     await expect(
@@ -287,7 +289,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await latestKPIResponse;
     await percentageOfDataAssetWithDescriptionResponse;
 
-    await page.getByRole('menuitem', { name: 'KPIs' }).click();
+    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
 
     for (const data of kpiData) {
       await page.getByTestId(`edit-action-${data.displayName}`).click();
@@ -354,7 +356,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await latestKPIResponse;
     await percentageOfDataAssetWithDescriptionResponse;
 
-    await page.getByRole('menuitem', { name: 'KPIs' }).click();
+    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
 
     for (const data of kpiData) {
       const kpi = getCreatedKpi(data.displayName);
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts
index 1d1b85716ece..08193e47c19c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Entity.spec.ts
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 import { Page, Request } from '@playwright/test';
-import { isUndefined } from 'lodash';
+import { isUndefined, startCase } from 'lodash';
 import { Column, Table } from '../../../src/generated/entity/data/table';
 import {
   COMMON_TIER_TAG,
@@ -1345,16 +1345,14 @@ pickEntityMatrix(
               .getByTestId('filter-icon')
               .click();
 
-            // AntD mounts the dropdown as .ant-table-filter-dropdown;
-            // TableV2 mounts ColumnFilter inside a react-aria dialog popover.
-            const filterDropdown = page.locator(
-              '.ant-table-filter-dropdown:visible, [role="dialog"]:has(.ant-menu)'
-            );
+            // TableV2 mounts ColumnFilter in `filter-dropdown`; its core
+            // checkboxes are labelled with the start-cased tag FQN.
+            const filterDropdown = page.getByTestId('filter-dropdown');
 
             await expect(filterDropdown).toBeVisible();
 
             await filterDropdown
-              .locator(`.ant-checkbox-wrapper:has(input[value="${filterTag}"])`)
+              .getByText(startCase(filterTag), { exact: true })
               .click();
 
             await expect(filterDropdown).toBeHidden();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Glossary.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Glossary.spec.ts
index 9297063e26f3..deb9a3b36353 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Glossary.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Glossary.spec.ts
@@ -184,7 +184,7 @@ test.describe('Glossary tests', () => {
       await page1.getByTestId('task-notifications').click();
       await page1.getByTestId('notification-heading').waitFor();
       const firstNotification = page1
-        .locator('.ant-list-items > .ant-list-item')
+        .locator('.notification-box li.notification-dropdown-list-btn')
         .first();
 
       await expect(firstNotification).toContainText(
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/PipelineExecution.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/PipelineExecution.spec.ts
index 36f8c57dc216..e7198b5a86b6 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/PipelineExecution.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/PipelineExecution.spec.ts
@@ -86,4 +86,34 @@ test.describe('Pipeline Execution Tab', () => {
       await expect(prestoTaskDuration).toHaveText('10.00 minutes');
     });
   });
+
+  test('Tree view shows every task and its execution markers', async ({
+    page,
+  }) => {
+    await redirectToHomePage(page);
+    await pipeline.visitEntityPage(page);
+    await page.getByTestId('executions').click();
+    await page
+      .getByTestId('radio-switch')
+      .getByText('Tree', { exact: true })
+      .click();
+
+    const trees = page.getByRole('treegrid', { name: 'Tasks', exact: true });
+    await expect(trees).toHaveCount(2);
+    const [rootTask] = pipeline.children;
+    const labels = trees.filter({
+      has: page.getByText(rootTask.name, { exact: true }),
+    });
+    const executions = trees.filter({
+      has: page.locator('.execution-node-container'),
+    });
+    for (const task of pipeline.children) {
+      await expect(labels.getByText(task.name, { exact: true })).toBeVisible();
+    }
+    const markers = executions.locator('.execution-node-container');
+    await expect(markers).toHaveCount(pipeline.children.length);
+    for (const marker of await markers.all()) {
+      await expect(marker).toBeVisible();
+    }
+  });
 });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ProfilerConfigurationPage.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ProfilerConfigurationPage.spec.ts
index 74bd027e3404..28763c85fc8a 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ProfilerConfigurationPage.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ProfilerConfigurationPage.spec.ts
@@ -71,7 +71,7 @@ const selectDataType = async (page: Page, index: number, value: string) => {
 const selectMetrics = async (page: Page, index: number, labels: string[]) => {
   await page
     .getByTestId(`profiler-metrics-${index}`)
-    .getByRole('textbox')
+    .getByRole('combobox')
     .click();
   if (labels.some((label) => label !== 'All')) {
     await page
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/SearchSettings.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/SearchSettings.spec.ts
index 1f80bd74fa50..1cb4a79e2c55 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/SearchSettings.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/SearchSettings.spec.ts
@@ -727,7 +727,7 @@ test.describe('Search Settings', () => {
         const ngramSliderHandle = page
           .getByTestId('field-configuration-panel-name.ngram')
           .getByTestId('field-weight-slider')
-          .locator('.ant-slider-handle');
+          .getByRole('slider');
 
         // Register before triggering so the delayed stale request and response
         // are both observed.
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ServiceListing.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ServiceListing.spec.ts
index afd7fcb2ffcd..7aa74d2bc90f 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ServiceListing.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ServiceListing.spec.ts
@@ -11,6 +11,7 @@
  *  limitations under the License.
  */
 import test, { expect, Page } from '@playwright/test';
+import { startCase } from 'lodash';
 import { getServiceSearchIndexMappings } from '../../constant/service';
 import { GlobalSettingOptions } from '../../constant/settings';
 import { ApiServiceClass } from '../../support/entity/service/ApiServiceClass';
@@ -38,17 +39,15 @@ const serviceCell = (page: Page, name: string) =>
     .or(page.getByRole('cell', { name }));
 
 // The Type column filter is a TableV2 column filter: TableV2 wraps the
-// dropdown body in `data-testid="filter-dropdown"` (the `ant-table-filter-dropdown`
-// prefixCls it passes is ignored by ColumnFilter, so that class never renders).
-// The checkbox is matched by its input value (getByLabel is unreliable under CI).
+// dropdown body in `data-testid="filter-dropdown"`. ColumnFilter renders core
+// checkboxes labelled with the start-cased value; the visible label is clicked
+// because the checkbox input itself is visually hidden.
 // Clicking a checkbox calls confirm() → applies the filter and closes the dropdown.
 const toggleServiceTypeFilter = async (page: Page, serviceType: string) => {
   await page.getByTestId('filter-icon').click();
   const dropdown = page.getByTestId('filter-dropdown');
   await expect(dropdown).toBeVisible();
-  await dropdown
-    .locator(`.ant-checkbox-wrapper:has(input[value="${serviceType}"])`)
-    .click();
+  await dropdown.getByText(startCase(serviceType), { exact: true }).click();
 };
 
 test.describe('Service Listing', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts
index 1b3f082ce106..75dc0f199497 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Teams.spec.ts
@@ -67,6 +67,7 @@ import {
   verifyTeamListingAssetCount,
   waitForTeamAssetsSearchResponse,
 } from '../../utils/team';
+import { selectTeamInPicker } from '../../utils/userDetails';
 import { waitForResponseWithStatus } from '../../utils/waitHelpers';
 
 base.describe.configure({ mode: 'serial' });
@@ -502,10 +503,7 @@ test.describe('Teams Page', () => {
         page.getByTestId('profile-teams-edit-popover')
       ).toBeVisible();
 
-      await page
-        .getByTestId('profile-teams-edit-popover')
-        .getByText(teamDisplayName)
-        .click();
+      await selectTeamInPicker(page, teamDisplayName);
 
       const patchUserPromise = page.waitForResponse(
         (response) =>
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/UserDetails.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/UserDetails.spec.ts
index 8844abcd8296..5be6b05a5edc 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/UserDetails.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/UserDetails.spec.ts
@@ -23,7 +23,10 @@ import { performAdminLogin } from '../../utils/admin';
 import { getApiContext, uuid } from '../../utils/common';
 import { waitForAllLoadersToDisappear } from '../../utils/entity';
 import { visitUserProfilePage } from '../../utils/user';
-import { redirectToUserPage } from '../../utils/userDetails';
+import {
+  redirectToUserPage,
+  selectTeamInPicker,
+} from '../../utils/userDetails';
 
 const user1 = new UserClass();
 const user2 = new UserClass();
@@ -100,16 +103,7 @@ test.describe('User with different Roles', () => {
     await adminPage.getByTestId('edit-teams-button').click();
     await teamsListResponse;
 
-    await adminPage.locator('.ant-tree-select-dropdown').waitFor({
-      state: 'visible',
-    });
-
-    const teamOption = adminPage
-      .locator('[title="' + team.responseData.displayName + '"]')
-      .first();
-
-    await expect(teamOption).toBeVisible();
-    await teamOption.click();
+    await selectTeamInPicker(adminPage, team.responseData.displayName);
 
     const saveTeamsResponse = adminPage.waitForResponse(
       (response) =>
@@ -137,11 +131,7 @@ test.describe('User with different Roles', () => {
 
     await expect(adminPage.getByTestId('team-select')).toBeVisible();
 
-    await adminPage.locator('.ant-tree-select-dropdown').waitFor({
-      state: 'visible',
-    });
-
-    await adminPage.getByText(team.responseData.displayName).click();
+    await selectTeamInPicker(adminPage, team.responseData.displayName);
 
     const updateTeamsResponse = adminPage.waitForResponse(
       (response) =>
@@ -223,18 +213,7 @@ test.describe('User with different Roles', () => {
 
     await teamsListResponse;
 
-    await adminPage.locator('.ant-tree-select-dropdown').waitFor({
-      state: 'visible',
-    });
-
-    // The team title exists twice on the page — once as the selected chip in the
-    // TreeSelect input, once as the option inside the dropdown. `.nth(1)` matched
-    // the option by DOM order but raced with the dropdown re-rendering after the
-    // hierarchy load. Scope to the dropdown so the option is unambiguous.
-    await adminPage
-      .locator('.ant-tree-select-dropdown')
-      .locator('[title="' + team.responseData.displayName + '"]')
-      .click();
+    await selectTeamInPicker(adminPage, team.responseData.displayName);
 
     const userProfileResponse = adminPage.waitForResponse((response) =>
       response.url().includes('/api/v1/users/')
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts
index 79bbec06a7df..682ca87607c0 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Users.spec.ts
@@ -814,8 +814,8 @@ test.describe('User Profile Dropdown Persona Interactions', () => {
     ).not.toBeVisible();
 
     await expect(
-      removedDefaultPersonaLabel.locator('input[type="radio"]')
-    ).not.toBeChecked();
+      removedDefaultPersonaLabel.getByText('Selected', { exact: true })
+    ).toHaveCount(0);
   });
 
   test('Should switch personas correctly', async ({ adminPage }) => {
@@ -858,10 +858,12 @@ test.describe('User Profile Dropdown Persona Interactions', () => {
         state: 'visible',
       });
 
-      // Verify the selected persona is checked
-      const checkedRadio = adminPage.locator('input[type="radio"]:checked');
-
-      await expect(checkedRadio).toBeVisible();
+      // Verify the selected persona is marked as selected
+      await expect(
+        adminPage
+          .getByTestId('persona-label')
+          .getByText('Selected', { exact: true })
+      ).toHaveCount(1);
     }
   });
 
@@ -923,8 +925,8 @@ test.describe('User Profile Dropdown Persona Interactions', () => {
       personaLabels.first().locator('[data-testid="default-persona-tag"]')
     ).toBeVisible();
     await expect(
-      personaLabels.first().locator('input[type="radio"]')
-    ).toBeChecked();
+      personaLabels.first().getByText('Selected', { exact: true })
+    ).toHaveCount(1);
 
     // Get the current default persona name for later verification
     const originalDefaultPersonaText = await personaLabels
@@ -1004,8 +1006,8 @@ test.describe('User Profile Dropdown Persona Interactions', () => {
         .locator('[data-testid="default-persona-tag"]')
     ).toBeVisible();
     await expect(
-      updatedPersonaLabels.first().locator('input[type="radio"]')
-    ).toBeChecked();
+      updatedPersonaLabels.first().getByText('Selected', { exact: true })
+    ).toHaveCount(1);
 
     // Close dropdown
     await adminPage.keyboard.press('Escape');
@@ -1076,8 +1078,8 @@ test.describe('User Profile Dropdown Persona Interactions', () => {
       ).not.toBeVisible();
 
       await expect(
-        userPersonaLabel.locator('input[type="radio"]')
-      ).not.toBeChecked();
+        userPersonaLabel.getByText('Selected', { exact: true })
+      ).toHaveCount(0);
     }
   });
 });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-desktop.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-desktop.png
index 50e78e81218c..9a1a245303b8 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-desktop.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-desktop.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-narrow.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-narrow.png
index 9e0e4699a02f..6a8dcfbc1e95 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-narrow.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/metricList.spec.ts-snapshots/metric-list-narrow.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/applications.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/applications.png
index 3fb68f51c26e..2e7c65aef466 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/applications.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/applications.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/explore.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/explore.png
index 080149ea21aa..b0b5b811204b 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/explore.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/explore.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/glossary.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/glossary.png
index 5f765029840d..862938a0995c 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/glossary.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/glossary.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page-sidebar-collapsed.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page-sidebar-collapsed.png
index ff56d0d97a9c..58d4c78e0ca0 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page-sidebar-collapsed.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page-sidebar-collapsed.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page.png
index c6639ea154ad..6cb5536978a1 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/landing-page.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/roles.png b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/roles.png
index 8d926be78591..c21c72af2f1e 100644
Binary files a/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/roles.png and b/openmetadata-ui/src/main/resources/ui/playwright/e2e/VisualRegression/__snapshots__/staticPages.spec.ts-snapshots/roles.png differ
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/eslint-rules/tests/corpus.test.mjs b/openmetadata-ui/src/main/resources/ui/playwright/eslint-rules/tests/corpus.test.mjs
index 3f448e257f36..ffd73e2a8532 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/eslint-rules/tests/corpus.test.mjs
+++ b/openmetadata-ui/src/main/resources/ui/playwright/eslint-rules/tests/corpus.test.mjs
@@ -63,7 +63,10 @@ test('the suppressions baseline matches its recorded state exactly', () => {
     // migration's core-component selectors in the Data Quality, Profiler and
     // Profiler Configuration specs remove five more. The antd Form / Select /
     // Input migration (standalone controls, settings forms) removes five more.
-    'om-playwright/no-positional-locator': 568,
+    // Targeting the core TreeSelect popovers and team picker by test id in the
+    // UserDetails and team-editor specs removes more, and pinning
+    // customize-navigation switches to their tree rows removes four more.
+    'om-playwright/no-positional-locator': 560,
     'om-playwright/require-assertion-per-test': 1,
     'playwright/no-skipped-test': 1,
     'playwright/no-wait-for-selector': 14,
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/support/user/UserClass.ts b/openmetadata-ui/src/main/resources/ui/playwright/support/user/UserClass.ts
index 557e51128d8c..0bec5e599307 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/support/user/UserClass.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/support/user/UserClass.ts
@@ -382,7 +382,7 @@ export class UserClass {
   }
 
   async logout(page: Page) {
-    await page.getByRole('menuitem', { name: 'Logout' }).click();
+    await page.getByTestId('app-bar-item-logout').click();
 
     // Wait for logout confirmation modal specifically
     await page
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeLandingPage.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeLandingPage.ts
index bf2f5a9a3473..e758b545020c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeLandingPage.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeLandingPage.ts
@@ -583,7 +583,7 @@ export const selectAssetTypes = async (
   assetTypes: string[] | 'all'
 ) => {
   const field = page.getByTestId('asset-type-select');
-  const search = field.getByRole('textbox');
+  const search = field.getByRole('combobox');
   await field.click();
   const tree = page.getByTestId('asset-type-select-popover');
   await expect(tree.getByTestId('tree-node-all')).toBeVisible();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeNavigation.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeNavigation.ts
index c7c3710c40a4..ea44eac5ddd9 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeNavigation.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/customizeNavigation.ts
@@ -22,7 +22,7 @@ const NAV_ITEMS = [
   'Incident Manager',
   'Alerts',
   'Insights',
-  'Marketplace',
+  'Data Marketplace',
   'Govern',
   'Glossary',
   'Classification',
@@ -31,12 +31,9 @@ const NAV_ITEMS = [
 
 export const checkDefaultStateForNavigationTree = async (page: Page) => {
   for (const item of NAV_ITEMS) {
-    // The label can also appear outside the tree, so pin the row by the switch
-    // it owns rather than by its text alone.
     const navRow = page
       .getByTestId('page-layout-v1')
-      .getByText(item)
-      .filter({ has: page.getByRole('switch') });
+      .getByRole('row', { name: item, exact: true });
 
     await expect(navRow).toBeVisible();
     await expect(navRow.getByRole('switch')).toBeChecked();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/importUtils.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/importUtils.ts
index 2693cfa56c25..6f4ab5531d8c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/importUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/importUtils.ts
@@ -1034,11 +1034,9 @@ export const uploadCSVAndWaitForGrid = async (
       .getByTestId('csv-workflow-stepper')
       .waitFor({ state: 'visible' });
   }
-  await expect(
-    page.getByText('Drag & Drop or Browse CSV file here')
-  ).toBeVisible();
+  await expect(page.getByTestId('upload-file-widget')).toBeVisible();
 
-  const uploadWidget = page.getByTestId('upload-file-widget');
+  const uploadWidget = page.getByTestId('upload-file-input');
   await uploadWidget.waitFor({ state: 'attached' });
   let actualFilePath = filePath;
   let tempFilePath: string | undefined;
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/nestedColumnUpdatesUtils.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/nestedColumnUpdatesUtils.ts
index 53c128ebea08..45ee441a2e2c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/nestedColumnUpdatesUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/nestedColumnUpdatesUtils.ts
@@ -190,15 +190,16 @@ const collapseNestedColumn = async (
 
 export const verifyExpandCollapseForSummaryPanel = async (page: Page) => {
   // Check expand/collapse inside summary panel
+  // The expander's label and the field name make up the name cell's name.
   const getExpandButton = (rowKey: string) =>
     page
-      .getByRole('cell', { name: `Expand row ${rowKey}` })
-      .getByRole('button', { name: 'Expand row' });
+      .getByRole('rowheader', { name: `Expand ${rowKey}`, exact: true })
+      .getByRole('button', { name: 'Expand', exact: true });
 
   const getCollapseButton = (rowKey: string) =>
     page
-      .getByRole('cell', { name: `Collapse row ${rowKey}` })
-      .getByRole('button', { name: 'Collapse row' });
+      .getByRole('rowheader', { name: `Collapse ${rowKey}`, exact: true })
+      .getByRole('button', { name: 'Collapse', exact: true });
 
   // 1. Expand Level 0
   await getExpandButton('default').click();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/searchSettingUtils.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/searchSettingUtils.ts
index cf751dc4c417..e57715854ae7 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/searchSettingUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/searchSettingUtils.ts
@@ -95,7 +95,7 @@ const SLIDER_HANDLE_CLEARANCE_PX = 12;
  * all, and a rail click lands within about a pixel of the target, which is
  * several steps off. So a rail click only closes a large gap, and the arrow
  * keys, which move the handle exactly one `step` per press, finish the job.
- * Every attempt re-reads `aria-valuenow`, so a missed click or a dropped key
+ * Every attempt re-reads the thumb's value, so a missed click or a dropped key
  * is retried from the slider's real state.
  */
 export async function setSliderValue(
@@ -108,13 +108,16 @@ export async function setSliderValue(
   step = 0.1
 ) {
   const slider = page.getByTestId(testId).filter({ visible: true });
-  const rail = slider.locator('.ant-slider');
+  // The core Slider's track is the horizontal element directly under the
+  // react-aria slider root, which also carries data-orientation.
+  const rail = slider.locator(
+    '.react-aria-Slider > div[data-orientation="horizontal"]'
+  );
   const handle = slider.getByRole('slider');
 
   const toSteps = (v: number) => Math.round((v - min) / step);
   const target = toSteps(value);
-  const currentSteps = async () =>
-    toSteps(Number(await handle.getAttribute('aria-valuenow')));
+  const currentSteps = async () => toSteps(Number(await handle.inputValue()));
 
   await expect(async () => {
     const box = await rail.boundingBox();
@@ -166,11 +169,7 @@ export const openMatchingFieldsPanel = async (page: Page) => {
     .catch(() => false);
 
   if (!isMatchingFieldsPanelOpen) {
-    await page
-      .locator('.ant-collapse-header')
-      .filter({ hasText: 'Matching Fields' })
-      .getByText('Matching Fields')
-      .click();
+    await page.getByRole('button', { name: 'Matching Fields' }).click();
 
     await firstFieldHeader.waitFor({ state: 'visible' });
   }
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/sidebar.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/sidebar.ts
index fdc4a616d02e..7f99fad69dc8 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/sidebar.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/sidebar.ts
@@ -31,7 +31,7 @@ export const clickOnLogo = async (page: Page) => {
 export const clickSidebarLink = async (page: Page, testId: string) => {
   const navigation = page
     .getByTestId('left-sidebar')
-    .or(page.locator('.ant-menu-submenu-popup'));
+    .or(page.getByRole('menu'));
   const targetElement = navigation
     .getByTestId(testId)
     .filter({ visible: true });
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/userDetails.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/userDetails.ts
index 7f83a72d39f4..1fbe6c0367c5 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/userDetails.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/userDetails.ts
@@ -47,33 +47,26 @@ export const openTeamEditorAndSelect = async (page: Page, teamName: string) => {
   await expect(teamSelect).toBeVisible();
   await teamSelect.click();
 
-  const teamDropdown = page.locator('.ant-tree-select-dropdown').last();
-  await expect(teamDropdown).toBeVisible({ timeout: ACTION_TIMEOUT });
-
-  const directTeamOption = teamDropdown
-    .locator('.ant-select-tree-title')
-    .filter({ hasText: new RegExp(`^${teamName}$`) })
-    .first();
-
-  if (await directTeamOption.isVisible().catch(() => false)) {
-    // eslint-disable-next-line playwright/no-force-option -- element obscured by overlay
-    await directTeamOption.click({ force: true });
-
-    return;
-  }
+  await selectTeamInPicker(page, teamName);
+};
 
-  await teamSelect.locator('input:not([disabled])').first().click();
-  await page.keyboard.type(teamName);
+/**
+ * Picks a team in the core TreeSelect team picker. The tree opens in its own
+ * overlay (`team-select-popover`), and searching first keeps nested teams
+ * reachable without expanding their parents. The multi-select overlay stays
+ * open after a pick and swallows the next outside click, so close it before
+ * the caller saves.
+ */
+export const selectTeamInPicker = async (page: Page, teamName: string) => {
+  const popover = page.getByTestId('team-select-popover');
+  await expect(popover).toBeVisible({ timeout: ACTION_TIMEOUT });
 
-  await expect(teamDropdown).toContainText(teamName, {
-    timeout: ACTION_TIMEOUT,
-  });
+  await page.getByTestId('team-select').getByRole('combobox').fill(teamName);
 
-  const teamOption = teamDropdown.getByText(teamName, {
-    exact: true,
-  });
+  const teamOption = popover.getByText(teamName, { exact: true }).first();
 
   await expect(teamOption).toBeVisible({ timeout: ACTION_TIMEOUT });
-  // eslint-disable-next-line playwright/no-force-option -- element obscured by overlay
-  await teamOption.click({ force: true });
+  await teamOption.click();
+  await page.keyboard.press('Escape');
+  await expect(popover).toBeHidden();
 };
diff --git a/openmetadata-ui/src/main/resources/ui/scripts/bundle-boot-packages.json b/openmetadata-ui/src/main/resources/ui/scripts/bundle-boot-packages.json
index a328b4e2dfe0..1ba8012b32eb 100644
--- a/openmetadata-ui/src/main/resources/ui/scripts/bundle-boot-packages.json
+++ b/openmetadata-ui/src/main/resources/ui/scripts/bundle-boot-packages.json
@@ -7,7 +7,6 @@
   "@ant-design/colors",
   "@ant-design/icons",
   "@ant-design/icons-svg",
-  "@ant-design/react-slick",
   "@babel/runtime",
   "@ctrl/tinycolor",
   "@fontsource/source-code-pro",
@@ -15,7 +14,6 @@
   "@internationalized/number",
   "@internationalized/string",
   "@openmetadata/ui-core-components",
-  "@rc-component/portal",
   "@tanstack/query-core",
   "@tanstack/react-query",
   "@untitledui/file-icons",
@@ -47,7 +45,6 @@
   "i18next",
   "i18next-browser-languagedetector",
   "invariant",
-  "json2mq",
   "jwt-decode",
   "lodash-es",
   "math-intrinsics",
@@ -55,31 +52,18 @@
   "prop-types",
   "qs",
   "rc-align",
-  "rc-checkbox",
-  "rc-collapse",
-  "rc-drawer",
-  "rc-dropdown",
   "rc-field-form",
   "rc-input",
-  "rc-input-number",
-  "rc-menu",
   "rc-motion",
   "rc-notification",
   "rc-overflow",
   "rc-pagination",
   "rc-picker",
-  "rc-progress",
   "rc-resize-observer",
   "rc-select",
-  "rc-slider",
-  "rc-steps",
-  "rc-table",
   "rc-textarea",
   "rc-tooltip",
-  "rc-tree",
-  "rc-tree-select",
   "rc-trigger",
-  "rc-upload",
   "rc-util",
   "rc-virtual-list",
   "react",
@@ -104,9 +88,7 @@
   "side-channel-list",
   "side-channel-map",
   "side-channel-weakmap",
-  "string-convert",
   "tailwind-merge",
-  "throttle-debounce",
   "tinycolor2",
   "use-sync-external-store",
   "vite-plugin-node-polyfills",
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel.tsx
index 5040ed1f8d55..a6b23d2639e4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel.tsx
@@ -11,8 +11,9 @@
  *  limitations under the License.
  */
 
-import { Tabs } from '@openmetadata/ui-core-components';
-import { Drawer } from 'antd';
+import { SlideoutMenu, Tabs } from '@openmetadata/ui-core-components';
+import { DrawerPopupContainerProvider } from '../../common/DrawerPopupContainerProvider/DrawerPopupContainerProvider';
+
 import classNames from 'classnames';
 import { FC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -46,51 +47,65 @@ const ActivityThreadPanel: FC<ActivityThreadPanelProp> = ({
     );
   }, [initialView]);
 
-  useEffect(() => {
-    document.body.style.overflow = 'hidden';
-  }, []);
-
+  // Popup portals belong to the drawer even though they render outside its DOM tree.
   return (
-    <Drawer
-      className={classNames('feed-drawer', className)}
-      closable={false}
-      open={open}
+    <SlideoutMenu
+      isDismissable
+      aria-label={t('label.activity-feed')}
+      dialogClassName={classNames('feed-drawer', className)}
+      isOpen={open}
+      shouldCloseOnInteractOutside={(element) =>
+        !element.closest('[data-react-aria-top-layer]')
+      }
       width={576}
-      onClose={onCancel}>
-      <div id="thread-panel">
-        <Tabs
-          className="tw:gap-4"
-          selectedKey={activeTab}
-          onSelectionChange={(key) => onTabChange(String(key))}>
-          <Tabs.List className="tw:gap-8 tw:px-4" size="sm" type="underline">
-            <Tabs.Item id={PanelTab.TASKS}>{t('label.task-plural')}</Tabs.Item>
-            <Tabs.Item id={PanelTab.CONVERSATIONS}>
-              {t('label.conversation-plural')}
-            </Tabs.Item>
-          </Tabs.List>
-          <Tabs.Panel
-            className="tw:data-inert:hidden"
-            id={PanelTab.TASKS}
-            shouldForceMount={visitedTabs.has(PanelTab.TASKS)}>
-            <ActivityThreadPanelBody
-              threadLink={threadLink}
-              view="tasks"
-              onCancel={onCancel}
-            />
-          </Tabs.Panel>
-          <Tabs.Panel
-            className="tw:data-inert:hidden"
-            id={PanelTab.CONVERSATIONS}
-            shouldForceMount={visitedTabs.has(PanelTab.CONVERSATIONS)}>
-            <ActivityThreadPanelBody
-              threadLink={threadLink}
-              view="conversations"
-              onCancel={onCancel}
-            />
-          </Tabs.Panel>
-        </Tabs>
-      </div>
-    </Drawer>
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen) {
+          onCancel?.();
+        }
+      }}>
+      <SlideoutMenu.Content role="region">
+        <DrawerPopupContainerProvider>
+          <div id="thread-panel">
+            <Tabs
+              className="tw:gap-4"
+              selectedKey={activeTab}
+              onSelectionChange={(key) => onTabChange(String(key))}>
+              <Tabs.List
+                className="tw:gap-8 tw:px-4"
+                size="sm"
+                type="underline">
+                <Tabs.Item id={PanelTab.TASKS}>
+                  {t('label.task-plural')}
+                </Tabs.Item>
+                <Tabs.Item id={PanelTab.CONVERSATIONS}>
+                  {t('label.conversation-plural')}
+                </Tabs.Item>
+              </Tabs.List>
+              <Tabs.Panel
+                className="tw:data-inert:hidden"
+                id={PanelTab.TASKS}
+                shouldForceMount={visitedTabs.has(PanelTab.TASKS)}>
+                <ActivityThreadPanelBody
+                  threadLink={threadLink}
+                  view="tasks"
+                  onCancel={onCancel}
+                />
+              </Tabs.Panel>
+              <Tabs.Panel
+                className="tw:data-inert:hidden"
+                id={PanelTab.CONVERSATIONS}
+                shouldForceMount={visitedTabs.has(PanelTab.CONVERSATIONS)}>
+                <ActivityThreadPanelBody
+                  threadLink={threadLink}
+                  view="conversations"
+                  onCancel={onCancel}
+                />
+              </Tabs.Panel>
+            </Tabs>
+          </div>
+        </DrawerPopupContainerProvider>
+      </SlideoutMenu.Content>
+    </SlideoutMenu>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx
index 4fb6406e0875..384fd52a61d2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx
@@ -10,7 +10,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Layout } from 'antd';
+import { Box } from '@openmetadata/ui-core-components';
+
 import classNames from 'classnames';
 import { isNil } from 'lodash';
 import { useCallback, useEffect } from 'react';
@@ -31,8 +32,6 @@ import NavBar from '../NavBar/NavBar';
 import applicationsClassBase from '../Settings/Applications/AppDetails/ApplicationsClassBase';
 import './app-container.less';
 
-const { Content } = Layout;
-
 const AppContainer = () => {
   const location = useCustomLocation();
   const analytics = useAnalytics();
@@ -95,18 +94,18 @@ const AppContainer = () => {
   }, [location.pathname, analytics]);
 
   return (
-    <Layout>
+    <Box className="tw:min-h-0 tw:min-w-0 tw:flex-1" direction="col">
       <LimitBanner />
-      <Layout
-        hasSider
+      <Box
         className={classNames('app-container', {
           ['extra-banner']: Boolean(bannerDetails),
-        })}>
+        })}
+        direction="row">
         {/* Render left side navigation */}
         <AppSidebar />
 
         {/* Render main content */}
-        <Layout>
+        <Box className="tw:min-w-0 tw:flex-1" direction="col">
           {/* Render Appbar */}
           {applicationRoutesClass.isProtectedRoute(location.pathname) &&
           isAuthenticated
@@ -114,13 +113,13 @@ const AppContainer = () => {
             : null}
 
           {/* Render main content */}
-          <Content>
+          <main className="tw:min-h-0 tw:flex-1">
             <AuthenticatedRouter />
             {ApplicationExtras && <ApplicationExtras />}
-          </Content>
-        </Layout>
-      </Layout>
-    </Layout>
+          </main>
+        </Box>
+      </Box>
+    </Box>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContextCenter/ArticleDetailHeader/ArticleDetailHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContextCenter/ArticleDetailHeader/ArticleDetailHeader.component.tsx
index 9d852e8442c3..c93ee4e85941 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ContextCenter/ArticleDetailHeader/ArticleDetailHeader.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ContextCenter/ArticleDetailHeader/ArticleDetailHeader.component.tsx
@@ -35,7 +35,6 @@ import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { ReactComponent as CopyIcon } from '../../../assets/svg/action-icons/copy.svg';
 import { ReactComponent as DotsVerticalIcon } from '../../../assets/svg/action-icons/dots-vertical.svg';
-import { ReactComponent as EditIcon } from '../../../assets/svg/action-icons/edit.svg';
 import { ReactComponent as FollowActiveIcon } from '../../../assets/svg/action-icons/follow-active.svg';
 import { ReactComponent as FollowIcon } from '../../../assets/svg/action-icons/follow.svg';
 import { ReactComponent as ChatIcon } from '../../../assets/svg/action-icons/message-chat.svg';
@@ -50,6 +49,7 @@ import { ReactComponent as UserIcon } from '../../../assets/svg/common/user.svg'
 import { ReactComponent as SidebarCollapsible } from '../../../assets/svg/ic-sidebar-collapsible.svg';
 import { ReactComponent as VersionIcon } from '../../../assets/svg/ic-version.svg';
 import DeleteModal from '../../../components/common/DeleteModal/DeleteModal';
+import { EditIconButton } from '../../../components/common/IconButtons/EditIconButton';
 import Loader from '../../../components/common/Loader/Loader';
 import TabsLabel from '../../../components/common/TabsLabel/TabsLabel.component';
 import { EntityStatusBadge } from '../../../components/Entity/EntityStatusBadge/EntityStatusBadge.component';
@@ -358,12 +358,11 @@ const ArticleDetailHeader: FC<ArticleDetailHeaderProps> = ({
             multiple={entityRules.canAddMultipleDomains}
             selectedDomain={knowledgePage?.domains ?? []}
             onUpdate={handleDomainSave}>
-            <ButtonUtility
-              className="tw:p-1"
-              color="tertiary"
+            <EditIconButton
+              newLook
               data-testid="edit-domain-btn"
-              icon={<EditIcon height={14} width={14} />}
-              tooltip={t('label.edit-entity', {
+              size="small"
+              title={t('label.edit-entity', {
                 entity: t('label.domain'),
               })}
             />
@@ -422,12 +421,11 @@ const ArticleDetailHeader: FC<ArticleDetailHeaderProps> = ({
               }}
               owner={knowledgePage?.owners}
               onUpdate={handleOwnerSave}>
-              <ButtonUtility
-                className="tw:p-1"
-                color="tertiary"
+              <EditIconButton
+                newLook
                 data-testid="edit-owner-btn"
-                icon={<EditIcon height={14} width={14} />}
-                tooltip={t('label.edit-entity', {
+                size="small"
+                title={t('label.edit-entity', {
                   entity: t('label.owner-plural'),
                 })}
               />
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/GenericTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/GenericTab.tsx
index 59b6c40881e7..764e7fb57c97 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/GenericTab.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/GenericTab.tsx
@@ -30,16 +30,11 @@ const ReactGridLayout = WidthProvider(RGL) as React.ComponentType<
   ReactGridLayoutProps & { children?: React.ReactNode }
 >;
 
-export type GenericTabVariant = 'default' | 'flat';
-
 interface GenericTabProps {
   type: PageType;
-  // 'flat' drops the left-panel frame card so the sole widget (e.g. the
-  // Description on Domain/Data Product) stands on its own. Defaults to 'default'.
-  variant?: GenericTabVariant;
 }
 
-export const GenericTab = ({ type, variant = 'default' }: GenericTabProps) => {
+export const GenericTab = ({ type }: GenericTabProps) => {
   const { layout, updateWidgetHeight } = useGenericContext();
 
   const handleHeightChange = useCallback(
@@ -88,11 +83,9 @@ export const GenericTab = ({ type, variant = 'default' }: GenericTabProps) => {
       autoSize
       useCSSTransforms
       verticalCompact
-      className={classNames('grid-container tw:dark:bg-transparent', {
-        'tw:bg-primary': variant !== 'flat',
+      className={classNames('grid-container flat-left-panel', {
         'custom-tab': !leftSideWidgetPresent,
         'height-auto': type === PageType.Glossary,
-        'flat-left-panel': variant === 'flat',
       })}
       cols={8}
       // react-grid-layout rounds each item's `left` and `width` independently, so
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less
index 04cbf7ba6f1b..970a111718fd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericTab/generic-tab.less
@@ -55,8 +55,8 @@
     }
   }
 
-  // `flat` variant: drop the left-panel frame card so the widgets stand on their
-  // own (Domain, Data Product, Glossary, Glossary Term and Classification docs).
+  // Entity tabs (GenericTab): drop the left-panel frame card so the widget cards
+  // sit directly on the page; the frame stays only on the customize page grid.
   // Also drop the frame's inner padding so the widget lines up flush with the
   // tabs (left) and the right panel (top) instead of being inset by the frame gap.
   &.flat-left-panel > #KnowledgePanel\.LeftPanel {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetRules/DataAssetRules.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssetRules/DataAssetRules.component.tsx
index 37adb4054ab9..c1fbadd965f2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetRules/DataAssetRules.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssetRules/DataAssetRules.component.tsx
@@ -26,7 +26,6 @@ import {
   Typography,
 } from '@openmetadata/ui-core-components';
 import { Registry } from '@rjsf/utils';
-import { Table } from 'antd';
 import { AxiosError } from 'axios';
 import { noop } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
@@ -49,6 +48,7 @@ import jsonLogicSearchClassBase from '../../utils/JSONLogicSearchClassBase';
 import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils';
 import QueryBuilderWidget from '../common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget';
 import RichTextEditorPreviewerNew from '../common/RichTextEditor/RichTextEditorPreviewNew';
+import Table from '../common/Table/TableV2';
 import { SearchOutputType } from '../Explore/AdvanceSearchProvider/AdvanceSearchProvider.interface';
 import './DataAssetRules.less';
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx
index 87cde11faad8..aca1100545ed 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx
@@ -97,6 +97,7 @@ import { getSafeHttpUrl } from '../../../utils/StringUtils';
 import tableClassBase from '../../../utils/TableClassBase';
 import { getTierTags } from '../../../utils/TablePureUtils';
 import { getTagName, getTagRedirectLink } from '../../../utils/TagsPureUtils';
+import { getTagTooltip } from '../../../utils/TagsUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
 import { useRequiredParams } from '../../../utils/useRequiredParams';
 import Certification from '../../Certification/Certification.component';
@@ -114,6 +115,7 @@ import { LearningIcon } from '../../Learning/LearningIcon/LearningIcon.component
 import IconColorModal from '../../Modals/IconColorModal/IconColorModal';
 import SuggestionsAlert from '../../Suggestions/SuggestionsAlert/SuggestionsAlert';
 import { useSuggestionsContext } from '../../Suggestions/SuggestionsProvider/SuggestionsProvider';
+import { TagChipTooltip } from '../../Tag/TagChipTooltip/TagChipTooltip';
 import './data-asset-header.less';
 import {
   DataAssetHeaderInfo,
@@ -1069,14 +1071,17 @@ export const DataAssetsHeader = ({
             if (tier) {
               // The chip is a link to the tag, so it is not also a tier trigger.
               return (
-                <ClassificationTag
-                  color={tier.style?.color}
-                  data-testid="Tier"
-                  href={getTagRedirectLink(tier)}
-                  icon={tier.style?.iconURL}
-                  label={getTagName(tier)}
-                  size="sm"
-                />
+                <TagChipTooltip
+                  title={getTagTooltip(tier.tagFQN, tier.description)}>
+                  <ClassificationTag
+                    color={tier.style?.color}
+                    data-testid="Tier"
+                    href={getTagRedirectLink(tier)}
+                    icon={tier.style?.iconURL}
+                    label={getTagName(tier)}
+                    size="sm"
+                  />
+                </TagChipTooltip>
               );
             }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx
index c0645b3b2e18..4f62c31784f4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx
@@ -178,8 +178,10 @@ jest.mock('@openmetadata/ui-core-components', () => ({
   Owner: jest.fn().mockImplementation(() => <div>Owner.component</div>),
   ClassificationTag: jest
     .fn()
-    .mockImplementation(({ label, 'data-testid': testId }) => (
-      <div data-testid={testId ?? 'classification-tag'}>{label}</div>
+    .mockImplementation(({ label, href, 'data-testid': testId }) => (
+      <a data-testid={testId ?? 'classification-tag'} href={href}>
+        {label}
+      </a>
     )),
 }));
 jest.mock('../../../components/common/TierCard/TierCard', () =>
@@ -548,6 +550,26 @@ describe('DataAssetsHeader component', () => {
     expect(screen.getByTestId('Tier')).toBeInTheDocument();
   });
 
+  it('should show the Tier description tooltip on the Tier chip', () => {
+    render(
+      <DataAssetsHeader
+        {...mockProps}
+        dataAsset={{
+          ...mockProps.dataAsset,
+          tags: [MOCK_TIER_DATA],
+        }}
+      />
+    );
+
+    act(() => {
+      screen.getByTestId('Tier').focus();
+    });
+
+    expect(screen.getByRole('tooltip')).toHaveTextContent(
+      MOCK_TIER_DATA.tagFQN
+    );
+  });
+
   it('should not render the Tier data if not  present', () => {
     render(<DataAssetsHeader {...mockProps} dataAsset={mockProps.dataAsset} />);
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.test.tsx
index 064be5439bb8..f4088ab6d032 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.test.tsx
@@ -74,11 +74,11 @@ describe('Test DataInsightProgressBar Component', () => {
   });
 
   it('uses the active theme color for the progress stroke', async () => {
-    const { container } = render(<DataInsightProgressBar {...MOCK_DATA} />, {
+    render(<DataInsightProgressBar {...MOCK_DATA} />, {
       wrapper: MemoryRouter,
     });
 
-    expect(container.querySelector('.ant-progress-bg')).toHaveStyle({
+    expect(screen.getByRole('progressbar').firstElementChild).toHaveStyle({
       backgroundColor: '#123456',
     });
   });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.tsx
index 75d30cf05c11..c72be3279a72 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/DataInsightProgressBar.tsx
@@ -12,7 +12,8 @@
  */
 
 import Icon from '@ant-design/icons/lib/components/Icon';
-import { Progress } from 'antd';
+import { ProgressBar } from '@openmetadata/ui-core-components';
+
 import classNames from 'classnames';
 import { round } from 'lodash';
 import { ReactComponent as IconSuccessBadge } from '../../assets/svg/success-badge.svg';
@@ -74,12 +75,13 @@ const DataInsightProgressBar = ({
 
       {showProgress && (
         <div className={classNames('flex', { 'm-t-sm': Boolean(target) })}>
-          <Progress
-            className="data-insight-progress-bar"
-            format={() => renderProgressTarget(target, suffix)}
-            percent={progress}
-            strokeColor={progressColor}
-          />
+          <div className="data-insight-progress-bar tw:relative tw:w-full">
+            <ProgressBar
+              color={progressColor}
+              value={Math.min(100, Math.max(0, progress || 0))}
+            />
+            {renderProgressTarget(target, suffix)}
+          </div>
           {showSuccessInfo && progress >= 100 && (
             <Icon
               className="align-middle m-l-xs"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.component.tsx
index 9abbd8f145da..72f7fdb5244e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/EntitySummaryProgressBar.component.tsx
@@ -10,8 +10,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Grid, Typography } from '@openmetadata/ui-core-components';
-import { Progress } from 'antd';
+import {
+  Grid,
+  ProgressBar,
+  Typography,
+} from '@openmetadata/ui-core-components';
+
 import classNames from 'classnames';
 import { round } from 'lodash';
 import { ReactNode } from 'react';
@@ -60,14 +64,13 @@ const EntitySummaryProgressBar = ({
         </Typography>
       </Grid.Item>
       <Grid.Item className="layout-column tw:col-span-24 tw:min-[576px]:col-span-24 tw:min-[768px]:col-span-12">
-        <Progress
-          className="p-l-xss"
-          data-testid="progress-bar"
-          percent={progress}
-          showInfo={false}
-          size="small"
-          strokeColor={isActive ? strokeColor : GRAYED_OUT_COLOR}
-        />
+        <div data-testid="progress-bar">
+          <ProgressBar
+            className="p-l-xss"
+            color={isActive ? strokeColor : GRAYED_OUT_COLOR}
+            value={Math.min(100, Math.max(0, progress || 0))}
+          />
+        </div>
       </Grid.Item>
     </Grid>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.test.tsx
index 3947f716b4e1..7201cfb8d3ce 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.test.tsx
@@ -97,8 +97,10 @@ describe('KPILatestResultsV1', () => {
       backgroundColor: '#100000@0.1',
       color: '#100000',
     });
-    expect(container.querySelector('.ant-progress-bg')).toHaveStyle({
-      backgroundColor: '#100000',
-    });
+    expect(screen.getAllByRole('progressbar')[0].firstElementChild).toHaveStyle(
+      {
+        backgroundColor: '#100000',
+      }
+    );
   });
 });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.tsx
index c9287d2d2dce..609b55a44111 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsight/KPILatestResultsV1.tsx
@@ -15,6 +15,7 @@ import { CheckCircleOutlined, InfoCircleOutlined } from '@ant-design/icons';
 import {
   Box,
   Grid,
+  ProgressBar,
   Tooltip,
   Typography,
 } from '@openmetadata/ui-core-components';
@@ -23,7 +24,7 @@ import {
   hexToRgba,
   useChartPalette,
 } from '@openmetadata/ui-core-components/charts';
-import { Progress } from 'antd';
+
 import { toNumber } from 'lodash';
 import { FC, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -138,12 +139,16 @@ const KPILatestResultsV1: FC<Props> = ({ kpiLatestResultsRecord }) => {
                     </Tooltip>
                   ) : null}
                 </Box>
-                <Progress
-                  percent={Number(currentProgress)}
-                  showInfo={false}
-                  size="small"
-                  strokeColor={seriesColor}
-                />
+                <div>
+                  <ProgressBar
+                    className="tw:h-1.5"
+                    color={seriesColor}
+                    value={Math.min(
+                      100,
+                      Math.max(0, Number(currentProgress) || 0)
+                    )}
+                  />
+                </div>
                 <div className="d-flex justify-space-between">
                   <div className="flex-1">
                     <Typography className="text-xs">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.less b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.less
index 5ab888898edf..967f698588bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.less
@@ -172,18 +172,6 @@
   }
 }
 
-.test-case-form-drawer {
-  .ant-drawer-body {
-    padding: 0 @padding-lg;
-
-    .test-case-form-v1,
-    .edit-test-case-form-v1 {
-      padding-top: @padding-lg;
-      padding-bottom: @padding-lg;
-    }
-  }
-}
-
 .drawer-footer-actions {
   display: flex;
   justify-content: flex-end;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.component.tsx
index d5db89880371..bcb069ac67fe 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.component.tsx
@@ -15,6 +15,7 @@ import {
   Box,
   Button,
   Card,
+  SlideoutMenu,
   Tooltip,
   Typography,
 } from '@openmetadata/ui-core-components';
@@ -24,7 +25,9 @@ import {
   ChevronUp,
   XClose,
 } from '@openmetadata/ui-core-components/icons';
-import { Drawer } from 'antd';
+import { useId } from 'react';
+import { DrawerPopupContainerProvider } from '../../common/DrawerPopupContainerProvider/DrawerPopupContainerProvider';
+
 import { AxiosError } from 'axios';
 import classNames from 'classnames';
 import { isString } from 'lodash';
@@ -127,6 +130,8 @@ export const ColumnDetailPanel = <T extends ColumnOrTask = Column>({
   tableConstraints = [],
   entityType,
 }: ColumnDetailPanelProps<T>) => {
+  const drawerTitleId = useId();
+
   const { t } = useTranslation();
   const { permissions, changeSummary } = useGenericContext();
 
@@ -1063,37 +1068,51 @@ export const ColumnDetailPanel = <T extends ColumnOrTask = Column>({
     </div>
   );
 
+  // Popup portals belong to the drawer even though they render outside its DOM tree.
   return (
-    <Drawer
-      className="column-detail-panel"
-      closable={false}
-      footer={navFooter}
-      open={isOpen}
-      placement="right"
-      title={columnTitle}
+    <SlideoutMenu
+      isDismissable
+      aria-labelledby={drawerTitleId}
+      dialogClassName="column-detail-panel"
+      isOpen={isOpen}
+      shouldCloseOnInteractOutside={(element) =>
+        !element.closest('[data-react-aria-top-layer]')
+      }
       width="40%"
-      onClose={onClose}>
-      <div className="column-detail-panel-container">
-        <div className="tw:flex tw:gap-2 tw:h-full">
-          <Card className="summary-panel-container" variant="ghost">
-            <Card
-              className="tw:h-full tw:overflow-y-auto tw:max-h-full"
-              style={{ width: '100%' }}>
-              {renderTabContent()}
-            </Card>
-          </Card>
-          <div className="tw:mr-2">
-            <EntityRightPanelVerticalNav
-              isColumnDetailPanel
-              activeTab={activeTab}
-              entityType={entityType}
-              verticalNavConatinerclassName="tw:w-[70px]"
-              onTabChange={handleTabChange}
-            />
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen) {
+          onClose();
+        }
+      }}>
+      <SlideoutMenu.Header id={drawerTitleId} showCloseButton={false}>
+        {columnTitle}
+      </SlideoutMenu.Header>
+      <SlideoutMenu.Content role="region">
+        <DrawerPopupContainerProvider>
+          <div className="column-detail-panel-container">
+            <div className="tw:flex tw:gap-2 tw:h-full">
+              <Card className="summary-panel-container" variant="ghost">
+                <Card
+                  className="tw:h-full tw:overflow-y-auto tw:max-h-full"
+                  style={{ width: '100%' }}>
+                  {renderTabContent()}
+                </Card>
+              </Card>
+              <div className="tw:mr-2">
+                <EntityRightPanelVerticalNav
+                  isColumnDetailPanel
+                  activeTab={activeTab}
+                  entityType={entityType}
+                  verticalNavConatinerclassName="tw:w-[70px]"
+                  onTabChange={handleTabChange}
+                />
+              </div>
+            </div>
           </div>
-        </div>
-      </div>
-      {renderDisplayNameModal()}
-    </Drawer>
+          {renderDisplayNameModal()}
+        </DrawerPopupContainerProvider>
+      </SlideoutMenu.Content>
+      <SlideoutMenu.Footer>{navFooter}</SlideoutMenu.Footer>
+    </SlideoutMenu>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less
index 26e1437d7e18..fff17380039a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.less
@@ -14,7 +14,6 @@
 .overview-tab-content {
   height: auto;
 }
-.ant-drawer-content,
 .navigation-container {
   background-color: @grey-50 !important;
 }
@@ -27,33 +26,6 @@
 }
 
 .column-detail-panel {
-  .ant-drawer-footer {
-    border-top: none;
-    padding-top: 0;
-    position: relative;
-  }
-  .ant-drawer-header {
-    padding: var(--om-space-8);
-    padding-bottom: 0;
-
-    .ant-drawer-header-title {
-      width: 100%;
-      min-width: 0;
-      overflow: hidden;
-    }
-
-    .ant-drawer-title {
-      width: 100%;
-      min-width: 0;
-      overflow: hidden;
-    }
-  }
-
-  .ant-drawer-body {
-    padding: 0;
-    height: 100%;
-  }
-
   .title-section {
     padding-bottom: 0;
     width: 100%;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.test.tsx
index 323ca1356e40..ec8519968234 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnDetailPanel/ColumnDetailPanel.test.tsx
@@ -507,10 +507,11 @@ describe('ColumnDetailPanel', () => {
 
   describe('Component Rendering', () => {
     it('should render drawer when isOpen is true', async () => {
-      const { getByTestId } = render(<ColumnDetailPanel {...mockProps} />);
+      const { getByTestId, getByRole } = render(
+        <ColumnDetailPanel {...mockProps} />
+      );
 
-      expect(getByTestId('drawer')).toBeInTheDocument();
-      expect(getByTestId('drawer')).toHaveAttribute('data-open', 'true');
+      expect(getByRole('dialog')).toBeInTheDocument();
 
       await waitFor(() => {
         expect(getByTestId('description-section')).toBeInTheDocument();
@@ -518,11 +519,11 @@ describe('ColumnDetailPanel', () => {
     });
 
     it('should not render drawer when isOpen is false', () => {
-      const { getByTestId } = render(
+      const { queryByRole } = render(
         <ColumnDetailPanel {...mockProps} isOpen={false} />
       );
 
-      expect(getByTestId('drawer')).toHaveAttribute('data-open', 'false');
+      expect(queryByRole('dialog')).not.toBeInTheDocument();
     });
 
     it('should render all sections in overview tab', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.component.tsx
index ed6bc7ce04bc..a2028c2e420a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.component.tsx
@@ -10,8 +10,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Menu } from 'antd';
-import Checkbox, { CheckboxChangeEvent } from 'antd/lib/checkbox/Checkbox';
+import { Box } from '@openmetadata/ui-core-components';
+
+import { Checkbox } from '@openmetadata/ui-core-components';
 import { isEmpty, startCase } from 'lodash';
 import React from 'react';
 import i18n from '../../../utils/i18next/LocalUtil';
@@ -23,8 +24,7 @@ export const ColumnFilter = ({
   confirm,
   filters,
 }: FilterDropdownProps) => {
-  const handleClick = (e: CheckboxChangeEvent) => {
-    const checkedKey = e.target.value;
+  const handleClick = (checkedKey: React.Key) => {
     if (selectedKeys.indexOf(checkedKey) > -1) {
       setSelectedKeys(selectedKeys.filter((key) => key !== checkedKey));
     } else {
@@ -46,18 +46,18 @@ export const ColumnFilter = ({
   }
 
   return (
-    <Menu
-      items={filters?.map((f) => ({
-        key: f.value as string,
-        label: (
-          <Checkbox
-            checked={selectedKeys.indexOf(f.value as React.Key) > -1}
-            value={f.value}
-            onChange={handleClick}>
-            {startCase(f.text as string)}
-          </Checkbox>
-        ),
-      }))}
-    />
+    <Box className="tw:px-3 tw:py-2" direction="col" gap={2}>
+      {filters?.map((filter) => (
+        <Checkbox
+          isSelected={selectedKeys.indexOf(filter.value as React.Key) > -1}
+          key={String(filter.value)}
+          label={startCase(filter.text as string)}
+          // Rendered inside the table header, which provides react-aria's row
+          // selection checkbox context; opt out of it.
+          slot={null}
+          onChange={() => handleClick(filter.value as React.Key)}
+        />
+      ))}
+    </Box>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.test.tsx
new file mode 100644
index 000000000000..e8564bd901ce
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.test.tsx
@@ -0,0 +1,67 @@
+/*
+ *  Copyright 2026 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 { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { CheckboxContext } from 'react-aria-components';
+import { ColumnFilter } from './ColumnFilter.component';
+
+const filters = [
+  { text: 'Clickhouse', value: 'Clickhouse' },
+  { text: 'PersonalData.Personal', value: 'PersonalData.Personal' },
+];
+
+describe('ColumnFilter', () => {
+  it('renders its options inside a table header checkbox context', async () => {
+    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+    const setSelectedKeys = jest.fn();
+    const confirm = jest.fn();
+
+    // TableV2 headers provide react-aria's slotted "selection" checkbox context.
+    render(
+      <CheckboxContext.Provider value={{ slots: { selection: {} } }}>
+        <ColumnFilter
+          visible
+          clearFilters={jest.fn()}
+          close={jest.fn()}
+          confirm={confirm}
+          filters={filters}
+          prefixCls="filter"
+          selectedKeys={[]}
+          setSelectedKeys={setSelectedKeys}
+        />
+      </CheckboxContext.Provider>
+    );
+
+    await user.click(screen.getByText('Personal Data Personal'));
+
+    expect(setSelectedKeys).toHaveBeenCalledWith(['PersonalData.Personal']);
+    expect(confirm).toHaveBeenCalled();
+  });
+
+  it('shows an empty state when there are no filters', () => {
+    render(
+      <ColumnFilter
+        visible
+        clearFilters={jest.fn()}
+        close={jest.fn()}
+        confirm={jest.fn()}
+        filters={[]}
+        prefixCls="filter"
+        selectedKeys={[]}
+        setSelectedKeys={jest.fn()}
+      />
+    );
+
+    expect(screen.getByTestId('no-filter-options')).toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less
index 737bf6144025..2e7afc39eac4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TableProfiler/table-profiler.less
@@ -47,13 +47,6 @@
 }
 
 .profiler-settings-drawer {
-  .ant-drawer-body {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    padding: 0 @padding-lg @padding-lg;
-  }
-
   .profiler-settings-loader {
     min-height: calc(100vh - 200px);
     display: flex;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx
index f898c7fc1978..2f3f566cd74d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx
@@ -17,16 +17,15 @@ import {
   Input,
   Modal,
   ModalOverlay,
-  Tooltip,
 } from '@openmetadata/ui-core-components';
 import { AxiosError } from 'axios';
 import classNames from 'classnames';
 import { Duration } from 'luxon';
 import { FormEvent, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg';
 import { NO_DATA_PLACEHOLDER } from '../../../constants/constants';
 import { showErrorToast } from '../../../utils/ToastUtils';
+import { EditIconButton } from '../../common/IconButtons/EditIconButton';
 import './retention-period.less';
 import { RetentionPeriodProps } from './RetentionPeriod.interface';
 // Pluralize a duration component, e.g. pluralizeDurationUnit(2, 'year') => '2 years'
@@ -114,16 +113,13 @@ const RetentionPeriod = ({
               {t('label.retention-period')}
             </span>
             {hasPermission && (
-              <Tooltip title={editTitle}>
-                <Button
-                  aria-label={editTitle}
-                  className="tw:size-5 tw:rounded-sm tw:p-0 tw:text-quaternary tw:shadow-none tw:after:outline-secondary tw:data-icon-only:p-0"
-                  color="secondary"
-                  data-testid="edit-retention-period-button"
-                  iconLeading={<EditIcon aria-hidden width="12px" />}
-                  onPress={onEdit}
-                />
-              </Tooltip>
+              <EditIconButton
+                newLook
+                data-testid="edit-retention-period-button"
+                size="small"
+                title={editTitle}
+                onClick={onEdit}
+              />
             )}
           </div>
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/MessageCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/MessageCard.tsx
index 574906dfff3d..420bfb7e00ab 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/MessageCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/MessageCard.tsx
@@ -11,8 +11,15 @@
  *  limitations under the License.
  */
 
-import { Badge, Typography } from '@openmetadata/ui-core-components';
-import { Collapse } from 'antd';
+import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+  Badge,
+  Typography,
+} from '@openmetadata/ui-core-components';
+
 import { lazy, ReactNode, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
@@ -22,8 +29,6 @@ const SchemaEditor = withSuspenseFallback(
   lazy(() => import('../SchemaEditor/SchemaEditor'))
 );
 
-const { Panel } = Collapse;
-
 const MessageCard = ({ message }: { message: string }) => {
   const { t } = useTranslation();
   const [header, setHeader] = useState<ReactNode>(
@@ -39,7 +44,7 @@ const MessageCard = ({ message }: { message: string }) => {
     if (isExpanded) {
       setHeader(
         <Badge
-          className="tw:mr-2 tw:inline-flex tw:px-3 tw:py-1"
+          className="tw:mr-2 tw:inline-flex"
           color="gray"
           data-testid="expanded-header"
           id="sampleData-value"
@@ -61,19 +66,27 @@ const MessageCard = ({ message }: { message: string }) => {
   }, [isExpanded]);
 
   return (
-    <Collapse className="message-card-collapse" onChange={toggleExpanded}>
-      <Panel data-testid="message-card" header={header} key="1">
-        <SchemaEditor
-          className="m-t-xs"
-          copyButtonClassName="tw:![top:-4px] tw:!right-1"
-          editorClass="topic-sample-data"
-          options={{
-            styleActiveLine: false,
-          }}
-          value={message.replace(/'/g, '"')}
-        />
-      </Panel>
-    </Collapse>
+    <Accordion
+      allowsMultipleExpanded
+      className="message-card-collapse"
+      onExpandedChange={toggleExpanded}>
+      <AccordionItem data-testid="message-card" id="1" key="1">
+        <AccordionHeader className="tw:flex-row-reverse">
+          {header}
+        </AccordionHeader>
+        <AccordionPanel unmountOnCollapse>
+          <SchemaEditor
+            className="m-t-xs"
+            copyButtonClassName="tw:![top:-4px] tw:!right-1"
+            editorClass="topic-sample-data"
+            options={{
+              styleActiveLine: false,
+            }}
+            value={message.replace(/'/g, '"')}
+          />
+        </AccordionPanel>
+      </AccordionItem>
+    </Accordion>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less
index a9bcc959b535..b5e1a398eb5c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less
@@ -11,19 +11,3 @@
  *  limitations under the License.
  */
 @import '../../../styles/variables.less';
-
-.message-card-collapse {
-  background-color: var(--tw-color-bg-primary);
-  .ant-collapse-header-text {
-    width: 95%;
-  }
-  .ant-collapse-header {
-    background-color: transparent;
-  }
-  .ant-collapse-content {
-    border-top-width: 0px;
-  }
-  .ant-collapse-content-box {
-    padding-top: 0;
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx
index e22eba36df24..82db8820a0e4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx
@@ -13,7 +13,7 @@
 
 import Icon from '@ant-design/icons';
 import { Box, Grid, Owner, Typography } from '@openmetadata/ui-core-components';
-import { Drawer } from 'antd';
+
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
@@ -77,15 +77,7 @@ const TableQueryRightPanel = ({
   };
 
   return (
-    <Drawer
-      destroyOnClose
-      open
-      className="query-right-panel"
-      closable={false}
-      getContainer={false}
-      mask={false}
-      title={null}
-      width="100%">
+    <Box className="query-right-panel tw:h-full tw:w-full" direction="col">
       {isLoading ? (
         <Loader />
       ) : (
@@ -247,7 +239,7 @@ const TableQueryRightPanel = ({
           </Grid.Item>
         </Grid>
       )}
-    </Drawer>
+    </Box>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less
index a650dcd13972..5ac6937829cd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less
@@ -44,8 +44,4 @@
   -ms-overflow-style: none;
   border-radius: @border-rad-sm;
   scrollbar-width: none;
-
-  .ant-drawer-body {
-    padding: unset;
-  }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less
index 222ca4923da3..5f14d7f2d3da 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/custom-node.less
@@ -381,26 +381,6 @@
         padding-top: var(--om-space-8);
       }
 
-      .lineage-collapse-column.ant-collapse {
-        border: none;
-        border-radius: 0;
-
-        .ant-collapse-header {
-          padding: var(--om-space-4);
-          font-size: var(--om-font-size-xs);
-          display: inherit; // to fix the overflow issue of parent column node, which has children.
-        }
-
-        .ant-collapse-content-box {
-          padding: var(--om-space-4);
-        }
-
-        .ant-collapse-item {
-          border: none;
-          border-radius: 0;
-        }
-      }
-
       .custom-node-column-container {
         padding: var(--om-space-6) var(--om-space-8);
         background-color: inherit;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/entity-lineage.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/entity-lineage.style.less
index ea0392c8bf93..c8984747420b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/entity-lineage.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/entity-lineage.style.less
@@ -242,11 +242,6 @@
   .entity-panel-container {
     right: 16px;
     margin-top: var(--om-space-12);
-
-    .ant-drawer-content-wrapper {
-      border-radius: var(--om-radius-10);
-      overflow: hidden;
-    }
   }
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/APIEndpointSummary/APIEndpointSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/APIEndpointSummary/APIEndpointSummary.tsx
index 62333499501e..ebce5e3028a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/APIEndpointSummary/APIEndpointSummary.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/APIEndpointSummary/APIEndpointSummary.tsx
@@ -11,8 +11,13 @@
  *  limitations under the License.
  */
 
-import { Grid, Typography } from '@openmetadata/ui-core-components';
-import { Radio, RadioChangeEvent } from 'antd';
+import {
+  ButtonGroup,
+  ButtonGroupItem,
+  Grid,
+  Typography,
+} from '@openmetadata/ui-core-components';
+
 import { isEmpty } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -77,10 +82,6 @@ const APIEndpointSummary = ({
     }
   }, [entityDetails]);
 
-  const handleViewChange = (e: RadioChangeEvent) => {
-    setViewType(e.target.value);
-  };
-
   useEffect(() => {
     if (entityDetails.service?.type === 'apiService') {
       fetchApiEndpointDetails();
@@ -92,14 +93,20 @@ const APIEndpointSummary = ({
       className="layout-row layout-grid p-md border-radius-card"
       style={getLayoutGutter(0, 8)}>
       <Grid.Item className="layout-column" span={24}>
-        <Radio.Group value={viewType} onChange={handleViewChange}>
-          <Radio.Button value={SchemaViewType.REQUEST_SCHEMA}>
+        <ButtonGroup
+          disallowEmptySelection
+          aria-label={t('label.schema')}
+          selectedKeys={new Set([viewType])}
+          onSelectionChange={(keys) =>
+            setViewType([...keys][0] as SchemaViewType)
+          }>
+          <ButtonGroupItem id={SchemaViewType.REQUEST_SCHEMA}>
             {t('label.request')}
-          </Radio.Button>
-          <Radio.Button value={SchemaViewType.RESPONSE_SCHEMA}>
+          </ButtonGroupItem>
+          <ButtonGroupItem id={SchemaViewType.RESPONSE_SCHEMA}>
             {t('label.response')}
-          </Radio.Button>
-        </Radio.Group>
+          </ButtonGroupItem>
+        </ButtonGroup>
       </Grid.Item>
       <Grid.Item className="layout-column" span={24}>
         {isEmpty(activeSchema?.schemaFields) ? (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/LineageTab/LineageTabContent.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/LineageTab/LineageTabContent.less
index c83b119eeeb2..f28adc6ebe58 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/LineageTab/LineageTabContent.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/LineageTab/LineageTabContent.less
@@ -72,13 +72,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-
-  .ant-badge {
-    .ant-badge-status-text {
-      font-size: var(--om-font-size-11);
-      font-weight: var(--om-font-weight-medium);
-    }
-  }
 }
 .lineage-items-list {
   .lineage-item-card {
@@ -134,16 +127,6 @@
       color: @grey-500;
       font-size: var(--om-font-size-xs) !important;
     }
-
-    .ant-badge {
-      .ant-badge-status-text {
-        font-size: var(--om-font-size-11);
-        color: @grey-10;
-        background-color: @grey-100;
-        padding: var(--om-space-2) var(--om-space-8);
-        border-radius: var(--om-radius-xl);
-      }
-    }
   }
 }
 .entity-type-icon {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx
index 7a0e9729a2b3..a22e96d829bf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx
@@ -12,11 +12,15 @@
  */
 
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
   Box,
   SkeletonParagraph,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Collapse, List } from 'antd';
+
 import { isEmpty, isUndefined } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { SummaryEntityType } from '../../../../enums/EntitySummary.enum';
@@ -45,48 +49,59 @@ export default function SummaryList({
   }
 
   return (
-    <List
-      data-testid="summary-list"
-      dataSource={formattedEntityData}
-      locale={{
-        emptyText: (
+    <ul className="tw:m-0 tw:list-none tw:p-0" data-testid="summary-list">
+      {formattedEntityData.length ? (
+        formattedEntityData.map((item) => (
+          <li key={item.name}>
+            {isEmpty(item.children) || isUndefined(item.children) ? (
+              <SummaryListItems
+                entityDetails={item}
+                isColumnsData={entityType === SummaryEntityType.COLUMN}
+                key={`${item.name}-summary-list-item`}
+              />
+            ) : (
+              <Accordion
+                allowsMultipleExpanded
+                className="summary-list-collapse w-full"
+                key={`${item.name}-collapse`}>
+                <AccordionItem
+                  data-testid={`${item.name}-collapse`}
+                  id={String(`${item.name}-collapse-panel`)}
+                  key={`${item.name}-collapse-panel`}>
+                  <Box align="center" gap={2}>
+                    <AccordionHeader
+                      aria-label={t('label.entity-detail-plural', {
+                        entity: item.name,
+                      })}
+                      className="tw:w-auto"
+                    />
+                    <Box className="tw:min-w-0 tw:flex-1">
+                      <SummaryListItems
+                        entityDetails={item}
+                        isColumnsData={entityType === SummaryEntityType.COLUMN}
+                      />
+                    </Box>
+                  </Box>
+                  <AccordionPanel>
+                    <SummaryList
+                      entityType={entityType}
+                      formattedEntityData={item.children}
+                    />
+                  </AccordionPanel>
+                </AccordionItem>
+              </Accordion>
+            )}
+          </li>
+        ))
+      ) : (
+        <li>
           <div>
             <Typography className="no-data-chip-placeholder">
               {emptyPlaceholderText ?? t('message.no-data-available')}
             </Typography>
           </div>
-        ),
-      }}
-      renderItem={(item) =>
-        isEmpty(item.children) || isUndefined(item.children) ? (
-          <SummaryListItems
-            entityDetails={item}
-            isColumnsData={entityType === SummaryEntityType.COLUMN}
-            key={`${item.name}-summary-list-item`}
-          />
-        ) : (
-          <Collapse
-            ghost
-            className="summary-list-collapse w-full"
-            collapsible="icon"
-            key={`${item.name}-collapse`}>
-            <Collapse.Panel
-              data-testid={`${item.name}-collapse`}
-              header={
-                <SummaryListItems
-                  entityDetails={item}
-                  isColumnsData={entityType === SummaryEntityType.COLUMN}
-                />
-              }
-              key={`${item.name}-collapse-panel`}>
-              <SummaryList
-                entityType={entityType}
-                formattedEntityData={item.children}
-              />
-            </Collapse.Panel>
-          </Collapse>
-        )
-      }
-    />
+        </li>
+      )}
+    </ul>
   );
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/summary-list.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/summary-list.less
index 1ecc0a8b04cb..049b932109b7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/summary-list.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/summary-list.less
@@ -14,25 +14,6 @@
 @import '../../../../styles/variables.less';
 
 .summary-list-collapse {
-  &.ant-collapse {
-    background-color: var(--tw-color-bg-primary);
-    margin-bottom: var(--om-space-16);
-    padding: var(--om-space-16);
-    border-radius: var(--om-radius-xl);
-    .ant-collapse-item {
-      .ant-collapse-header {
-        padding: 0;
-        .summary-list-item-container {
-          padding: 0;
-          margin-bottom: 0;
-        }
-      }
-      .summary-list-item-container {
-        background-color: inherit;
-        margin-bottom: 0;
-      }
-    }
-  }
   .summary-list-collapse {
     margin-bottom: 0;
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
index 1f2ead432696..2b7d19453764 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
@@ -147,7 +147,7 @@ const GlossaryDetails = ({
           />
         ),
         key: EntityTabs.TERMS,
-        children: <GenericTab type={PageType.Glossary} variant="flat" />,
+        children: <GenericTab type={PageType.Glossary} />,
       },
       ...(!isVersionView
         ? [
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx
index 952c6bab7139..84238bfe6f03 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx
@@ -10,18 +10,20 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import Icon from '@ant-design/icons/lib/components/Icon';
 import {
+  Badge,
+  Box,
   Button,
+  ButtonUtility,
+  Divider,
+  Dropdown,
+  NavItemBase,
+  NavItemButton,
   SimpleModal,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Layout, Menu, MenuProps } from 'antd';
-
 import classNames from 'classnames';
-import { noop } from 'lodash';
-import { MenuInfo } from 'rc-menu/lib/interface';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import {
@@ -32,6 +34,7 @@ import { SidebarItem } from '../../../enums/sidebar.enum';
 import { useCurrentUserPreferences } from '../../../hooks/currentUserStore/useCurrentUserStore';
 import useCustomLocation from '../../../hooks/useCustomLocation/useCustomLocation';
 import { useSidebarItems } from '../../../hooks/useSidebarItems';
+import { LeftSidebarItem as SidebarEntry } from '../../../interface/sidebar.interface';
 import leftSidebarClassBase from '../../../utils/LeftSidebarClassBase';
 import {
   getSidebarActiveKeys,
@@ -40,25 +43,22 @@ import {
 import { useAuthProvider } from '../../Auth/AuthProviders/AuthProvider';
 import BrandImage from '../../common/BrandImage/BrandImage';
 import './left-sidebar.less';
-import LeftSidebarItem from './LeftSidebarItem.component';
-const { Sider } = Layout;
 
 const LeftSidebar = () => {
   const location = useCustomLocation();
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const { onLogoutHandler } = useAuthProvider();
   const [isConfirmLogoutModalOpen, setIsConfirmLogoutModalOpen] =
     useState(false);
   const {
     preferences: { isSidebarCollapsed },
   } = useCurrentUserPreferences();
-
-  const { i18n } = useTranslation();
-  const isDirectionRTL = useMemo(() => i18n.dir() === 'rtl', [i18n]);
+  const isDirectionRTL = i18n.dir() === 'rtl';
   const [openKeys, setOpenKeys] = useState<string[]>([]);
-
+  const [collapsedMenuKey, setCollapsedMenuKey] = useState<string>();
+  const hoverCloseTimer = useRef<ReturnType<typeof setTimeout>>();
+  const collapsedPopover = useRef<HTMLDivElement>(null);
   const sideBarItems = useSidebarItems();
-
   const selectedKeys = useMemo(
     () =>
       getSidebarActiveKeys(
@@ -67,62 +67,208 @@ const LeftSidebar = () => {
       ),
     [location.pathname, location.state]
   );
+  const handleLogoutClick = useCallback(
+    () => setIsConfirmLogoutModalOpen(true),
+    []
+  );
+  const hideConfirmLogoutModal = () => setIsConfirmLogoutModalOpen(false);
 
-  const handleLogoutClick = useCallback(() => {
-    setIsConfirmLogoutModalOpen(true);
-  }, []);
+  const cancelHoverClose = () => {
+    if (hoverCloseTimer.current !== undefined) {
+      clearTimeout(hoverCloseTimer.current);
+      hoverCloseTimer.current = undefined;
+    }
+  };
 
-  const hideConfirmLogoutModal = () => {
-    setIsConfirmLogoutModalOpen(false);
+  useEffect(() => {
+    setCollapsedMenuKey(undefined);
+
+    return () => {
+      if (hoverCloseTimer.current !== undefined) {
+        clearTimeout(hoverCloseTimer.current);
+      }
+    };
+  }, [isSidebarCollapsed]);
+
+  const navigateToItem = (item: SidebarEntry, parentKey?: string) => {
+    setOpenKeys(parentKey ? [parentKey] : []);
+    // App-mode changes must run before the router follows this item's link.
+    item.onClick?.();
   };
 
-  const LOWER_SIDEBAR_TOP_SIDEBAR_MENU_ITEMS: MenuProps['items'] = useMemo(
-    () =>
-      [SETTING_ITEM, LOGOUT_ITEM].map((item) => ({
-        key: item.key,
-        icon: <Icon component={item.icon} />,
-        onClick: item.key === SidebarItem.LOGOUT ? handleLogoutClick : noop,
-        label: <LeftSidebarItem data={item} />,
-      })),
-    [handleLogoutClick]
-  );
+  const toggleGroup = (groupKey: string, isOpen: boolean) => {
+    const otherKeys = (keys: string[]) =>
+      keys.filter((key) => key !== groupKey);
+    setOpenKeys((keys) =>
+      isOpen ? [...otherKeys(keys), groupKey] : otherKeys(keys)
+    );
+  };
 
-  const menuItems = useMemo(() => {
-    return sideBarItems.map((item) => ({
-      key: item.key,
-      icon: <Icon component={item.icon} />,
-      label: <LeftSidebarItem data={item} />,
-      'data-testid': `side-bar-${item.dataTestId}`,
-      children: item.children?.map((child) => ({
-        key: child.key,
-        icon: <Icon component={child.icon} />,
-        label: <LeftSidebarItem data={child} />,
-        'data-testid': `side-bar-${item.dataTestId}`,
-      })),
-    }));
-  }, [sideBarItems]);
+  const renderLeaf = (item: SidebarEntry, parentKey?: string) => {
+    if (!item.redirect_url) {
+      return (
+        <Button
+          aria-label={t(item.title)}
+          color="tertiary"
+          data-testid={item.dataTestId}
+          iconLeading={item.icon}
+          size="md"
+          onPress={() => {
+            navigateToItem(item, parentKey);
+            if (item.key === SidebarItem.LOGOUT) {
+              handleLogoutClick();
+            }
+          }}>
+          {!isSidebarCollapsed && t(item.title)}
+        </Button>
+      );
+    }
 
-  const handleMenuClick: MenuProps['onClick'] = useCallback(
-    (info: MenuInfo) => {
-      // keyPath is [childKey, ...ancestorKeys]; keep the active item's submenu
-      // open (empty for a top-level item, which collapses any open submenu).
-      setOpenKeys(info.keyPath.slice(1));
-    },
-    []
-  );
+    if (isSidebarCollapsed) {
+      return (
+        <span
+          className="tw:flex tw:justify-center"
+          data-testid={item.dataTestId}>
+          <NavItemButton
+            current={selectedKeys.includes(item.key)}
+            href={item.redirect_url}
+            icon={item.icon}
+            label={t(item.title)}
+            onClick={() => navigateToItem(item, parentKey)}
+          />
+        </span>
+      );
+    }
+
+    return (
+      <NavItemBase
+        badge={
+          item.isBeta ? (
+            <Badge color="brand" size="xs">
+              {t('label.beta')}
+            </Badge>
+          ) : undefined
+        }
+        current={selectedKeys.includes(item.key)}
+        dataTestId={item.dataTestId}
+        href={item.redirect_url}
+        icon={item.icon}
+        truncate={false}
+        type={parentKey ? 'collapsible-child' : 'link'}
+        onClick={() => navigateToItem(item, parentKey)}>
+        {t(item.title)}
+      </NavItemBase>
+    );
+  };
+
+  const renderGroup = (item: SidebarEntry) => {
+    if (isSidebarCollapsed) {
+      return (
+        <Dropdown.Root
+          isOpen={collapsedMenuKey === item.key}
+          onOpenChange={(isOpen) =>
+            setCollapsedMenuKey(isOpen ? item.key : undefined)
+          }>
+          <span
+            className="tw:flex tw:h-10 tw:items-center tw:justify-center"
+            role="presentation"
+            onMouseEnter={() => {
+              cancelHoverClose();
+              setCollapsedMenuKey(item.key);
+            }}
+            onMouseLeave={() => {
+              // A short handoff lets the pointer reach the portal without closing it mid-flight.
+              cancelHoverClose();
+              hoverCloseTimer.current = setTimeout(() => {
+                if (
+                  !collapsedPopover.current?.contains(document.activeElement)
+                ) {
+                  setCollapsedMenuKey(undefined);
+                }
+              }, 150);
+            }}>
+            <ButtonUtility
+              aria-label={t(item.title)}
+              color={
+                item.children?.some((child) => selectedKeys.includes(child.key))
+                  ? 'secondary'
+                  : 'tertiary'
+              }
+              data-testid={item.dataTestId}
+              icon={item.icon}
+              size="sm"
+              // Hover has already opened the group before a pointer press reaches its trigger.
+              onPress={() => setCollapsedMenuKey(item.key)}
+            />
+          </span>
+          {/* Hover menus must leave their triggers and neighbouring groups interactive. */}
+          <Dropdown.Popover
+            isNonModal
+            placement={isDirectionRTL ? 'left top' : 'right top'}>
+            <div
+              ref={collapsedPopover}
+              role="presentation"
+              onMouseEnter={cancelHoverClose}
+              onMouseLeave={() => setCollapsedMenuKey(undefined)}>
+              <Dropdown.Menu
+                aria-label={t(item.title)}
+                selectedKeys={new Set(selectedKeys)}>
+                {item.children?.map((child) => (
+                  <Dropdown.Item
+                    data-testid={child.dataTestId}
+                    href={child.redirect_url}
+                    icon={child.icon}
+                    id={child.key}
+                    key={child.key}
+                    label={t(child.title)}
+                    onAction={() => navigateToItem(child, item.key)}
+                  />
+                ))}
+              </Dropdown.Menu>
+            </div>
+          </Dropdown.Popover>
+        </Dropdown.Root>
+      );
+    }
+
+    return (
+      <details
+        open={openKeys.includes(item.key)}
+        onToggle={(event) => toggleGroup(item.key, event.currentTarget.open)}>
+        <NavItemBase
+          current={item.children?.some((child) =>
+            selectedKeys.includes(child.key)
+          )}
+          icon={item.icon}
+          truncate={false}
+          type="collapsible">
+          <span data-testid={item.dataTestId}>{t(item.title)}</span>
+        </NavItemBase>
+        <ul className="tw:m-0 tw:list-none tw:p-0">
+          {item.children?.map((child) => (
+            <li
+              className="tw:py-0.5"
+              data-testid={`side-bar-${child.dataTestId}`}
+              key={child.key}>
+              {renderLeaf(child, item.key)}
+            </li>
+          ))}
+        </ul>
+      </details>
+    );
+  };
 
   return (
-    <Sider
-      collapsible
-      className={classNames({
+    <aside
+      className={classNames('app-sidebar tw:bg-surface', {
+        'sidebar-collapsed': isSidebarCollapsed,
         'left-sidebar-col-rtl': isDirectionRTL,
         'sidebar-open': !isSidebarCollapsed,
+        'tw:w-18 tw:min-w-18 tw:max-w-18': isSidebarCollapsed,
+        'tw:w-57 tw:min-w-57 tw:max-w-57': !isSidebarCollapsed,
       })}
-      collapsed={isSidebarCollapsed}
-      collapsedWidth={72}
       data-testid="left-sidebar"
-      trigger={null}
-      width={228}>
+      dir={i18n.dir()}>
       <div className="logo-container">
         <Link className="flex-shrink-0" id="openmetadata_logo" to="/">
           <BrandImage
@@ -134,42 +280,32 @@ const LeftSidebar = () => {
           />
         </Link>
       </div>
-
       <div className="left-sidebar-layout">
-        <div className="menu-container">
-          <div className="top-menu">
-            <Menu
-              inlineIndent={16}
-              items={menuItems}
-              mode="inline"
-              openKeys={openKeys}
-              rootClassName="left-sidebar-menu"
-              selectedKeys={selectedKeys}
-              onClick={handleMenuClick}
-              onOpenChange={setOpenKeys}
-            />
-          </div>
-
-          <div className="bottom-menu">
-            <Menu
-              inlineIndent={16}
-              items={[
-                {
-                  type: 'divider',
-                  style: {
-                    margin: '8px 0',
-                  },
-                },
-                ...LOWER_SIDEBAR_TOP_SIDEBAR_MENU_ITEMS,
-              ]}
-              mode="inline"
-              rootClassName="left-sidebar-menu"
-              selectedKeys={selectedKeys}
-            />
-          </div>
-        </div>
+        <Box className="menu-container" direction="col">
+          <nav aria-label={t('label.navigation')} className="top-menu">
+            <ul className="left-sidebar-menu tw:m-0 tw:list-none tw:px-3 tw:py-0">
+              {sideBarItems.map((item) => (
+                <li
+                  className="tw:py-0.5"
+                  data-testid={`side-bar-${item.dataTestId}`}
+                  key={item.key}>
+                  {item.children?.length ? renderGroup(item) : renderLeaf(item)}
+                </li>
+              ))}
+            </ul>
+          </nav>
+          <nav
+            aria-label={t('label.setting-plural')}
+            className="bottom-menu tw:px-3">
+            <Divider className="tw:my-2" />
+            <ul className="tw:m-0 tw:list-none tw:p-0">
+              {[SETTING_ITEM, LOGOUT_ITEM].map((item) => (
+                <li key={item.key}>{renderLeaf(item)}</li>
+              ))}
+            </ul>
+          </nav>
+        </Box>
       </div>
-
       {isConfirmLogoutModalOpen && (
         <SimpleModal
           isOpen
@@ -194,7 +330,7 @@ const LeftSidebar = () => {
           </Typography>
         </SimpleModal>
       )}
-    </Sider>
+    </aside>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebarItem.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebarItem.component.tsx
index 6bfcfa158236..0516b6407e26 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebarItem.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebarItem.component.tsx
@@ -10,7 +10,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Badge } from 'antd';
+import { Badge } from '@openmetadata/ui-core-components';
+
 import { useTranslation } from 'react-i18next';
 import { NavLink } from 'react-router-dom';
 import { LeftSidebarItemProps } from './LeftSidebar.interface';
@@ -33,10 +34,11 @@ const LeftSidebarItem = ({
       {isBeta && (
         <Badge
           className="service-beta-tag"
-          count={t('label.beta')}
-          size="small"
-          style={{ marginLeft: 8 }}
-        />
+          color="brand"
+          size="sm"
+          style={{ marginLeft: 8 }}>
+          {t('label.beta')}
+        </Badge>
       )}
     </NavLink>
   ) : (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/left-sidebar.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/left-sidebar.less
index 42f884f9fb0c..78c535915c8f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/left-sidebar.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/left-sidebar.less
@@ -24,7 +24,7 @@
 }
 
 .app-container {
-  & > .ant-layout-sider {
+  & > .app-sidebar {
     height: 100vh;
     overflow-y: auto;
     scrollbar-width: none;
@@ -35,281 +35,6 @@
   }
 }
 
-.left-sidebar-menu {
-  &:not(.ant-menu-submenu-hidden) {
-    display: flex;
-    flex-direction: column;
-  }
-
-  .ant-menu-item,
-  .ant-menu-submenu {
-    color: @grey-600;
-  }
-
-  &.ant-menu.ant-menu-vertical[dir='rtl'] {
-    padding: 0 @padding-md 0 0;
-  }
-
-  &.ant-menu.ant-menu-vertical,
-  &.ant-menu.ant-menu-inline {
-    border: none;
-    padding: 0 0 0 @padding-md;
-    overflow: hidden;
-
-    .ant-menu-submenu-vertical {
-      &.ant-menu-submenu-active {
-        border: none;
-      }
-    }
-
-    .ant-menu-submenu.ant-menu-submenu-inline {
-      &.ant-menu-submenu-active:not(.ant-menu-submenu-open):not(
-          .ant-menu-submenu-selected
-        ) {
-        .ant-menu-submenu-title {
-          background: @hover-color;
-        }
-      }
-
-      .anticon {
-        svg {
-          fill: transparent;
-        }
-      }
-
-      .ant-menu-submenu-title {
-        .ant-menu-title-content {
-          line-height: 16px;
-          font-weight: var(--om-font-weight-medium);
-        }
-      }
-
-      .ant-menu-item,
-      .ant-menu-submenu-title {
-        display: flex;
-        align-items: center;
-        padding: var(--om-space-14) !important;
-        height: auto !important;
-        margin-bottom: 0;
-        margin-top: 0;
-        border-radius: var(--om-radius-xl);
-
-        &.ant-menu-item-selected {
-          background: @selected-color;
-          color: var(--tw-color-text-white);
-
-          .ant-menu-title-content {
-            line-height: 16px;
-            font-weight: var(--om-font-weight-medium);
-          }
-
-          .anticon {
-            color: inherit;
-          }
-        }
-
-        &.ant-menu-item-active:not(.ant-menu-item-selected) {
-          background: @hover-color;
-        }
-
-        .ant-menu-title-content {
-          line-height: 16px;
-          font-weight: var(--om-font-weight-medium);
-        }
-
-        .left-panel-label {
-          font-weight: var(--om-font-weight-medium);
-          color: inherit;
-        }
-      }
-    }
-
-    .ant-menu-item {
-      display: flex;
-      align-items: center;
-      padding: var(--om-space-14) !important;
-      height: auto !important;
-      margin-bottom: var(--om-space-8);
-      margin-top: 0;
-      border-radius: var(--om-radius-xl);
-
-      &.ant-menu-item-active:not(.ant-menu-item-selected) {
-        background: @hover-color;
-
-        .anticon {
-          color: @active-color;
-        }
-
-        .ant-menu-title-content {
-          .left-panel-label {
-            color: @active-color;
-          }
-        }
-      }
-
-      .ant-menu-title-content {
-        line-height: 16px;
-        font-weight: var(--om-font-weight-medium);
-      }
-
-      .left-panel-label {
-        font-weight: var(--om-font-weight-medium);
-        color: inherit;
-      }
-
-      a {
-        line-height: 20px;
-        font-size: var(--om-font-size-sm);
-        font-weight: var(--om-font-weight-medium);
-
-        a:hover {
-          color: @active-color;
-        }
-      }
-
-      &.ant-menu-item-selected {
-        background-color: @selected-color;
-        color: var(--tw-color-text-white);
-
-        svg {
-          fill: transparent;
-        }
-
-        a,
-        a:hover {
-          color: var(--tw-color-text-white);
-          font-weight: var(--om-font-weight-semibold);
-          line-height: 20px;
-          font-size: var(--om-font-size-sm);
-        }
-      }
-    }
-
-    .ant-menu-item-selected::after {
-      content: '';
-      border: none;
-    }
-  }
-
-  .anticon {
-    line-height: 0 !important;
-    font-size: @left-sidebar-icon-size !important;
-
-    svg {
-      fill: transparent;
-    }
-  }
-
-  .ant-menu-submenu.ant-menu-submenu-open {
-    border-width: 0px 1px 1px 1px;
-    border-style: solid;
-    border-color: @primary-4;
-    color: var(--tw-color-text-white);
-    border-radius: var(--om-radius-xl);
-    overflow: hidden;
-
-    .ant-menu-submenu-title {
-      background-color: @active-color;
-      font-weight: var(--om-font-weight-semibold);
-      line-height: 20px;
-      font-size: var(--om-font-size-sm);
-      border-radius: var(--om-radius-xl) var(--om-radius-xl) 0 0 !important;
-      color: var(--tw-color-text-white);
-      padding: var(--om-space-14) !important;
-
-      .ant-menu-title-content {
-        font-weight: var(--om-font-weight-medium);
-        line-height: 16px;
-      }
-
-      &:hover {
-        .left-panel-label {
-          color: @active-color;
-        }
-      }
-
-      .ant-menu-title-content {
-        line-height: 16px;
-
-        .left-panel-label {
-          color: var(--tw-color-text-white);
-          font-weight: var(--om-font-weight-semibold);
-          line-height: 20px;
-          font-size: var(--om-font-size-sm);
-        }
-      }
-
-      .ant-menu-submenu-arrow {
-        color: var(--tw-color-text-white);
-      }
-    }
-
-    .ant-menu.ant-menu-sub.ant-menu-inline {
-      border-radius: var(--om-radius-xl);
-
-      .ant-menu-item {
-        margin: 0;
-        padding: var(--om-space-10) var(--om-space-16) !important;
-        border-radius: 0;
-        width: calc(100% - 0.01px);
-
-        .anticon {
-          font-size: @left-sidebar-icon-size !important;
-        }
-
-        &:last-child {
-          border-radius: 0 0 var(--om-radius-xl) var(--om-radius-xl);
-        }
-      }
-    }
-  }
-
-  .ant-menu-submenu {
-    width: 100%;
-    border-radius: var(--om-radius-xl);
-    margin-bottom: var(--om-space-8);
-    padding-bottom: 0 !important;
-
-    &.ant-menu-submenu-selected:not(.ant-menu-submenu-open) {
-      color: @active-color;
-
-      .ant-menu-submenu-title {
-        background: @active-color;
-        color: var(--tw-color-text-white);
-        border-radius: var(--om-radius-xl);
-
-        .ant-menu-submenu-arrow {
-          color: var(--tw-color-text-white);
-        }
-      }
-    }
-  }
-
-  .ant-menu-submenu > .ant-menu-submenu-title {
-    display: flex;
-    align-items: center;
-    padding: var(--om-space-14) !important;
-    height: auto !important;
-    line-height: 0 !important;
-    margin-bottom: 0;
-    margin-top: 0;
-    border-radius: var(--om-radius-xl);
-
-    .ant-menu-title-content {
-      .anticon {
-        font-size: @left-sidebar-icon-size !important;
-      }
-    }
-  }
-
-  .ant-menu-sub {
-    .ant-menu-item {
-      display: flex;
-      align-items: center;
-    }
-  }
-}
-
 .left-sidebar-layout {
   height: calc(
     100vh - @layout-header-height
@@ -335,3 +60,7 @@
     flex-shrink: 0;
   }
 }
+
+.sidebar-collapsed .logo-container {
+  padding: 0 var(--om-space-16);
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/CuratedAssetsWidget/CuratedAssetsWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/CuratedAssetsWidget/CuratedAssetsWidget.tsx
index 5dfe468b9346..effa4666ea9a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/CuratedAssetsWidget/CuratedAssetsWidget.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/CuratedAssetsWidget/CuratedAssetsWidget.tsx
@@ -15,7 +15,6 @@ import { Grid, Typography } from '@openmetadata/ui-core-components';
 
 import { AxiosError } from 'axios';
 import { get, isEmpty } from 'lodash';
-import { MenuInfo } from 'rc-menu/lib/interface';
 import { lazy, useCallback, useEffect, useMemo, useState } from 'react';
 import { Layout } from 'react-grid-layout';
 import { useTranslation } from 'react-i18next';
@@ -256,9 +255,9 @@ const CuratedAssetsWidgetContent = ({
   };
 
   const handleSortByClick = useCallback(
-    (e: MenuInfo) => {
+    (key: string) => {
       if (!isEditView) {
-        setSelectedSortBy(e.key);
+        setSelectedSortBy(key);
 
         return;
       }
@@ -271,7 +270,7 @@ const CuratedAssetsWidgetContent = ({
         const updatedLayout = hasCurrentCuratedAssets
           ? currentLayout?.map((layout: WidgetConfig) =>
               layout.i === widgetKey
-                ? { ...layout, config: { ...layout.config, sortBy: e.key } }
+                ? { ...layout, config: { ...layout.config, sortBy: key } }
                 : layout
             )
           : [
@@ -281,7 +280,7 @@ const CuratedAssetsWidgetContent = ({
                 i: widgetKey,
                 config: {
                   ...CURATED_ASSETS_WIDGET_DEFAULT_VALUES.config,
-                  sortBy: e.key,
+                  sortBy: key,
                 },
               },
             ];
@@ -455,7 +454,7 @@ const CuratedAssetsWidgetContent = ({
         }
         widgetKey={widgetKey}
         onEditClick={handleModalOpen}
-        onSortChange={(key: string) => handleSortByClick({ key } as MenuInfo)}
+        onSortChange={handleSortByClick}
         onTitleClick={handleTitleClick}
       />
     ),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx
index 68c0b7161039..44ae9b0f6898 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx
@@ -12,16 +12,17 @@
  */
 
 import {
+  Alert,
   Button,
   ButtonUtility,
+  Dot,
   Dropdown,
   Popover,
   PopoverTrigger,
   Tooltip as CoreTooltip,
   Tooltip,
 } from '@openmetadata/ui-core-components';
-import { Alert, Badge } from 'antd';
-import { Header } from 'antd/lib/layout/layout';
+import { RefreshCw01 } from '@openmetadata/ui-core-components/icons';
 import { AxiosError } from 'axios';
 import { CookieStorage } from 'cookie-storage';
 import { startCase, upperCase } from 'lodash';
@@ -39,7 +40,6 @@ import { useNavigate } from 'react-router-dom';
 import { ReactComponent as DropDownIcon } from '../../assets/svg/drop-down.svg';
 import { ReactComponent as IconBell } from '../../assets/svg/ic-alert-bell.svg';
 import { ReactComponent as Help } from '../../assets/svg/ic-help.svg';
-import { ReactComponent as RefreshIcon } from '../../assets/svg/ic-refresh.svg';
 import { ReactComponent as SidebarCollapsedIcon } from '../../assets/svg/ic-sidebar-collapsed.svg';
 import { ReactComponent as SidebarExpandedIcon } from '../../assets/svg/ic-sidebar-expanded.svg';
 import {
@@ -562,7 +562,9 @@ const NavBar = () => {
       showVersionMissMatchAlert ? (
         <Alert
           showIcon
-          action={
+          className="refresh-alert slide-in-top"
+          icon={RefreshCw01}
+          rightContent={
             <Button
               color="link-color"
               size="xs"
@@ -572,19 +574,17 @@ const NavBar = () => {
               {t('label.refresh')}
             </Button>
           }
-          className="refresh-alert slide-in-top"
-          description="For a seamless experience recommend you to refresh the page"
-          icon={<RefreshIcon />}
-          message="A new version is available"
-          type="info"
-        />
+          title={t('message.new-version-available')}
+          variant="brand">
+          {t('message.refresh-page-recommended')}
+        </Alert>
       ) : null,
     [showVersionMissMatchAlert, navigate, t]
   );
 
   return (
     <>
-      <Header style={headerStyle}>
+      <header className="app-navbar-header" style={headerStyle}>
         <div className="navbar-container">
           <div className="flex-center gap-2">
             <Tooltip arrow placement="right" title={sidebarTooltipTitle}>
@@ -641,11 +641,17 @@ const NavBar = () => {
                 aria-label={t('label.notification-plural')}
                 color="tertiary"
                 iconLeading={
-                  <Badge
-                    dot={hasTaskNotification || hasMentionNotification}
-                    offset={[-3, 3]}>
+                  <span className="tw:relative tw:inline-flex tw:items-center">
                     <IconBell data-testid="task-notifications" width={20} />
-                  </Badge>
+                    {(hasTaskNotification || hasMentionNotification) && (
+                      <Dot
+                        aria-label={t('label.notification-plural')}
+                        className="tw:absolute tw:-right-1 tw:top-0 tw:text-fg-error-primary"
+                        role="img"
+                        size="sm"
+                      />
+                    )}
+                  </span>
                 }
                 size="sm"
               />
@@ -686,7 +692,7 @@ const NavBar = () => {
             <UserProfileIcon />
           </div>
         </div>
-      </Header>
+      </header>
       {versionMismatchAlert}
       {renderAlertCards}
     </>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/nav-bar.less b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/nav-bar.less
index e670d4de6439..2c0e3411f335 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/nav-bar.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/nav-bar.less
@@ -70,35 +70,19 @@
   }
 }
 
-.ant-alert.ant-alert-info.refresh-alert {
-  width: 470px;
-  bottom: 30px;
-  align-items: center;
-  z-index: var(--om-z-9999);
-  margin: 0 auto;
-  box-shadow: 0px 2px 10px var(--om-legacy-color-0-0-0-0-12);
-  border-radius: var(--om-radius-10);
-  border: 1px solid var(--tw-color-bg-primary-solid);
-  background: var(--tw-color-bg-primary-solid);
-  color: var(--tw-color-text-white);
+// Box the antd Layout.Header used to provide before the shell moved to plain elements.
+.app-navbar-header {
+  flex: 0 0 auto;
+  height: @layout-header-height;
+  padding: @layout-header-padding;
+  background: @layout-header-background;
+}
+
+// Placement only: the version alert floats above the page, bottom-centre.
+.refresh-alert {
   position: fixed;
+  bottom: var(--om-space-30);
   left: 50%;
   transform: translateX(-50%);
-
-  .ant-alert-message {
-    color: var(--tw-color-text-white);
-  }
-
-  .ant-alert-description {
-    color: var(--tw-color-gray-400);
-  }
-
-  .ant-alert-content {
-    border-right: 1px solid var(--tw-color-text-white);
-  }
-
-  .ant-btn {
-    font-weight: var(--om-font-weight-bold);
-    color: var(--tw-color-text-white);
-  }
+  z-index: var(--om-z-9999);
 }
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 1777c9ffdf2b..ccb593412e25 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
@@ -12,8 +12,12 @@
  */
 
 import Icon from '@ant-design/icons/lib/components/Icon';
-import { Button, Tabs, Typography } from '@openmetadata/ui-core-components';
-import { Badge, List } from 'antd';
+import {
+  Button,
+  Dot,
+  Tabs,
+  Typography,
+} from '@openmetadata/ui-core-components';
 import { AxiosError } from 'axios';
 import { isEmpty } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
@@ -240,13 +244,7 @@ const NotificationBox = ({
 
   const getTabTitle = (name: string, key: string) => {
     return (
-      <Badge
-        dot={
-          key === NotificationTabsKey.TASK
-            ? hasTaskNotification
-            : hasMentionNotification
-        }
-        offset={[5, 0]}>
+      <span className="tw:relative tw:inline-flex tw:items-center">
         <Icon
           alt="notification-icon"
           className="align-middle m-r-xs"
@@ -254,7 +252,17 @@ const NotificationBox = ({
           style={{ fontSize: '16px' }}
         />
         {name}
-      </Badge>
+        {(key === NotificationTabsKey.TASK
+          ? hasTaskNotification
+          : hasMentionNotification) && (
+          <Dot
+            aria-label={t('label.notification-plural')}
+            className="tw:absolute tw:-right-1 tw:top-0 tw:text-fg-error-primary"
+            role="img"
+            size="sm"
+          />
+        )}
+      </span>
     );
   };
 
@@ -265,10 +273,17 @@ const NotificationBox = ({
           <p>{t('message.no-notification-found')}</p>
         </div>
       ) : (
-        <List
-          className="notification-content-container"
-          dataSource={notificationDropDownList}
-          footer={
+        <div className="notification-content-container">
+          <ul className="tw:m-0 tw:h-50 tw:list-none tw:overflow-y-auto tw:p-0">
+            {notificationDropDownList.map((item, index) => (
+              <li
+                className="notification-dropdown-list-btn cursor-pointer tw:px-4 tw:py-3 tw:border-b tw:border-secondary"
+                key={notifications[index].id}>
+                {item}
+              </li>
+            ))}
+          </ul>
+          <div className="notification-list-footer tw:px-4 tw:py-3">
             <Button className="tw:w-full" color="link-color" href={viewAllPath}>
               <Typography>
                 {t('label.view-entity', {
@@ -276,15 +291,8 @@ const NotificationBox = ({
                 })}
               </Typography>
             </Button>
-          }
-          itemLayout="vertical"
-          renderItem={(item) => (
-            <List.Item className="notification-dropdown-list-btn cursor-pointer">
-              {item}
-            </List.Item>
-          )}
-          size="small"
-        />
+          </div>
+        </div>
       ),
     [notifications, notificationDropDownList, viewAllPath, t]
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx
index b595cba64b0b..a961a0860160 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationFeedCard.component.tsx
@@ -12,7 +12,7 @@
  */
 
 import { Box, Typography } from '@openmetadata/ui-core-components';
-import { List } from 'antd';
+
 import { startCase } from 'lodash';
 import { FC, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -112,34 +112,30 @@ const NotificationFeedCard: FC<NotificationFeedProp> = ({
       className="no-underline"
       to={isMentionNotification ? mentionLink : taskLink}
       onClick={!isMentionNotification ? handleTaskLinkClick : undefined}>
-      <List.Item.Meta
-        avatar={<ProfilePicture name={createdBy} width="32" />}
-        className="m-0"
-        description={
-          <Box
-            inline
-            align="stretch"
-            className="layout-space"
-            data-testid={`notification-item-${entityName}`}
-            direction="col"
-            gap={0}
-            itemClassName="layout-space-item">
-            <Typography
-              as="p"
-              className="m-0"
-              style={{ color: '#37352F', marginBottom: 0 }}>
-              <>{createdBy}</>
-              {isMentionNotification ? mentionContent : taskContent}
-            </Typography>
-            <Typography
-              style={{ color: '#6B7280', marginTop: '8px', fontSize: '12px' }}
-              title={formatDateTime(timestamp)}>
-              {getRelativeTime(timestamp)}
-            </Typography>
-          </Box>
-        }
-        style={{ marginBottom: 0 }}
-      />
+      <Box align="start" className="m-0" gap={4}>
+        <ProfilePicture name={createdBy} width="32" />
+        <Box
+          inline
+          align="stretch"
+          className="layout-space"
+          data-testid={`notification-item-${entityName}`}
+          direction="col"
+          gap={0}
+          itemClassName="layout-space-item">
+          <Typography
+            as="p"
+            className="m-0"
+            style={{ color: '#37352F', marginBottom: 0 }}>
+            <>{createdBy}</>
+            {isMentionNotification ? mentionContent : taskContent}
+          </Typography>
+          <Typography
+            style={{ color: '#6B7280', marginTop: '8px', fontSize: '12px' }}
+            title={formatDateTime(timestamp)}>
+            {getRelativeTime(timestamp)}
+          </Typography>
+        </Box>
+      </Box>
     </Link>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/notification-box.less b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/notification-box.less
index a525d35ef653..4adda09ebe19 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/notification-box.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/notification-box.less
@@ -19,19 +19,12 @@
   border-radius: @card-radius;
   box-shadow: @box-shadow-base;
 
-  .ant-list {
-    .ant-list-footer {
-      border-top: 1px solid var(--om-legacy-color-dce3ec);
-      box-shadow: var(--om-legacy-color-0-0-0-0-04) 0px -4px 4px;
-    }
+  .notification-list-footer {
+    border-top: 1px solid var(--om-legacy-color-dce3ec);
+    box-shadow: var(--om-legacy-color-0-0-0-0-04) 0px -4px 4px;
   }
 }
 
 .notification-content-container {
   min-height: 16rem;
-
-  .ant-spin-nested-loading {
-    height: 200px;
-    overflow-y: scroll;
-  }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx
index 2bf863baaf2f..81d520fd86ea 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx
@@ -11,8 +11,8 @@
  *  limitations under the License.
  */
 
-import { Box, Typography } from '@openmetadata/ui-core-components';
-import { Badge } from 'antd';
+import { Badge, Box, Typography } from '@openmetadata/ui-core-components';
+
 import { useTranslation } from 'react-i18next';
 import { LearningIcon } from '../Learning/LearningIcon/LearningIcon.component';
 import './page-header.less';
@@ -48,10 +48,11 @@ const PageHeader = ({
           {isBeta && (
             <Badge
               className="service-beta-page-header m-l-sm"
-              count={t('label.beta')}
+              color="brand"
               data-testid="beta-badge"
-              size="small"
-            />
+              size="sm">
+              {t('label.beta')}
+            </Badge>
           )}
         </Typography>
         {learningPageId && (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.test.tsx
new file mode 100644
index 000000000000..9d40b89c5d02
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.test.tsx
@@ -0,0 +1,50 @@
+/*
+ *  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 { fireEvent, render, screen } from '@testing-library/react';
+import PaginationComponent from './PaginationComponent';
+
+describe('PaginationComponent', () => {
+  it('hides a single page by default', () => {
+    render(<PaginationComponent pageSize={10} total={10} />);
+
+    expect(screen.queryByRole('navigation')).not.toBeInTheDocument();
+  });
+
+  it('converts records into pages and preserves the callback page size', () => {
+    const onChange = jest.fn();
+    render(
+      <PaginationComponent
+        current={1}
+        pageSize={10}
+        total={25}
+        onChange={onChange}
+      />
+    );
+
+    fireEvent.click(screen.getByTestId('next'));
+
+    expect(onChange).toHaveBeenCalledWith(2, 10);
+    expect(screen.getByText('3')).toBeInTheDocument();
+  });
+
+  it('keeps uncontrolled navigation state', () => {
+    render(<PaginationComponent defaultPageSize={10} total={30} />);
+
+    fireEvent.click(screen.getByTestId('next'));
+
+    expect(screen.getByRole('textbox', { name: /current page/i })).toHaveValue(
+      '2'
+    );
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.tsx
index 61997bed1eae..7d583da1412c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PaginationComponent/PaginationComponent.tsx
@@ -10,78 +10,76 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import Icon from '@ant-design/icons';
-import { Typography } from '@openmetadata/ui-core-components';
-import { Pagination, PaginationProps } from 'antd';
-import { ReactNode } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as ArrowRightOutlined } from '../../assets/svg/arrow-right.svg';
+
+import { PaginationCardWithControls } from '@openmetadata/ui-core-components';
+import { HTMLAttributes, useState } from 'react';
 import {
   PAGE_SIZE_BASE,
   PAGE_SIZE_LARGE,
   PAGE_SIZE_MEDIUM,
 } from '../../constants/constants';
 
-// rc-pagination puts the click handler, focus and aria-disabled on its own <li>
-// and clones this element with `disabled`. It must stay non-interactive so the
-// click reaches the <li>: a react-aria Button would stop the event.
-const PageNavLabel = ({
-  children,
-  disabled,
+interface PaginationComponentProps
+  extends Omit<HTMLAttributes<HTMLDivElement>, 'onChange'> {
+  current?: number;
+  total?: number;
+  pageSize?: number;
+  defaultCurrent?: number;
+  defaultPageSize?: number;
+  hideOnSinglePage?: boolean;
+  showSizeChanger?: boolean;
+  onChange?: (page: number, pageSize: number) => void;
+}
+
+const PaginationComponent = ({
+  current,
+  total = 0,
+  pageSize,
+  defaultCurrent = 1,
+  defaultPageSize = PAGE_SIZE_BASE,
+  hideOnSinglePage = true,
+  showSizeChanger,
+  onChange,
   ...props
-}: {
-  children: ReactNode;
-  disabled?: boolean;
-  'data-testid': string;
-}) => (
-  <Typography
-    {...props}
-    aria-disabled={disabled}
-    className="tw:inline-flex tw:items-center tw:gap-1 tw:px-2"
-    role="button">
-    {children}
-  </Typography>
-);
+}: PaginationComponentProps) => {
+  const [internalPage, setInternalPage] = useState(defaultCurrent);
+  const [internalPageSize, setInternalPageSize] = useState(defaultPageSize);
+  const currentPage = current ?? internalPage;
+  const currentPageSize = pageSize ?? internalPageSize;
+  // Ant Design takes a record count; core pagination takes a page count.
+  const totalPages = Math.max(1, Math.ceil(total / currentPageSize));
 
-const PaginationComponent = (props: PaginationProps) => {
-  const { t } = useTranslation();
-  const itemRender: PaginationProps['itemRender'] = (
-    _,
-    type,
-    originalElement
-  ) => {
-    if (type === 'prev') {
-      return (
-        <PageNavLabel data-testid="previous">
-          <Icon
-            className="pagination-prev-icon"
-            component={ArrowRightOutlined}
-          />
-          {t('label.previous')}
-        </PageNavLabel>
-      );
-    }
-    if (type === 'next') {
-      return (
-        <PageNavLabel data-testid="next">
-          {t('label.next')}
-          <Icon
-            className="pagination-next-icon"
-            component={ArrowRightOutlined}
-          />
-        </PageNavLabel>
-      );
-    }
+  const changePage = (nextPage: number) => {
+    setInternalPage(nextPage);
+    onChange?.(nextPage, currentPageSize);
+  };
 
-    return originalElement;
+  const changePageSize = (nextSize: number) => {
+    // Keep the current page unless a smaller page count makes it unavailable.
+    const nextPage = Math.min(
+      currentPage,
+      Math.max(1, Math.ceil(total / nextSize))
+    );
+    setInternalPageSize(nextSize);
+    setInternalPage(nextPage);
+    onChange?.(nextPage, nextSize);
   };
 
+  if (hideOnSinglePage && totalPages <= 1) {
+    return null;
+  }
+
   return (
-    <Pagination
-      hideOnSinglePage
-      itemRender={itemRender}
-      pageSizeOptions={[PAGE_SIZE_BASE, PAGE_SIZE_MEDIUM, PAGE_SIZE_LARGE]}
+    <PaginationCardWithControls
       {...props}
+      page={currentPage}
+      pageSize={currentPageSize}
+      pageSizeOptions={[PAGE_SIZE_BASE, PAGE_SIZE_MEDIUM, PAGE_SIZE_LARGE]}
+      total={totalPages}
+      onPageChange={changePage}
+      onPageSizeChange={
+        showSizeChanger ?? total > 50 ? changePageSize : undefined
+      }
     />
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx
index 2dcdbdd11ad9..818a56320509 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx
@@ -16,10 +16,10 @@ import {
   Card,
   EmptyPlaceholder,
   Grid,
+  Tree,
   Typography,
 } from '@openmetadata/ui-core-components';
 import { ClockRewind } from '@openmetadata/ui-core-components/icons';
-import Tree from 'antd/lib/tree';
 import { isEmpty } from 'lodash';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -28,6 +28,7 @@ import {
   PipelineStatus,
   Task,
 } from '../../../../generated/entity/data/pipeline';
+import { TreeNode } from '../../../../interface/tree.interface';
 import { getLayoutGutter } from '../../../../utils/common/layout.utils';
 import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils';
 import { getTreeData, getTreeViewData } from '../../../../utils/executionUtils';
@@ -60,6 +61,25 @@ const TreeViewTab = ({
 
   const { t } = useTranslation();
 
+  const renderNode = (
+    node: TreeNode,
+    showGuideLines: boolean
+  ): React.ReactNode => (
+    <Tree.Item id={node.key} key={node.key} textValue={String(node.key)}>
+      <Tree.ItemContent
+        className="tw:min-h-9"
+        indentPerLevel={showGuideLines ? 22 : 0}
+        showExpandIcon={false}
+        showGuideLines={showGuideLines}>
+        {node.icon}
+        {node.title}
+      </Tree.ItemContent>
+      {node.children?.map((child) => renderNode(child, showGuideLines))}
+    </Tree.Item>
+  );
+  const expandedKeys = (nodes: TreeNode[]): (string | number)[] =>
+    nodes.flatMap((node) => [node.key, ...expandedKeys(node.children ?? [])]);
+
   return (
     <Card>
       <Card.Content>
@@ -95,21 +115,19 @@ const TreeViewTab = ({
           <Grid className="layout-row layout-grid w-full">
             <Grid.Item className="layout-column" span={12}>
               <Tree
-                defaultExpandAll
-                showIcon
-                showLine={{ showLeafIcon: false }}
-                switcherIcon={<></>}
-                treeData={treeLabelList}
-              />
+                aria-label={t('label.task-plural')}
+                defaultExpandedKeys={expandedKeys(treeLabelList)}
+                selectionMode="none">
+                {treeLabelList.map((node) => renderNode(node, true))}
+              </Tree>
             </Grid.Item>
             <Grid.Item className="layout-column" span={12}>
               <Tree
-                defaultExpandAll
-                showIcon
-                className="tree-without-indent"
-                switcherIcon={<></>}
-                treeData={treeDataList}
-              />
+                aria-label={t('label.task-plural')}
+                defaultExpandedKeys={expandedKeys(treeDataList)}
+                selectionMode="none">
+                {treeDataList.map((node) => renderNode(node, false))}
+              </Tree>
             </Grid.Item>
           </Grid>
         )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/tree-view-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/tree-view-tab.less
index 503b1569d7cc..f5977cf30dc6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/tree-view-tab.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/tree-view-tab.less
@@ -23,14 +23,3 @@
   border-radius: var(--om-radius-md);
   border: 6px solid var(--om-legacy-color-cccccc);
 }
-
-.tree-without-indent {
-  .ant-tree-indent {
-    display: none;
-  }
-}
-
-.tree-without-indent .ant-tree-treenode {
-  width: 100%;
-  overflow-x: hidden;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx
index 92bc4571c914..ac8ff2b52b0f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.component.tsx
@@ -12,6 +12,7 @@
  */
 import Icon from '@ant-design/icons';
 import {
+  BadgeWithDot,
   Button,
   ButtonUtility,
   Popover,
@@ -19,7 +20,6 @@ import {
   SimpleModal,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Badge } from 'antd';
 import { AxiosError } from 'axios';
 import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -259,7 +259,7 @@ const ProfileSectionUserDetailsCard = ({
             aria-label={t('label.manage-entity', {
               entity: t('label.profile'),
             })}
-            className="user-details-menu-icon tw:p-0"
+            className="user-details-menu-icon"
             color="tertiary"
             data-testid="user-profile-manage-btn"
             icon={<MenuDots height={24} width={24} />}
@@ -290,11 +290,11 @@ const ProfileSectionUserDetailsCard = ({
         {userEmailRender}
         {onlineStatus && (
           <div className="m-t-sm">
-            <Badge
-              data-testid="user-online-status"
-              status={onlineStatus.status}
-              text={onlineStatus.text}
-            />
+            <span data-testid="user-online-status">
+              <BadgeWithDot color="success" size="sm">
+                {onlineStatus.text}
+              </BadgeWithDot>
+            </span>
           </div>
         )}
       </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.test.tsx
index 1b3a8ff64394..b5caeb8131f9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfileCard/ProfileSectionUserDetailsCard.test.tsx
@@ -238,9 +238,9 @@ describe('ProfileSectionUserDetailsCard', () => {
         '[data-testid="user-online-status"]'
       );
 
-      const statusDot = badge?.querySelector('.ant-badge-status-dot');
+      const statusDot = badge?.querySelector('svg');
 
-      expect(statusDot).toHaveClass('ant-badge-status-success');
+      expect(statusDot).toHaveClass('tw:text-utility-success-500');
     });
 
     it('should be positioned below the email', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.test.tsx
index d2f47965c8c8..c390ba75790f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.test.tsx
@@ -292,9 +292,10 @@ describe('EntitySearchSettings', () => {
       );
     });
 
-    fireEvent.change(screen.getByRole('spinbutton'), {
-      target: { value: '' },
-    });
+    // The core NumberInput commits an edit on blur.
+    const weightInput = screen.getByRole('textbox', { name: 'label.value' });
+    fireEvent.change(weightInput, { target: { value: '' } });
+    fireEvent.blur(weightInput);
 
     const { handleSaveChanges } = getLastSearchPreviewProps();
 
@@ -355,9 +356,11 @@ describe('EntitySearchSettings', () => {
     expect(screen.getByTestId('ranking-stage-unnamed-0')).toBeInTheDocument();
     expect(screen.getByTestId('ranking-stage-unnamed-1')).toBeInTheDocument();
 
-    fireEvent.change(screen.getAllByRole('spinbutton')[1], {
-      target: { value: '' },
-    });
+    const stageWeightInput = screen.getAllByRole('textbox', {
+      name: 'label.value',
+    })[1];
+    fireEvent.change(stageWeightInput, { target: { value: '' } });
+    fireEvent.blur(stageWeightInput);
 
     const { handleSaveChanges } = getLastSearchPreviewProps();
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.tsx
index 0289c9967bc1..6960d8fbc6f9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/EntitySearchSettings.tsx
@@ -12,14 +12,18 @@
  */
 import Icon from '@ant-design/icons/lib/components/Icon';
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
   Badge,
   Box,
   Grid,
+  NumberInput,
   Select,
   Toggle,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Collapse, InputNumber } from 'antd';
 import { AxiosError } from 'axios';
 import { isEmpty, omit, startCase } from 'lodash';
 import { useEffect, useMemo, useState } from 'react';
@@ -726,13 +730,14 @@ const EntitySearchSettings = () => {
             <Typography className="text-xs font-normal" color="secondary">
               {t('label.weight')}
             </Typography>
-            <InputNumber
-              min={1}
-              value={stage.weight ?? null}
+            <NumberInput
+              aria-label={t('label.value')}
+              minValue={1}
+              value={stage.weight ?? Number.NaN}
               onChange={(value) =>
                 handleRankingStageWeightChange(
                   stageIndex,
-                  typeof value === 'number' ? value : null
+                  Number.isNaN(value) ? null : value
                 )
               }
             />
@@ -859,13 +864,14 @@ const EntitySearchSettings = () => {
                 <Typography className="text-xs font-normal" color="secondary">
                   {t('label.max')}
                 </Typography>
-                <InputNumber
-                  min={0.1}
+                <NumberInput
+                  aria-label={t('label.value')}
+                  minValue={0.1}
                   step={0.1}
-                  value={signals.maxBoost}
+                  value={signals.maxBoost ?? Number.NaN}
                   onChange={(value) =>
                     handleRankingSignalMaxBoostChange(
-                      typeof value === 'number' ? value : null
+                      Number.isNaN(value) ? null : value
                     )
                   }
                 />
@@ -926,149 +932,161 @@ const EntitySearchSettings = () => {
             maxWidth: '33.33333333333333%',
             flex: '0 0 33.33333333333333%',
           }}>
-          <Collapse
-            accordion
-            activeKey={activeKey}
-            bordered={false}
+          <Accordion
             className="w-full entity-collapse-container"
-            onChange={handleCollapseChange}>
-            <Collapse.Panel
-              header={
+            expandedKeys={new Set([activeKey].filter(Boolean))}
+            onExpandedChange={(keys) =>
+              handleCollapseChange([...keys].map(String))
+            }>
+            <AccordionItem id="ranking" key="ranking">
+              <AccordionHeader className="tw:flex-row-reverse">
                 <Typography className="text-md font-semibold">
                   {t('label.ranking-detail-plural')}
                 </Typography>
-              }
-              key="ranking">
-              <div className="bg-white border-radius-card p-box configuration-container ranking-configuration-container">
-                {renderRankingSettings()}
-              </div>
-            </Collapse.Panel>
-            <Collapse.Panel
-              header={
-                <CollapseHeader
-                  dataTestId="add-field-btn"
-                  menuItems={menuItems}
-                  title={t('label.matching-fields')}
-                />
-              }
-              key="1">
-              <div className="bg-white configuration-container">
-                <Box
-                  className="layout-row p-y-xs"
-                  data-testid="field-configurations"
-                  wrap="wrap">
-                  {entitySearchFields.map(
-                    (
-                      field: {
-                        fieldName: string;
-                        weight: number;
-                        matchType?: MatchType;
-                      },
-                      index: number
-                    ) => (
-                      <Box
-                        className="layout-column tw:block m-b-sm"
-                        key={field.fieldName}
-                        style={{ maxWidth: '100%', flex: '0 0 100%' }}>
-                        <FieldConfiguration
-                          entityFields={entityFields}
-                          field={field}
-                          index={index}
-                          initialOpen={field.fieldName === lastAddedSearchField}
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className="bg-white border-radius-card p-box configuration-container ranking-configuration-container">
+                  {renderRankingSettings()}
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+            <AccordionItem id="1" key="1">
+              <CollapseHeader
+                dataTestId="add-field-btn"
+                menuItems={menuItems}
+                title={
+                  <AccordionHeader>
+                    {t('label.matching-fields')}
+                  </AccordionHeader>
+                }
+              />
+              <AccordionPanel>
+                <div className="bg-white configuration-container">
+                  <Box
+                    className="layout-row p-y-xs"
+                    data-testid="field-configurations"
+                    wrap="wrap">
+                    {entitySearchFields.map(
+                      (
+                        field: {
+                          fieldName: string;
+                          weight: number;
+                          matchType?: MatchType;
+                        },
+                        index: number
+                      ) => (
+                        <Box
+                          className="layout-column tw:block m-b-sm"
                           key={field.fieldName}
-                          searchSettings={searchSettings}
-                          onDeleteSearchField={handleDeleteSearchField}
-                          onFieldWeightChange={handleFieldWeightChange}
-                          onHighlightFieldsChange={handleHighlightFieldsChange}
-                          onMatchTypeChange={handleMatchTypeChange}
-                        />
-                      </Box>
-                    )
-                  )}
-                  {/* Score Mode and Boost Mode Section */}
-                  <Box className="layout-column flex flex-col w-full">
-                    <div className="p-y-xs p-x-sm border-radius-card m-b-sm bg-white config-section-content">
-                      <Typography
-                        className="text-xs font-normal"
-                        color="secondary">
-                        {t('label.score-mode')}
-                      </Typography>
-                      <Select
-                        aria-label={t('label.score-mode')}
-                        data-testid="score-mode-select"
-                        items={scoreModeOptions}
-                        value={searchSettings.scoreMode ?? null}
-                        onChange={(key) =>
-                          handleModeUpdate('scoreMode', key as ScoreMode)
-                        }>
-                        {(item) => (
-                          <Select.Item id={item.id} label={item.label} />
-                        )}
-                      </Select>
-                    </div>
-                    <div className="p-y-xs p-x-sm border-radius-card m-b-sm bg-white config-section-content">
-                      <Typography
-                        className="text-xs font-normal"
-                        color="secondary">
-                        {t('label.boost-mode')}
-                      </Typography>
-                      <Select
-                        aria-label={t('label.boost-mode')}
-                        data-testid="boost-mode-select"
-                        items={boostModeOptions}
-                        value={searchSettings.boostMode ?? null}
-                        onChange={(key) =>
-                          handleModeUpdate('boostMode', key as BoostMode)
-                        }>
-                        {(item) => (
-                          <Select.Item id={item.id} label={item.label} />
-                        )}
-                      </Select>
-                    </div>
+                          style={{ maxWidth: '100%', flex: '0 0 100%' }}>
+                          <FieldConfiguration
+                            entityFields={entityFields}
+                            field={field}
+                            index={index}
+                            initialOpen={
+                              field.fieldName === lastAddedSearchField
+                            }
+                            key={field.fieldName}
+                            searchSettings={searchSettings}
+                            onDeleteSearchField={handleDeleteSearchField}
+                            onFieldWeightChange={handleFieldWeightChange}
+                            onHighlightFieldsChange={
+                              handleHighlightFieldsChange
+                            }
+                            onMatchTypeChange={handleMatchTypeChange}
+                          />
+                        </Box>
+                      )
+                    )}
+                    {/* Score Mode and Boost Mode Section */}
+                    <Box className="layout-column flex flex-col w-full">
+                      <div className="p-y-xs p-x-sm border-radius-card m-b-sm bg-white config-section-content">
+                        <Typography
+                          className="text-xs font-normal"
+                          color="secondary">
+                          {t('label.score-mode')}
+                        </Typography>
+                        <Select
+                          aria-label={t('label.score-mode')}
+                          data-testid="score-mode-select"
+                          items={scoreModeOptions}
+                          value={searchSettings.scoreMode ?? null}
+                          onChange={(key) =>
+                            handleModeUpdate('scoreMode', key as ScoreMode)
+                          }>
+                          {(item) => (
+                            <Select.Item id={item.id} label={item.label} />
+                          )}
+                        </Select>
+                      </div>
+                      <div className="p-y-xs p-x-sm border-radius-card m-b-sm bg-white config-section-content">
+                        <Typography
+                          className="text-xs font-normal"
+                          color="secondary">
+                          {t('label.boost-mode')}
+                        </Typography>
+                        <Select
+                          aria-label={t('label.boost-mode')}
+                          data-testid="boost-mode-select"
+                          items={boostModeOptions}
+                          value={searchSettings.boostMode ?? null}
+                          onChange={(key) =>
+                            handleModeUpdate('boostMode', key as BoostMode)
+                          }>
+                          {(item) => (
+                            <Select.Item id={item.id} label={item.label} />
+                          )}
+                        </Select>
+                      </div>
+                    </Box>
                   </Box>
-                </Box>
-              </div>
-            </Collapse.Panel>
-            <Collapse.Panel
-              header={
-                <CollapseHeader
-                  dataTestId="add-term-boost-btn"
-                  handleAddNewBoost={handleAddNewTermBoost}
-                  title={t('label.term-boost')}
-                />
-              }
-              key="2">
-              <div className="bg-white border-radius-card p-box configuration-container">
-                <TermBoostList
-                  className="flex-column justify-center"
-                  handleDeleteTermBoost={handleDeleteTermBoost}
-                  handleTermBoostChange={handleTermBoostChange}
-                  showNewTermBoost={showNewTermBoost}
-                  termBoosts={searchSettings.termBoosts ?? []}
-                />
-              </div>
-            </Collapse.Panel>
-            <Collapse.Panel
-              header={
-                <CollapseHeader
-                  dataTestId="add-field-value-boost-btn"
-                  handleAddNewBoost={handleAddNewFieldValueBoost}
-                  title={t('label.field-value-boost')}
-                />
-              }
-              key="3">
-              <div className="bg-white border-radius-card p-box configuration-container">
-                <FieldValueBoostList
-                  entitySearchSettingsPage
-                  dataTestId="entity-field-value-boost-table"
-                  fieldValueBoosts={searchSettings.fieldValueBoosts ?? []}
-                  handleDeleteFieldValueBoost={handleDeleteFieldValueBoost}
-                  handleEditFieldValueBoost={handleEditFieldValueBoost}
-                  isLoading={false}
-                />
-              </div>
-            </Collapse.Panel>
-          </Collapse>
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+            <AccordionItem id="2" key="2">
+              <CollapseHeader
+                dataTestId="add-term-boost-btn"
+                handleAddNewBoost={handleAddNewTermBoost}
+                title={
+                  <AccordionHeader>{t('label.term-boost')}</AccordionHeader>
+                }
+              />
+              <AccordionPanel>
+                <div className="bg-white border-radius-card p-box configuration-container">
+                  <TermBoostList
+                    className="flex-column justify-center"
+                    handleDeleteTermBoost={handleDeleteTermBoost}
+                    handleTermBoostChange={handleTermBoostChange}
+                    showNewTermBoost={showNewTermBoost}
+                    termBoosts={searchSettings.termBoosts ?? []}
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+            <AccordionItem id="3" key="3">
+              <CollapseHeader
+                dataTestId="add-field-value-boost-btn"
+                handleAddNewBoost={handleAddNewFieldValueBoost}
+                title={
+                  <AccordionHeader>
+                    {t('label.field-value-boost')}
+                  </AccordionHeader>
+                }
+              />
+              <AccordionPanel>
+                <div className="bg-white border-radius-card p-box configuration-container">
+                  <FieldValueBoostList
+                    entitySearchSettingsPage
+                    dataTestId="entity-field-value-boost-table"
+                    fieldValueBoosts={searchSettings.fieldValueBoosts ?? []}
+                    handleDeleteFieldValueBoost={handleDeleteFieldValueBoost}
+                    handleEditFieldValueBoost={handleEditFieldValueBoost}
+                    isLoading={false}
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          </Accordion>
         </Box>
         <Box
           className="layout-column bg-white border-radius-card p-box h-full d-flex flex-column preview-section"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/entity-search-settings.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/entity-search-settings.less
index 385b13e3b476..d2d687da94a2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/entity-search-settings.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/EntitySeachSettings/entity-search-settings.less
@@ -68,34 +68,6 @@
 
 .entity-collapse-container {
   width: 100%;
-
-  .ant-collapse-item {
-    margin-bottom: var(--om-space-16);
-    border: 1px solid @border-color-5;
-    border-radius: var(--om-radius-xl);
-    overflow: hidden;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    > .ant-collapse-header {
-      background-color: var(--tw-color-bg-primary);
-      padding: var(--om-space-16);
-      display: flex;
-      align-items: center;
-
-      .ant-collapse-header-text {
-        width: 100%;
-      }
-    }
-
-    > .ant-collapse-content {
-      > .ant-collapse-content-box {
-        padding: 0;
-      }
-    }
-  }
 }
 
 .ranking-configuration-container {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.test.tsx
index f953bada85cf..502e10bd89ac 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.test.tsx
@@ -64,6 +64,18 @@ describe('FieldConfiguration', () => {
     );
   });
 
+  it('Should mount the field controls only while the panel is expanded', () => {
+    render(<FieldConfiguration {...mockProps} />);
+
+    expect(
+      screen.queryByTestId('highlight-field-switch')
+    ).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByTestId('field-container-header'));
+
+    expect(screen.getByTestId('highlight-field-switch')).toBeInTheDocument();
+  });
+
   it('Should handle highlight fields toggle', () => {
     render(<FieldConfiguration {...mockProps} />);
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.tsx
index 126f42f12173..90a2109194d6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/FieldConfiguration.tsx
@@ -12,15 +12,21 @@
  */
 import Icon from '@ant-design/icons';
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+  Badge,
+  Box,
   Button,
   Divider,
   Select,
+  Slider,
   Toggle,
   Tooltip,
   TooltipTrigger,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Badge, Collapse, Slider } from 'antd';
 import { MouseEvent, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ReactComponent as Delete } from '../../../assets/svg/delete-colored.svg';
@@ -56,7 +62,7 @@ const FieldConfiguration: React.FC<FieldConfigurationProps> = ({
   // Only analyzed text fields can be highlighted. The server derives this from the index mapping
   // and rejects a save that targets a flattened or non-indexed path, so offering the toggle here
   // would only produce a 400 the admin cannot act on.
-  const isHighlightAllowed = entityFieldConfig?.highlight ?? false;
+  const isHighlightAllowed = Boolean(entityFieldConfig?.highlight);
 
   useEffect(() => {
     // If initialOpen is true, open this panel automatically
@@ -93,136 +99,151 @@ const FieldConfiguration: React.FC<FieldConfigurationProps> = ({
   ];
 
   return (
-    <Collapse
-      activeKey={activeFieldKeys[index] || []}
-      bordered={false}
+    <Accordion
+      allowsMultipleExpanded
       data-field-name={field.fieldName}
+      expandedKeys={new Set(activeFieldKeys[index] ?? [])}
       key={index}
-      onChange={(key) => handleCollapseChange(key, index)}>
-      <Collapse.Panel
-        className=" custom-panel m-b-md"
+      onExpandedChange={(keys) =>
+        ((key) => handleCollapseChange(key, index))([...keys].map(String))
+      }>
+      <AccordionItem
+        className="custom-panel m-b-md"
         data-testid={`field-configuration-panel-${field.fieldName}`}
-        header={
-          <div
-            className="field-container-header"
-            data-testid="field-container-header"
-            style={{
-              backgroundColor: activeFieldKeys[index]?.includes(String(index))
-                ? '#F5FAFF'
-                : 'white',
-            }}>
-            <div className="d-flex items-center justify-between">
-              <div className="d-flex items-center gap-2">
-                <Typography data-testid="field-name">
-                  {field.fieldName}
-                </Typography>
-                {field.fieldName.startsWith('extension.') && (
-                  <Badge
-                    className="custom-property-badge"
-                    color="blue"
-                    count={t('label.custom')}
-                    data-testid="custom-property-badge"
-                  />
-                )}
-              </div>
-              <Button
-                aria-label={t('label.delete')}
-                color="secondary"
-                data-testid="delete-search-field"
-                iconLeading={<Icon component={Delete} />}
-                onClick={(e: MouseEvent) => {
-                  e.stopPropagation();
-                  onDeleteSearchField(field.fieldName);
-                }}
-              />
+        id={String(String(index))}
+        key={String(index)}>
+        <Box align="start" className="tw:relative" gap={2}>
+          <div className="tw:min-w-0 tw:flex-1">
+            <AccordionHeader
+              className="tw:group-data-expanded/item:bg-brand-primary_alt"
+              showChevron={false}>
+              <Box className="tw:w-full">
+                <div
+                  className="field-container-header"
+                  data-testid="field-container-header">
+                  <div className="d-flex items-center justify-between">
+                    <div className="d-flex items-center gap-2">
+                      <Typography data-testid="field-name">
+                        {field.fieldName}
+                      </Typography>
+                      {field.fieldName.startsWith('extension.') && (
+                        <Badge
+                          className="custom-property-badge"
+                          color="brand"
+                          data-testid="custom-property-badge"
+                          size="sm">
+                          {t('label.custom')}
+                        </Badge>
+                      )}
+                    </div>
+                  </div>
+
+                  <div className="d-flex items-center justify-between gap-2 m-y-xss">
+                    <span className="text-grey-muted text-xs font-normal">
+                      {fieldDescription ?? t('label.no-description')}
+                    </span>
+                    <span
+                      className="p-x-xs font-semibold text-primary d-flex items-center field-weightage"
+                      data-testid="field-weight">
+                      <Icon className="text-md" component={FilterIcon} />
+                      {fieldWeight < 10 ? `0${fieldWeight}` : fieldWeight}
+                    </span>
+                  </div>
+                </div>
+              </Box>
+            </AccordionHeader>
+          </div>
+          <Box className="tw:absolute tw:end-3 tw:top-3">
+            <Button
+              aria-label={t('label.delete')}
+              color="secondary"
+              data-testid="delete-search-field"
+              iconLeading={<Icon component={Delete} />}
+              onClick={(e: MouseEvent) => {
+                e.stopPropagation();
+                onDeleteSearchField(field.fieldName);
+              }}
+            />
+          </Box>
+        </Box>
+        {/* An entity lists a dozen or more fields, each with a slider and three
+            selects; mount them only while the panel is open, as antd did. */}
+        <AccordionPanel unmountOnCollapse>
+          <Divider className="m-0" />
+          <div className="m-y-sm" style={{ padding: '10px' }}>
+            {/* Highlight Fields Section */}
+            <div className="m-y-md m-b-lg d-flex items-center justify-between">
+              <Typography>{t('label.highlight-field-plural')}</Typography>
+              {isHighlightAllowed ? (
+                <Toggle
+                  className="m-l-xlg"
+                  data-testid="highlight-field-switch"
+                  isSelected={
+                    searchSettings?.highlightFields?.includes(
+                      field.fieldName
+                    ) ?? false
+                  }
+                  size="sm"
+                  onChange={() => onHighlightFieldsChange(field.fieldName)}
+                />
+              ) : (
+                <Tooltip
+                  placement="top"
+                  title={t('message.field-cannot-be-highlighted')}>
+                  <TooltipTrigger>
+                    <Toggle
+                      isDisabled
+                      className="m-l-xlg"
+                      data-testid="highlight-field-switch"
+                      isSelected={false}
+                      size="sm"
+                    />
+                  </TooltipTrigger>
+                </Tooltip>
+              )}
             </div>
+            <Divider className="tw:my-6" />
 
-            <div className="d-flex items-center justify-between gap-2 m-y-xss">
-              <Typography color="secondary" size="text-xs" weight="regular">
-                {fieldDescription ?? t('label.no-description')}
+            {/* Weight Section */}
+            <div className="m-y-md m-b-lg d-flex items-center justify-between">
+              <Typography>{t('label.weight')}</Typography>
+              <Typography
+                className="font-semibold field-weightage-text"
+                data-testid="field-weight-value">
+                {fieldWeight}
               </Typography>
-              <span
-                className="p-x-xs font-semibold text-primary d-flex items-center field-weightage"
-                data-testid="field-weight">
-                <Icon className="text-md" component={FilterIcon} />
-                {fieldWeight < 10 ? `0${fieldWeight}` : fieldWeight}
-              </span>
             </div>
-          </div>
-        }
-        key={String(index)}
-        showArrow={false}>
-        <Divider className="m-0" />
-        <div className="m-y-sm" style={{ padding: '10px' }}>
-          {/* Highlight Fields Section */}
-          <div className="m-y-md m-b-lg d-flex items-center justify-between">
-            <Typography>{t('label.highlight-field-plural')}</Typography>
-            {isHighlightAllowed ? (
-              <Toggle
-                className="m-l-xlg"
-                data-testid="highlight-field-switch"
-                isSelected={
-                  searchSettings?.highlightFields?.includes(field.fieldName) ??
-                  false
+            <div data-testid="field-weight-slider">
+              <Slider
+                aria-label={t('label.value')}
+                maxValue={100}
+                minValue={0}
+                step={0.1}
+                value={fieldWeight}
+                onChange={(value) =>
+                  handleWeightChange(Array.isArray(value) ? value[0] : value)
                 }
-                size="sm"
-                onChange={() => onHighlightFieldsChange(field.fieldName)}
               />
-            ) : (
-              <Tooltip
-                placement="top"
-                title={t('message.field-cannot-be-highlighted')}>
-                <TooltipTrigger>
-                  <Toggle
-                    isDisabled
-                    className="m-l-xlg"
-                    data-testid="highlight-field-switch"
-                    isSelected={false}
-                    size="sm"
-                  />
-                </TooltipTrigger>
-              </Tooltip>
-            )}
-          </div>
-          <Divider className="tw:my-6" />
-
-          {/* Weight Section */}
-          <div className="m-y-md m-b-lg d-flex items-center justify-between">
-            <Typography>{t('label.weight')}</Typography>
-            <Typography
-              className="font-semibold field-weightage-text"
-              data-testid="field-weight-value">
-              {fieldWeight}
-            </Typography>
-          </div>
-          <div data-testid="field-weight-slider">
-            <Slider
-              max={100}
-              min={0}
-              step={0.1}
-              tooltip={{ open: false }}
-              value={fieldWeight}
-              onChange={handleWeightChange}
-            />
-          </div>
-          <Divider className="tw:my-6" />
+            </div>
+            <Divider className="tw:my-6" />
 
-          {/* Match Type Section */}
-          <div className="m-y-md m-b-lg d-flex items-center justify-between">
-            <Typography>{t('label.match-type')}</Typography>
-            <Select
-              aria-label={t('label.match-type')}
-              className="tw:ml-8 tw:w-40"
-              data-testid="match-type-select"
-              items={matchTypeOptions}
-              value={fieldMatchType}
-              onChange={(key) => handleMatchTypeChange(key as MatchType)}>
-              {(item) => <Select.Item id={item.id} label={item.label} />}
-            </Select>
+            {/* Match Type Section */}
+            <div className="m-y-md m-b-lg d-flex items-center justify-between">
+              <Typography>{t('label.match-type')}</Typography>
+              <Select
+                aria-label={t('label.match-type')}
+                className="tw:ml-8 tw:w-40"
+                data-testid="match-type-select"
+                items={matchTypeOptions}
+                value={fieldMatchType}
+                onChange={(key) => handleMatchTypeChange(key as MatchType)}>
+                {(item) => <Select.Item id={item.id} label={item.label} />}
+              </Select>
+            </div>
           </div>
-        </div>
-      </Collapse.Panel>
-    </Collapse>
+        </AccordionPanel>
+      </AccordionItem>
+    </Accordion>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/field-configuration.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/field-configuration.less
index 305f27b3a161..b768df18576f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/field-configuration.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FieldConfiguration/field-configuration.less
@@ -40,21 +40,6 @@
   }
 }
 
-.custom-panel .ant-collapse-header {
-  padding: 0 !important;
-}
-
-.custom-panel .ant-collapse-content-box {
-  padding: 0 var(--om-space-12) !important;
-}
-
-.ant-collapse-borderless {
-  > .ant-collapse-item:last-child {
-    border: 1px solid @border-color-5;
-    border-radius: var(--om-radius-10);
-  }
-}
-
 .boost-option-btn:hover {
   background-color: transparent;
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/AgentsStatusWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/AgentsStatusWidget.tsx
index f7a0a39a26e2..c47c2a5c34fd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/AgentsStatusWidget.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/AgentsStatusWidget.tsx
@@ -12,18 +12,21 @@
  */
 
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
   Box,
   Card,
   Grid,
   Skeleton,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Collapse } from 'antd';
+
 import classNames from 'classnames';
 import { isEmpty } from 'lodash';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as ArrowSvg } from '../../../assets/svg/ic-arrow-down.svg';
 import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum';
 import { getAgentStatusSummary } from '../../../utils/AgentsStatusWidgetPureUtils';
 import {
@@ -68,7 +71,6 @@ const renderAgentStatusExpandIcon = (
       data-testid="agent-status-widget-view-more">
       {t('label.view-more')}
     </Typography>
-    <ArrowSvg className="text-primary" height={14} width={14} />
   </div>
 );
 
@@ -94,77 +96,84 @@ function AgentsStatusWidget({
   }, [agentsInfo]);
 
   return (
-    <Collapse
+    <Accordion
+      allowsMultipleExpanded
       className="service-insights-collapse-widget agents-status-widget"
-      data-testid="agent-status-widget"
-      expandIcon={() =>
-        renderAgentStatusExpandIcon(isLoading, agentStatusSummary, t)
-      }
-      expandIconPosition="end">
-      <Collapse.Panel
-        header={
-          <div className="flex justify-between items-center">
-            <div className="flex flex-col gap-1">
-              <Typography className="font-medium text-lg">
-                {t('label.entity-status', {
-                  entity: t('label.agent-plural'),
-                })}
-              </Typography>
+      data-testid="agent-status-widget">
+      <AccordionItem id="1" key="1">
+        <AccordionHeader>
+          <Box align="center" className="tw:w-full" justify="between">
+            <div className="flex justify-between items-center">
+              <div className="flex flex-col gap-1">
+                <Typography className="font-medium text-lg">
+                  {t('label.entity-status', {
+                    entity: t('label.agent-plural'),
+                  })}
+                </Typography>
 
-              {agentsRunningStatusMessage}
+                {agentsRunningStatusMessage}
+              </div>
             </div>
-          </div>
-        }
-        key="1">
-        {!isLoading && isEmpty(agentsInfo) && (
-          <div className="flex-center p-y-md">
-            <ErrorPlaceHolder
-              size={SIZE.SMALL}
-              type={ERROR_PLACEHOLDER_TYPE.NO_DATA}
-            />
-          </div>
-        )}
+            {renderAgentStatusExpandIcon(isLoading, agentStatusSummary, t)}
+          </Box>
+        </AccordionHeader>
+        <AccordionPanel>
+          {!isLoading && isEmpty(agentsInfo) && (
+            <div className="flex-center p-y-md">
+              <ErrorPlaceHolder
+                size={SIZE.SMALL}
+                type={ERROR_PLACEHOLDER_TYPE.NO_DATA}
+              />
+            </div>
+          )}
 
-        <Grid
-          className="layout-row layout-grid"
-          style={getLayoutGutter(16, 16)}>
-          {isLoading
-            ? Array.from(
-                { length: 8 },
-                (_, index) => `agent-skeleton-${index}`
-              ).map((skeletonKey) => (
-                <Grid.Item className="layout-column" key={skeletonKey} span={6}>
-                  <Card className="agent-status-card">
-                    <Card.Content>
-                      <Skeleton height={32} variant="rounded" width={160} />
-                    </Card.Content>
-                  </Card>
-                </Grid.Item>
-              ))
-            : agentsInfo.map((agent) => (
-                <Grid.Item className="layout-column" key={agent.label} span={6}>
-                  <Card
-                    className="agent-status-card"
-                    color={agent.isCollateAgent ? 'brand' : 'default'}
-                    data-testid={`agent-status-card-${agent.label}`}>
-                    <Card.Content className="tw:flex tw:items-center tw:justify-between tw:gap-2">
-                      <Box
-                        inline
-                        align="center"
-                        className="layout-space layout-space-horizontal"
-                        gap={2}
-                        itemClassName="layout-space-item">
-                        {agent.agentIcon}
-                        <Typography>{agent.label}</Typography>
-                      </Box>
-                      {getIconFromStatus(agent.status)}
-                    </Card.Content>
-                  </Card>
-                </Grid.Item>
-              ))}
-        </Grid>
-      </Collapse.Panel>
-    </Collapse>
+          <Grid
+            className="layout-row layout-grid"
+            style={getLayoutGutter(16, 16)}>
+            {isLoading
+              ? Array.from(
+                  { length: 8 },
+                  (_, index) => `agent-skeleton-${index}`
+                ).map((skeletonKey) => (
+                  <Grid.Item
+                    className="layout-column"
+                    key={skeletonKey}
+                    span={6}>
+                    <Card className="agent-status-card">
+                      <Card.Content>
+                        <Skeleton height={32} variant="rounded" width={160} />
+                      </Card.Content>
+                    </Card>
+                  </Grid.Item>
+                ))
+              : agentsInfo.map((agent) => (
+                  <Grid.Item
+                    className="layout-column"
+                    key={agent.label}
+                    span={6}>
+                    <Card
+                      className="agent-status-card"
+                      color={agent.isCollateAgent ? 'brand' : 'default'}
+                      data-testid={`agent-status-card-${agent.label}`}>
+                      <Card.Content className="tw:flex tw:items-center tw:justify-between tw:gap-2">
+                        <Box
+                          inline
+                          align="center"
+                          className="layout-space layout-space-horizontal"
+                          gap={2}
+                          itemClassName="layout-space-item">
+                          {agent.agentIcon}
+                          <Typography>{agent.label}</Typography>
+                        </Box>
+                        {getIconFromStatus(agent.status)}
+                      </Card.Content>
+                    </Card>
+                  </Grid.Item>
+                ))}
+          </Grid>
+        </AccordionPanel>
+      </AccordionItem>
+    </Accordion>
   );
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/agents-status-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/agents-status-widget.less
index ec166a20b928..bbd4caf7c132 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/agents-status-widget.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/AgentsStatusWidget/agents-status-widget.less
@@ -60,7 +60,7 @@
     color: @red-10;
   }
 
-  .ant-collapse-arrow.expand-icon-container {
+  .expand-icon-container {
     display: flex;
     align-items: center;
     gap: var(--om-space-12);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/service-insights-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/service-insights-tab.less
index 378c9661171f..6ab2d4286240 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/service-insights-tab.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceInsights/service-insights-tab.less
@@ -22,39 +22,6 @@
     padding: var(--om-space-20);
   }
 
-  .service-insights-collapse-widget.ant-collapse-icon-position-end {
-    border: none;
-    border-radius: @border-rad-sm;
-
-    .ant-collapse-item:last-child {
-      background-color: var(--tw-color-bg-primary);
-      border-radius: @border-rad-sm;
-      border: 1px solid @grey-15;
-      .ant-collapse-header {
-        border-radius: @border-rad-sm;
-        border-bottom: none;
-      }
-      .ant-collapse-content {
-        .ant-collapse-content-box {
-          padding-top: 0;
-        }
-        border-radius: @border-rad-sm;
-        border-top: none;
-      }
-    }
-
-    .ant-collapse-item {
-      .ant-collapse-header {
-        .ant-collapse-arrow.expand-icon-container {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          gap: var(--om-space-8);
-        }
-      }
-    }
-  }
-
   .widget-flex-col {
     height: 100%;
     display: flex;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less
index d8ee7d4defb2..dccac841e23d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less
@@ -58,34 +58,9 @@
     }
   }
 
-  // ****  Stats  ****
-
-  .request-badge {
-    &.success {
-      .ant-badge-count {
-        background-color: @green-3;
-        color: @text-color;
-      }
-    }
-
-    &.failed {
-      .ant-badge-count {
-        background-color: @red-3;
-        color: @text-color;
-      }
-    }
-
-    &.warning {
-      .ant-badge-count {
-        background-color: @yellow-4;
-        color: @text-color;
-      }
-    }
-
-    &.running {
-      .ant-badge-count {
-        background-color: @primary-color;
-      }
-    }
+  // Missing counters do not render pills; reported zero counts remain visible.
+  .request-badge:empty {
+    display: none;
   }
+  // ****  Stats  ****
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx
index 2e0c62a93527..b1f366efe6f8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx
@@ -16,13 +16,17 @@ import {
   UserOutlined,
 } from '@ant-design/icons';
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+  Avatar,
   Box,
   Button,
   Card,
   Divider,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Avatar, Collapse } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { LIGHT_GREEN_COLOR } from '../../../../constants/constants';
 import { useApplicationStore } from '../../../../hooks/useApplicationStore';
@@ -59,8 +63,9 @@ const AppInstallVerifyCard = ({
           label={<CheckCircleTwoTone twoToneColor={LIGHT_GREEN_COLOR} />}
         />
         <Avatar
-          className="app-marketplace-avatar flex-center bg-white border"
-          icon={
+          className="tw:size-25 app-marketplace-avatar flex-center bg-white border"
+          contrastBorder={false}
+          placeholder={
             <BrandImage
               isMonoGram
               className="vertical-middle"
@@ -69,7 +74,7 @@ const AppInstallVerifyCard = ({
               width={56}
             />
           }
-          size={100}
+          size="2xl"
         />
       </Box>
       <Typography as="h5" className="m-t-md" size="text-md" weight="semibold">
@@ -116,14 +121,14 @@ const AppInstallVerifyCard = ({
             </div>
           </Box>
 
-          <Collapse ghost className="w-full m-t-md" expandIconPosition="end">
-            <Collapse.Panel
-              header={` ${t('label.all-entity', {
+          <Accordion allowsMultipleExpanded className="w-full m-t-md">
+            <AccordionItem id="1" key="1">
+              <AccordionHeader>{` ${t('label.all-entity', {
                 entity: t('label.metadata'),
-              })}`}
-              key="1"
-            />
-          </Collapse>
+              })}`}</AccordionHeader>
+              <AccordionPanel>{null}</AccordionPanel>
+            </AccordionItem>
+          </Accordion>
 
           <Divider className="tw:my-6" />
           <div className="d-flex justify-end gap-2">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx
index c252eb95146f..522bf5e24400 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx
@@ -16,10 +16,8 @@ import {
   render,
   screen,
   waitForElementToBeRemoved,
-  within,
 } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { Table as AntdTable } from 'antd';
 import React from 'react';
 import { AppType } from '../../../../generated/entity/applications/app';
 import { Status } from '../../../../generated/entity/applications/appRunRecord';
@@ -145,11 +143,15 @@ jest.mock('../../../../utils/date-time/DateTimeUtils', () => ({
 }));
 
 jest.mock('../../../common/Table/TableV2', () => {
+  const ActualTable = jest.requireActual(
+    '../../../common/Table/TableV2'
+  ).default;
+
   return jest
     .fn()
     .mockImplementation(({ loading, customPaginationProps, ...rest }) => (
       <div>
-        {loading ? <p>TableLoader</p> : <AntdTable {...rest} />}
+        {loading ? <p>TableLoader</p> : <ActualTable {...rest} />}
         {customPaginationProps && (
           <button
             onClick={() =>
@@ -260,7 +262,9 @@ describe('AppRunsHistory', () => {
       .findIndex((header) => header.textContent === 'label.triggered-by');
     const [, firstDataRow] = screen.getAllByRole('row');
 
-    return within(firstDataRow).getAllByRole('cell')[columnIndex];
+    return Array.from(
+      firstDataRow.querySelectorAll('[role="rowheader"], [role="gridcell"]')
+    )[columnIndex];
   };
 
   it('should show the user who triggered an on-demand run', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/AppScreenshots.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/AppScreenshots.test.tsx
new file mode 100644
index 000000000000..350b6c72f35a
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/AppScreenshots.test.tsx
@@ -0,0 +1,92 @@
+/*
+ *  Copyright 2023 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 { act, fireEvent, render, screen } from '@testing-library/react';
+import { AppScreenshots } from './AppScreenshots';
+
+const screenshots = [
+  <img alt="First screenshot" key="first" src="first.png" />,
+  <img alt="Second screenshot" key="second" src="second.png" />,
+];
+
+describe('AppScreenshots', () => {
+  it('rotates screenshots and stops when paused', () => {
+    render(<AppScreenshots screenshots={screenshots} />);
+
+    expect(screen.getByRole('img', { name: 'First screenshot' })).toBeVisible();
+    expect(
+      screen.queryByRole('img', { name: 'Second screenshot' })
+    ).not.toBeInTheDocument();
+
+    act(() => jest.advanceTimersByTime(3000));
+
+    expect(
+      screen.getByRole('img', { name: 'Second screenshot' })
+    ).toBeVisible();
+
+    fireEvent.click(screen.getByRole('button', { name: 'label.pause' }));
+    act(() => jest.advanceTimersByTime(3000));
+
+    expect(
+      screen.getByRole('img', { name: 'Second screenshot' })
+    ).toBeVisible();
+  });
+
+  it('switches to the selected screenshot without changing its identity', () => {
+    render(<AppScreenshots screenshots={screenshots} />);
+    fireEvent.click(screen.getByRole('button', { name: 'label.page 2' }));
+
+    expect(
+      screen.getByRole('img', { name: 'Second screenshot' })
+    ).toBeVisible();
+  });
+
+  it('keeps autoplay stopped while focus remains after hover ends', () => {
+    render(<AppScreenshots screenshots={screenshots} />);
+    const gallery = screen.getByRole('region');
+    const control = screen.getByRole('button', { name: 'label.page 1' });
+
+    fireEvent.mouseEnter(gallery);
+    fireEvent.focus(control);
+    fireEvent.mouseLeave(gallery);
+    act(() => jest.advanceTimersByTime(3000));
+
+    expect(
+      screen.getByRole('img', { name: 'First screenshot' })
+    ).toBeInTheDocument();
+
+    fireEvent.blur(control);
+    act(() => jest.advanceTimersByTime(3000));
+
+    expect(
+      screen.getByRole('img', { name: 'Second screenshot' })
+    ).toBeInTheDocument();
+  });
+
+  it('keeps a screenshot visible when the screenshot list shrinks', () => {
+    const { rerender } = render(<AppScreenshots screenshots={screenshots} />);
+    fireEvent.click(screen.getByRole('button', { name: 'label.page 2' }));
+
+    rerender(<AppScreenshots screenshots={screenshots.slice(0, 1)} />);
+
+    expect(
+      screen.getByRole('img', { name: 'First screenshot' })
+    ).toBeInTheDocument();
+  });
+
+  it('does not offer rotation controls for one screenshot', () => {
+    render(<AppScreenshots screenshots={screenshots.slice(0, 1)} />);
+
+    expect(screen.queryByRole('button')).not.toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/AppScreenshots.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/AppScreenshots.tsx
new file mode 100644
index 000000000000..02b70d5dee37
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/AppScreenshots.tsx
@@ -0,0 +1,106 @@
+/*
+ *  Copyright 2023 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 { Box, Button, Dot } from '@openmetadata/ui-core-components';
+import { ReactElement, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+interface AppScreenshotsProps {
+  screenshots: ReactElement[];
+}
+
+export const AppScreenshots = ({ screenshots }: AppScreenshotsProps) => {
+  const { t } = useTranslation();
+  const [activeIndex, setActiveIndex] = useState(0);
+  const [isPaused, setIsPaused] = useState(false);
+  const [isHovered, setIsHovered] = useState(false);
+  const [isFocused, setIsFocused] = useState(false);
+  const currentIndex = Math.min(
+    activeIndex,
+    Math.max(0, screenshots.length - 1)
+  );
+
+  useEffect(() => {
+    // Stop automatic changes while users read, focus a control, or request reduced motion.
+    const isUserInteracting = isHovered || isFocused;
+    if (
+      isPaused ||
+      isUserInteracting ||
+      screenshots.length < 2 ||
+      window.matchMedia('(prefers-reduced-motion: reduce)').matches
+    ) {
+      return;
+    }
+
+    const timer = window.setInterval(() => {
+      setActiveIndex((index) => (index + 1) % screenshots.length);
+    }, 3000);
+
+    return () => window.clearInterval(timer);
+  }, [isPaused, isHovered, isFocused, screenshots.length]);
+
+  return (
+    <Box
+      aria-label={t('label.image')}
+      className="p-x-md"
+      data-testid="app-screenshots"
+      direction="col"
+      gap={3}
+      role="region"
+      onBlur={(event) => {
+        if (!event.currentTarget.contains(event.relatedTarget)) {
+          setIsFocused(false);
+        }
+      }}
+      onFocus={() => setIsFocused(true)}
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => setIsHovered(false)}>
+      <div className="tw:overflow-hidden">
+        <Box
+          className="tw:transition-transform tw:duration-500 tw:ease-in-out tw:motion-reduce:transition-none"
+          style={{ transform: `translateX(-${currentIndex * 100}%)` }}>
+          {screenshots.map((screenshot, index) => (
+            <div
+              aria-hidden={currentIndex !== index}
+              className="app-slider-container tw:w-full tw:shrink-0"
+              data-testid="slider-container"
+              key={screenshot.key}>
+              {screenshot}
+            </div>
+          ))}
+        </Box>
+      </div>
+      {screenshots.length > 1 && (
+        <Box align="center" gap={2} justify="center">
+          {screenshots.map((screenshot, index) => (
+            <Button
+              aria-label={`${t('label.page')} ${index + 1}`}
+              aria-pressed={currentIndex === index}
+              color={currentIndex === index ? 'primary' : 'secondary'}
+              key={screenshot.key}
+              size="sm"
+              onPress={() => setActiveIndex(index)}>
+              <Dot aria-hidden size="xs" />
+            </Button>
+          ))}
+          <Button
+            color="tertiary"
+            size="sm"
+            onPress={() => setIsPaused((paused) => !paused)}>
+            {t(isPaused ? 'label.play' : 'label.pause')}
+          </Button>
+        </Box>
+      )}
+    </Box>
+  );
+};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx
index 485c675aa585..9612f93fc2b0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx
@@ -13,16 +13,17 @@
 
 import { LeftOutlined } from '@ant-design/icons';
 import {
+  Alert,
   Box,
   Button,
   Grid,
   Tooltip,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Alert, Carousel } from 'antd';
 import { AxiosError } from 'axios';
-import { uniqueId } from 'lodash';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { AppScreenshots } from './AppScreenshots';
+
+import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { ReactComponent as CheckMarkIcon } from '../../../../assets/svg/ic-cloud-checkmark.svg';
@@ -70,10 +71,15 @@ const MarketPlaceAppDetails = () => {
       const imageSrc = imageModule.default;
 
       return (
-        <img alt={screenshotName} src={imageSrc} style={{ height: '320px' }} />
+        <img
+          alt={screenshotName}
+          key={screenshotName}
+          src={imageSrc}
+          style={{ height: '320px' }}
+        />
       );
     } catch (error) {
-      return <></>;
+      return <Fragment key={screenshotName} />;
     }
   };
 
@@ -192,8 +198,9 @@ const MarketPlaceAppDetails = () => {
 
         {isAppDisabled && (
           <Alert
-            className="m-t-md text-xs d-flex items-start p-xs"
-            message={
+            className="m-t-md"
+            showIcon={false}
+            title={
               isCacheWarmupDisabled ? (
                 <Typography>
                   {t('message.cache-service-not-configured-message')}
@@ -221,7 +228,7 @@ const MarketPlaceAppDetails = () => {
                 </>
               )
             }
-            type="info"
+            variant="brand"
           />
         )}
         <div className="m-t-md">
@@ -319,21 +326,7 @@ const MarketPlaceAppDetails = () => {
       </Grid>
       <Grid className="layout-row layout-grid">
         <Grid.Item className="layout-column" span={24}>
-          <Carousel
-            autoplay
-            dots
-            autoplaySpeed={3000}
-            className="p-x-md"
-            easing="ease-in-out">
-            {appScreenshots.map((data) => (
-              <div
-                className="app-slider-container"
-                data-testid="slider-container"
-                key={uniqueId()}>
-                {data}
-              </div>
-            ))}
-          </Carousel>
+          <AppScreenshots key={fqn} screenshots={appScreenshots} />
         </Grid.Item>
 
         <Grid.Item className="layout-column" span={24}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts
index 08b83b015fba..f0f0a10bd8e2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts
@@ -11,11 +11,11 @@
  *  limitations under the License.
  */
 
-import { MenuProps } from 'antd';
 import { ServiceCategory } from '../../../../enums/service.enum';
 import { PipelineType } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline';
 import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline';
 import { ServicesType } from '../../../../interface/service.interface';
+import { ManageMenuItem } from '../../../common/EntityPageInfos/ManageButton/ManageMenu';
 
 export interface AddIngestionButtonProps {
   serviceDetails: ServicesType;
@@ -23,5 +23,5 @@ export interface AddIngestionButtonProps {
   ingestionList: Array<IngestionPipeline>;
   serviceCategory: ServiceCategory;
   serviceName: string;
-  extraMenuItems?: MenuProps['items'];
+  extraMenuItems?: ManageMenuItem[];
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx
index 305baab42c4b..24f8a56df051 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx
@@ -11,7 +11,11 @@
  *  limitations under the License.
  */
 
-import { Steps } from 'antd';
+import {
+  ProgressStepItem,
+  ProgressSteps,
+} from '@openmetadata/ui-core-components';
+
 import classNames from 'classnames';
 import { useMemo } from 'react';
 import './ingestion-stepper.style.less';
@@ -36,21 +40,20 @@ const IngestionStepper = ({
       steps
         .filter((step) => !excludeSteps.includes(step.step))
         .map((step) => {
+          let status: ProgressStepItem['status'] = 'incomplete';
+          if (step.step === activeStep) {
+            status = 'current';
+          } else if (step.step < activeStep) {
+            status = 'complete';
+          }
+
+          // Optional steps can leave gaps, so derive status from the original identifier.
           return {
-            icon: (
-              <span
-                className={classNames(
-                  'ingestion-rounder self-center',
-                  {
-                    active: step.step === activeStep,
-                  },
-                  { completed: step.step < activeStep }
-                )}
-                data-testid={`step-icon-${step.step}`}
-              />
+            id: String(step.step),
+            title: (
+              <span data-testid={`step-icon-${step.step}`}>{step.name}</span>
             ),
-            key: step.name,
-            title: step.name,
+            status,
           };
         }),
     [steps, activeStep, excludeSteps]
@@ -60,11 +63,11 @@ const IngestionStepper = ({
     <div
       className={classNames('stepper-container p-x-24', className)}
       data-testid="stepper-container">
-      <Steps
-        current={activeStep}
-        items={items}
-        labelPlacement="vertical"
-        size="small"
+      <ProgressSteps
+        labelPlacement="bottom"
+        size="sm"
+        steps={items}
+        type="icon"
       />
     </div>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/ingestion-stepper.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/ingestion-stepper.style.less
index bf056f32e7f6..493224abf06f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/ingestion-stepper.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/ingestion-stepper.style.less
@@ -10,8 +10,3 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-.stepper-container {
-  .ant-steps-item-content {
-    width: 120px;
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingItemCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingItemCard.component.tsx
index d801f533a1b5..9097c87b74df 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingItemCard.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingItemCard.component.tsx
@@ -12,8 +12,8 @@
  */
 
 import Icon from '@ant-design/icons/lib/components/Icon';
-import { Card, Typography } from '@openmetadata/ui-core-components';
-import { Badge } from 'antd';
+import { Badge, Card, Typography } from '@openmetadata/ui-core-components';
+
 import classNames from 'classnames';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -46,7 +46,9 @@ const SettingItemCard = ({
         <div className="setting-card-icon">
           <Icon component={data.icon} />
           {Boolean(data?.isBeta) && (
-            <Badge className="service-beta-tag" count={t('label.beta')} />
+            <Badge className="service-beta-tag" color="brand" size="sm">
+              {t('label.beta')}
+            </Badge>
           )}
         </div>
         <div className="setting-card-content">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx
index a75d2091fd00..0b8fe91f56b6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx
@@ -12,6 +12,7 @@
  */
 
 import {
+  Avatar,
   Box,
   Button,
   Grid,
@@ -22,8 +23,6 @@ import {
   Typography,
 } from '@openmetadata/ui-core-components';
 import { Plus } from '@openmetadata/ui-core-components/icons';
-import { Avatar } from 'antd';
-import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import { AxiosError } from 'axios';
 import { compare } from 'fast-json-patch';
 import { cloneDeep, isEmpty, isUndefined } from 'lodash';
@@ -97,6 +96,7 @@ import {
 } from '../../../common/CustomPropertyTable/CustomPropertyTable.interface';
 import Description from '../../../common/EntityDescription/Description';
 import ManageButton from '../../../common/EntityPageInfos/ManageButton/ManageButton';
+import { ManageMenuItem as ItemType } from '../../../common/EntityPageInfos/ManageButton/ManageMenu';
 import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import Loader from '../../../common/Loader/Loader';
 import { ManageButtonItemLabel } from '../../../common/ManageButtonContentItem/ManageButtonContentItem.component';
@@ -1042,9 +1042,16 @@ const TeamDetailsV1 = ({
           {!isOrganization && <TitleBreadcrumb titleLinks={slashedTeamName} />}
           <div className="d-flex items-center justify-between p-t-xs">
             <div className="d-flex items-center gap-2 flex-1 w-min-0">
-              <Avatar className="teams-profile" size={40}>
-                <IconTeams className="text-primary" width={20} />
-              </Avatar>
+              <Avatar
+                className="teams-profile"
+                contrastBorder={false}
+                placeholder={
+                  <>
+                    <IconTeams className="text-primary" width={20} />
+                  </>
+                }
+                size="md"
+              />
 
               <TeamsHeadingLabel
                 currentTeam={currentTeam}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less
index a17bfdf62910..b82d95f9657c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less
@@ -126,29 +126,6 @@
       padding: var(--om-space-20);
     }
 
-    .ant-collapse-header,
-    .ant-collapse-content {
-      padding: 0 var(--om-space-35) 0 0;
-    }
-
-    .ant-collapse-content-box {
-      margin-top: var(--om-space-12);
-      padding: 0;
-    }
-
-    .ant-collapse-arrow {
-      top: 28px !important; // overriding from antd
-      right: 0px !important;
-      padding: var(--om-space-6);
-      background-color: @background-color;
-      border: 1px solid var(--om-legacy-color-d9d9d9);
-      border-radius: var(--om-radius-sm);
-    }
-
-    .ant-collapse-arrow.arrow-icon-non-organization {
-      top: 42px !important;
-    }
-
     .domain-link {
       font-size: var(--om-font-size-sm);
     }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx
index e1f3b3fcc65d..11363cc08433 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx
@@ -10,95 +10,110 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
+import { TeamType } from '../../../../generated/entity/teams/teamHierarchy';
 import { getTeamsHierarchy } from '../../../../rest/teamsAPI';
+import { showErrorToast } from '../../../../utils/ToastUtils';
 import TeamsSelectable from './TeamsSelectable';
 
-const mockSelChange = jest.fn();
-
-const mockProps = {
-  onSelectionChange: mockSelChange,
-};
-
-jest.mock('antd', () => ({
-  TreeSelect: jest.fn().mockImplementation(({ onChange }) => (
-    <div role="presentation" onClick={() => onChange([])}>
-      TreeSelect.component
-    </div>
-  )),
-  Alert: jest.fn().mockImplementation(() => <div>Alert</div>),
-}));
-
 jest.mock('../../../../rest/teamsAPI', () => ({
-  getTeamsHierarchy: jest.fn().mockImplementation(() =>
-    Promise.resolve({
-      data: [],
-    })
-  ),
+  getTeamsHierarchy: jest.fn(),
+}));
+jest.mock('../../../../utils/ToastUtils', () => ({
+  showErrorToast: jest.fn(),
 }));
-
 jest.mock('../../../../utils/EntityNameUtils', () => ({
-  getEntityName: jest.fn().mockImplementation(() => 'entityName'),
+  getEntityName: () => 'entityName',
 }));
 
-describe('TeamsSelectable component test', () => {
-  it('TeamsSelectable component should render properly', async () => {
-    const { findByText } = render(<TeamsSelectable {...mockProps} />, {
-      wrapper: MemoryRouter,
-    });
+describe('TeamsSelectable', () => {
+  beforeEach(() => {
+    (getTeamsHierarchy as jest.Mock).mockResolvedValue({ data: [] });
+  });
 
-    const treeSelect = await findByText('TreeSelect.component');
+  it('renders a searchable team picker', async () => {
+    render(<TeamsSelectable />, { wrapper: MemoryRouter });
 
-    expect(treeSelect).toBeInTheDocument();
+    expect(screen.getByRole('combobox')).toBeInTheDocument();
+
+    await waitFor(() => expect(getTeamsHierarchy).toHaveBeenCalled());
   });
 
-  it('TeamsSelectable component should fire selection change', async () => {
-    const { findByText } = render(<TeamsSelectable {...mockProps} />, {
+  it('returns team references when selecting and clearing a group', async () => {
+    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+    const onSelectionChange = jest.fn();
+    (getTeamsHierarchy as jest.Mock).mockResolvedValue({
+      data: [
+        {
+          id: 'team-id',
+          name: 'Team',
+          teamType: TeamType.Group,
+          isJoinable: true,
+        },
+      ],
+    });
+    render(<TeamsSelectable onSelectionChange={onSelectionChange} />, {
       wrapper: MemoryRouter,
     });
+    await user.click(screen.getByRole('combobox'));
+    await user.click(await screen.findByText('entityName'));
 
-    const treeSelect = await findByText('TreeSelect.component');
+    expect(onSelectionChange).toHaveBeenLastCalledWith([
+      { id: 'team-id', displayName: 'entityName', type: 'team' },
+    ]);
 
-    fireEvent.click(
-      treeSelect,
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true,
-      })
+    await user.click(
+      screen.getByRole('button', { name: /remove.*entityName/i })
     );
 
-    expect(treeSelect).toBeInTheDocument();
-    expect(mockSelChange).toHaveBeenCalled();
+    expect(onSelectionChange).toHaveBeenLastCalledWith([]);
   });
 
-  it('should show no teams alert when API returns no data', async () => {
-    await act(async () => {
-      render(<TeamsSelectable {...mockProps} showTeamsAlert />, {
-        wrapper: MemoryRouter,
+  it('toasts a failed load once and retries when the picker opens', async () => {
+    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+    const error = new Error('network');
+    (getTeamsHierarchy as jest.Mock)
+      .mockRejectedValueOnce(error)
+      .mockResolvedValueOnce({
+        data: [
+          {
+            id: 'team-id',
+            name: 'Team',
+            teamType: TeamType.Group,
+            isJoinable: true,
+          },
+        ],
       });
-    });
+    render(<TeamsSelectable />, { wrapper: MemoryRouter });
 
-    const noTeamsAlert = screen.getByText('Alert');
+    await waitFor(() => expect(showErrorToast).toHaveBeenCalledWith(error));
 
-    expect(noTeamsAlert).toBeInTheDocument();
+    await user.click(screen.getByRole('combobox'));
+
+    expect(await screen.findByText('entityName')).toBeInTheDocument();
+    expect(getTeamsHierarchy).toHaveBeenCalledTimes(2);
+    expect(showErrorToast).toHaveBeenCalledTimes(1);
   });
 
-  it('should not show no teams alert when API returns teams data', async () => {
-    (getTeamsHierarchy as jest.Mock).mockImplementation(() =>
-      Promise.resolve({
-        data: [{ name: 'testTeam' }],
-      })
-    );
-    await act(async () => {
-      render(<TeamsSelectable {...mockProps} showTeamsAlert />, {
-        wrapper: MemoryRouter,
-      });
-    });
+  it('shows an empty-team message after an empty response', async () => {
+    render(<TeamsSelectable showTeamsAlert />, { wrapper: MemoryRouter });
 
-    const noTeamsAlert = screen.queryByText('Alert');
+    expect(
+      await screen.findByText('message.no-entity-data-available')
+    ).toBeInTheDocument();
+  });
+
+  it('keeps the empty-team message hidden when data exists', async () => {
+    (getTeamsHierarchy as jest.Mock).mockResolvedValue({
+      data: [{ id: 'team-id', name: 'Team', teamType: TeamType.Group }],
+    });
+    render(<TeamsSelectable showTeamsAlert />, { wrapper: MemoryRouter });
+    await waitFor(() => expect(getTeamsHierarchy).toHaveBeenCalled());
 
-    expect(noTeamsAlert).toBeNull();
+    expect(
+      screen.queryByText('message.no-entity-data-available')
+    ).not.toBeInTheDocument();
   });
 });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx
index 7523d71715c3..dc2a409d6a57 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx
@@ -11,11 +11,16 @@
  *  limitations under the License.
  */
 
-import { Alert, TreeSelect } from 'antd';
+import {
+  Alert,
+  TreeSelect,
+  TreeSelectNode,
+} from '@openmetadata/ui-core-components';
+
 import { AxiosError } from 'axios';
 
 import { isEmpty } from 'lodash';
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { TeamHierarchy } from '../../../../generated/entity/teams/teamHierarchy';
 import { EntityReference } from '../../../../generated/entity/type';
@@ -37,10 +42,15 @@ const TeamsSelectable = ({
   maxValueCount,
 }: TeamsSelectableProps) => {
   const [noTeam, setNoTeam] = useState<boolean>(false);
-  const [teams, setTeams] = useState<Array<TeamHierarchy>>([]);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const { t } = useTranslation();
-  const onChange = (newValue: { label: string; value: string }[]) => {
+  const onChange = (value: TreeSelectNode | TreeSelectNode[] | null) => {
+    const newValue: TreeSelectNode[] = [];
+    if (Array.isArray(value)) {
+      newValue.push(...value);
+    } else if (value) {
+      newValue.push(value);
+    }
     onSelectionChange &&
       onSelectionChange(
         newValue.map(
@@ -54,38 +64,65 @@ const TeamsSelectable = ({
       );
   };
 
-  const loadOptions = async () => {
-    try {
-      setIsLoading(true);
-      const { data } = await getTeamsHierarchy(filterJoinable);
-      const sortedData = [...data].sort((a, b) => {
-        const nameA = a.fullyQualifiedName ?? '';
-        const nameB = b.fullyQualifiedName ?? '';
+  // TreeSelect fetches once when it first opens; awaiting the shared request
+  // keeps an early open (e.g. a popover opened straight away) from caching an empty tree.
+  const teamsRequest = useRef<{
+    filterJoinable?: boolean;
+    promise: Promise<TeamHierarchy[]>;
+  }>();
+  const notifiedError = useRef<unknown>();
 
-        return nameA.localeCompare(nameB);
-      });
-      setTeams(sortedData);
-      showTeamsAlert && setNoTeam(isEmpty(data));
-    } catch (error) {
+  const notifyError = useCallback((error: unknown) => {
+    // The mount load and the picker share one request; toast its failure once.
+    if (error !== notifiedError.current) {
+      notifiedError.current = error;
       showErrorToast(error as AxiosError);
-    } finally {
-      setIsLoading(false);
     }
-  };
-
-  useEffect(() => {
-    loadOptions();
   }, []);
 
-  const showLeafIcon = false;
+  const loadTeams = useCallback(() => {
+    if (
+      !teamsRequest.current ||
+      teamsRequest.current.filterJoinable !== filterJoinable
+    ) {
+      const promise = getTeamsHierarchy(filterJoinable)
+        .then(({ data }) =>
+          [...data].sort((a, b) =>
+            (a.fullyQualifiedName ?? '').localeCompare(
+              b.fullyQualifiedName ?? ''
+            )
+          )
+        )
+        .catch((error) => {
+          // Forget the failed request so the next open retries.
+          teamsRequest.current = undefined;
+
+          throw error;
+        });
+      teamsRequest.current = { filterJoinable, promise };
+    }
+
+    return teamsRequest.current?.promise ?? Promise.resolve([]);
+  }, [filterJoinable]);
+
+  useEffect(() => {
+    setIsLoading(true);
+    loadTeams()
+      .then((data) => showTeamsAlert && setNoTeam(isEmpty(data)))
+      .catch(notifyError)
+      .finally(() => setIsLoading(false));
+  }, [loadTeams, notifyError, showTeamsAlert]);
 
-  const teamsTree = useMemo(
-    () => buildTeamsSelectableTree(teams, filterJoinable),
-    [teams, filterJoinable]
+  const fetchData = useCallback(
+    async () => ({
+      nodes: buildTeamsSelectableTree(await loadTeams(), filterJoinable),
+    }),
+    [loadTeams, filterJoinable]
   );
 
   const selectedTeamsInternal = useMemo(() => {
     return selectedTeams?.map((selectedTeam) => ({
+      id: selectedTeam.id,
       label: getEntityName(selectedTeam),
       value: selectedTeam.id,
     }));
@@ -94,33 +131,27 @@ const TeamsSelectable = ({
   return (
     <>
       <TreeSelect
-        allowClear
-        labelInValue
         multiple
-        showSearch
-        treeDefaultExpandAll
+        searchable
         data-testid="team-select"
-        dropdownStyle={{ maxHeight: 300, overflow: 'auto' }}
-        getPopupContainer={(triggerNode) => triggerNode.parentElement}
-        loading={isLoading}
-        maxTagCount={maxValueCount}
+        fetchData={fetchData}
+        isLoading={isLoading}
+        maxVisibleItems={maxValueCount}
         placeholder={placeholder}
-        showCheckedStrategy={TreeSelect.SHOW_CHILD}
-        style={{ width: '100%' }}
-        treeData={teamsTree}
-        treeLine={{ showLeafIcon }}
-        treeNodeFilterProp="title"
+        showCheckbox={false}
+        showIcon={false}
         value={selectedTeamsInternal}
         onChange={onChange}
+        onFetchError={notifyError}
       />
       {noTeam && (
         <Alert
           showIcon
           className="m-t-md"
-          message={t('message.no-entity-data-available', {
+          title={t('message.no-entity-data-available', {
             entity: t('label.team-plural'),
           })}
-          type="info"
+          variant="brand"
         />
       )}
     </>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.test.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.test.ts
index 49d1ee27b29e..f20d6e1545f1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.test.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.test.ts
@@ -25,13 +25,13 @@ const groupTeam = (id: string, isJoinable = true): TeamHierarchy => ({
 });
 
 describe('buildTeamsSelectableTree', () => {
-  it('should mark Group teams as selectable', () => {
+  it('should mark Group teams as allowSelection', () => {
     const tree = buildTeamsSelectableTree([groupTeam('group-1')]);
 
     expect(tree).toHaveLength(1);
     expect(tree[0]).toMatchObject({
       value: 'group-1',
-      selectable: true,
+      allowSelection: true,
       disabled: false,
     });
   });
@@ -60,7 +60,7 @@ describe('buildTeamsSelectableTree', () => {
     expect(tree).toHaveLength(0);
   });
 
-  it('should keep non-Group branches leading to Group teams as non-selectable', () => {
+  it('should keep non-Group branches leading to Group teams as non-allowSelection', () => {
     const tree = buildTeamsSelectableTree([
       {
         id: 'division-1',
@@ -83,15 +83,15 @@ describe('buildTeamsSelectableTree', () => {
     ]);
 
     expect(tree).toHaveLength(1);
-    expect(tree[0].selectable).toBe(false);
+    expect(tree[0].allowSelection).toBe(false);
     expect(tree[0].children).toHaveLength(1);
     expect(tree[0].children?.[0]).toMatchObject({
       value: 'department-1',
-      selectable: false,
+      allowSelection: false,
     });
     expect(tree[0].children?.[0].children?.[0]).toMatchObject({
       value: 'group-1',
-      selectable: true,
+      allowSelection: true,
     });
   });
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.ts
index d66a25bead70..67d7407b20a8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.utils.ts
@@ -10,6 +10,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+import { TreeSelectNode } from '@openmetadata/ui-core-components';
 import { isEmpty } from 'lodash';
 import {
   ChildElement,
@@ -18,13 +19,7 @@ import {
 } from '../../../../generated/entity/teams/teamHierarchy';
 import { getEntityName } from '../../../../utils/EntityNameUtils';
 
-export interface TeamsSelectableTreeNode {
-  title: string;
-  value: string;
-  selectable: boolean;
-  disabled: boolean;
-  children?: TeamsSelectableTreeNode[];
-}
+export type TeamsSelectableTreeNode = TreeSelectNode;
 
 const getTreeNodeData = (
   team: TeamHierarchy | ChildElement,
@@ -43,10 +38,12 @@ const getTreeNodeData = (
   }
 
   return {
-    title: getEntityName(team),
+    id: team.id,
+    label: getEntityName(team),
     value: team.id,
-    selectable: isGroupTeam,
-    disabled: filterJoinable ? !team.isJoinable : false,
+    allowSelection: isGroupTeam,
+    // Branches must remain expandable even when they cannot have direct members.
+    disabled: isGroupTeam && filterJoinable ? !team.isJoinable : false,
     children: isEmpty(children) ? undefined : children,
   };
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectableNew.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectableNew.tsx
index b50aeb644faf..b830db1288b9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectableNew.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectableNew.tsx
@@ -11,34 +11,33 @@
  *  limitations under the License.
  */
 
-import { Alert, TreeSelect } from 'antd';
+import {
+  Alert,
+  TreeSelect,
+  TreeSelectNode,
+} from '@openmetadata/ui-core-components';
+
 import { AxiosError } from 'axios';
 
 import { isEmpty } from 'lodash';
-import { BaseSelectRef } from 'rc-select';
-import { forwardRef, useEffect, useMemo, useState } from 'react';
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 import { useTranslation } from 'react-i18next';
 import { TeamHierarchy } from '../../../../generated/entity/teams/teamHierarchy';
 import { getTeamsHierarchy } from '../../../../rest/teamsAPI';
 import { getEntityName } from '../../../../utils/EntityNameUtils';
 import i18n from '../../../../utils/i18next/LocalUtil';
 import { showErrorToast } from '../../../../utils/ToastUtils';
-import { TagRenderer } from '../../../common/TagRenderer/TagRenderer';
 import { TeamsSelectableProps } from './TeamsSelectable.interface';
 import { buildTeamsSelectableTree } from './TeamsSelectable.utils';
 
-const renderMaxTagPlaceholder = (
-  count: number,
-  t: ReturnType<typeof useTranslation>['t']
-) => (
-  <span className="max-tag-text">
-    {t('label.plus-count-more', {
-      count,
-    })}
-  </span>
-);
-
-const TeamsSelectableNew = forwardRef<BaseSelectRef, TeamsSelectableProps>(
+const TeamsSelectableNew = forwardRef<HTMLDivElement, TeamsSelectableProps>(
   (
     {
       showTeamsAlert,
@@ -55,11 +54,16 @@ const TeamsSelectableNew = forwardRef<BaseSelectRef, TeamsSelectableProps>(
     ref
   ) => {
     const [noTeam, setNoTeam] = useState<boolean>(false);
-    const [teams, setTeams] = useState<Array<TeamHierarchy>>([]);
     const [isLoading, setIsLoading] = useState<boolean>(false);
     const { t } = useTranslation();
 
-    const onChange = (newValue: { label: string; value: string }[]) => {
+    const onChange = (value: TreeSelectNode | TreeSelectNode[] | null) => {
+      const newValue: TreeSelectNode[] = [];
+      if (Array.isArray(value)) {
+        newValue.push(...value);
+      } else if (value) {
+        newValue.push(value);
+      }
       onSelectionChange &&
         onSelectionChange(
           newValue.map((val) => ({
@@ -70,80 +74,93 @@ const TeamsSelectableNew = forwardRef<BaseSelectRef, TeamsSelectableProps>(
         );
     };
 
-    const loadOptions = async () => {
-      try {
-        setIsLoading(true);
-        const { data } = await getTeamsHierarchy(filterJoinable);
-        setTeams(data);
-        showTeamsAlert && setNoTeam(isEmpty(data));
-      } catch (error) {
+    // TreeSelect fetches once when it first opens; awaiting the shared request
+    // keeps an early open (e.g. a popover opened straight away) from caching an empty tree.
+    const teamsRequest = useRef<{
+      filterJoinable?: boolean;
+      promise: Promise<TeamHierarchy[]>;
+    }>();
+    const notifiedError = useRef<unknown>();
+
+    const notifyError = useCallback((error: unknown) => {
+      // The mount load and the picker share one request; toast its failure once.
+      if (error !== notifiedError.current) {
+        notifiedError.current = error;
         showErrorToast(error as AxiosError);
-      } finally {
-        setIsLoading(false);
       }
-    };
-
-    useEffect(() => {
-      loadOptions();
     }, []);
 
-    const showLeafIcon = false;
+    const loadTeams = useCallback(() => {
+      if (
+        !teamsRequest.current ||
+        teamsRequest.current.filterJoinable !== filterJoinable
+      ) {
+        const promise = getTeamsHierarchy(filterJoinable)
+          .then(({ data }) => data)
+          .catch((error) => {
+            // Forget the failed request so the next open retries.
+            teamsRequest.current = undefined;
+
+            throw error;
+          });
+        teamsRequest.current = { filterJoinable, promise };
+      }
+
+      return teamsRequest.current?.promise ?? Promise.resolve([]);
+    }, [filterJoinable]);
 
-    const teamsTree = useMemo(
-      () => buildTeamsSelectableTree(teams, filterJoinable),
-      [teams, filterJoinable]
+    useEffect(() => {
+      setIsLoading(true);
+      loadTeams()
+        .then((data) => showTeamsAlert && setNoTeam(isEmpty(data)))
+        .catch(notifyError)
+        .finally(() => setIsLoading(false));
+    }, [loadTeams, notifyError, showTeamsAlert]);
+
+    const fetchData = useCallback(
+      async () => ({
+        nodes: buildTeamsSelectableTree(await loadTeams(), filterJoinable),
+      }),
+      [loadTeams, filterJoinable]
     );
 
     const selectedTeamsInternal = useMemo(() => {
       return selectedTeams?.map((selectedTeam) => ({
+        id: selectedTeam.id,
         label: getEntityName(selectedTeam),
         value: selectedTeam.id,
       }));
     }, [selectedTeams]);
 
     return (
-      <>
+      <div ref={ref}>
         <TreeSelect
-          allowClear
-          labelInValue
           multiple
-          showSearch
-          treeDefaultExpandAll
+          searchable
           data-testid="team-select"
-          dropdownMatchSelectWidth={false}
-          dropdownStyle={{ maxHeight: 300, overflow: 'auto' }}
-          getPopupContainer={(trigger) => trigger.parentElement}
-          loading={isLoading}
-          maxTagCount={maxValueCount}
-          maxTagPlaceholder={(omittedValues) =>
-            renderMaxTagPlaceholder(omittedValues.length, t)
-          }
-          open={open}
+          fetchData={fetchData}
+          isLoading={isLoading}
+          isOpen={open}
+          maxVisibleItems={maxValueCount}
           placeholder={placeholder}
-          placement="bottomLeft"
-          popupClassName="teams-custom-dropdown-class"
-          ref={ref}
-          showCheckedStrategy={TreeSelect.SHOW_CHILD}
-          style={{ width: '100%' }}
-          tagRender={TagRenderer}
-          treeData={teamsTree}
-          treeLine={{ showLeafIcon }}
-          treeNodeFilterProp="title"
+          showCheckbox={false}
+          showIcon={false}
           value={selectedTeamsInternal}
           onChange={onChange}
-          onDropdownVisibleChange={handleDropdownChange}
+          onFetchError={notifyError}
+          onOpenChange={handleDropdownChange}
         />
         {noTeam && (
           <Alert
             showIcon
             className="m-t-md"
-            message={t('message.no-entity-data-available', {
+            title={t('message.no-entity-data-available', {
               entity: t('label.team-plural'),
             })}
-            type="info"
+            variant="brand"
           />
         )}
-      </>
+      </div>
     );
   }
 );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx
index 80e53a706601..7c31b34fd669 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx
@@ -14,10 +14,11 @@
 import {
   Badge,
   Dropdown,
+  RadioButtonBase,
   Tooltip,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Radio } from 'antd';
+
 import { isEmpty, orderBy } from 'lodash';
 import {
   FC,
@@ -184,7 +185,7 @@ export const UserProfileIcon = () => {
 
           {defaultPersona?.id === item.id && (
             <Badge
-              className="tw:mr-2 tw:ml-1 tw:font-medium tw:shadow-xs"
+              className="tw:mr-2 tw:ml-1 tw:font-medium"
               color="brand"
               data-testid="default-persona-tag"
               size="sm"
@@ -194,7 +195,12 @@ export const UserProfileIcon = () => {
           )}
         </div>
 
-        <Radio checked={selectedPersona?.id === item.id} />
+        {selectedPersona?.id === item.id && (
+          <span className="tw:sr-only">{t('label.selected')}</span>
+        )}
+        <span aria-hidden="true">
+          <RadioButtonBase isSelected={selectedPersona?.id === item.id} />
+        </span>
       </div>
     ),
     [selectedPersona, defaultPersona, t]
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx
index f37f504d4d87..5d70f2da8eb0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx
@@ -211,7 +211,6 @@ describe('UserProfileIcon', () => {
     personaLabels = screen.getAllByTestId('persona-label');
 
     expect(personaLabels).toHaveLength(3);
-    expect(screen.getAllByRole('radio')).toHaveLength(3);
   });
 
   it('should handle persona selection', async () => {
@@ -262,7 +261,7 @@ describe('UserProfileIcon', () => {
     await openDropdown();
 
     expect(screen.queryByTestId('default-persona-tag')).not.toBeInTheDocument();
-    expect(screen.getAllByRole('radio').length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId('persona-label').length).toBeGreaterThan(0);
   });
 
   it('should update dropdown labels when language changes', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.component.tsx
index 6d491a164deb..82a71eea1519 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.component.tsx
@@ -12,6 +12,10 @@
  */
 
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
   Badge,
   Box,
   Card,
@@ -19,7 +23,6 @@ import {
   Grid,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Collapse } from 'antd';
 import { AxiosError } from 'axios';
 import { isEmpty } from 'lodash';
 import React, { useEffect, useState } from 'react';
@@ -49,8 +52,6 @@ import { showErrorToast } from '../../../../../utils/ToastUtils';
 import Loader from '../../../../common/Loader/Loader';
 import './UserPermissions.style.less';
 
-const { Panel } = Collapse;
-
 interface UserPermissionsProps {
   username: string;
   isLoggedInUser: boolean;
@@ -171,41 +172,52 @@ const UserPermissions: React.FC<UserPermissionsProps> = ({
       policy.effect === 'ALLOW' ? 'success' : nonAllowPolicyColor;
 
     return (
-      <Collapse ghost className="policy-collapse" key={index}>
-        <Panel
-          header={
-            <Box
-              inline
-              align="center"
-              className="layout-space layout-space-horizontal"
-              gap={2}
-              itemClassName="layout-space-item">
-              <Link
-                to={getEntityLink(
-                  'policy',
-                  policy.policy.fullyQualifiedName || ''
-                )}>
-                {getEntityName(policy.policy)}
-              </Link>
-              <Badge
-                className="tw:inline-flex tw:mr-2"
-                color={policyTagColor}
-                size="sm"
-                type="color">
-                {policy.effect}
-              </Badge>
-              <Typography color="secondary">
-                <span>{policy.rules.length}</span>
-                {t('label.rule-lowercase-plural')}
-              </Typography>
+      <Accordion allowsMultipleExpanded className="policy-collapse" key={index}>
+        <AccordionItem id={String(index)} key={index}>
+          <Box align="center" gap={2}>
+            <AccordionHeader
+              aria-label={t('label.entity-detail-plural', {
+                entity: getEntityName(policy.policy),
+              })}
+              className="tw:w-auto"
+            />
+            <Box className="tw:min-w-0 tw:flex-1">
+              <Box
+                inline
+                align="center"
+                className="layout-space layout-space-horizontal"
+                gap={2}
+                itemClassName="layout-space-item">
+                <Link
+                  to={getEntityLink(
+                    'policy',
+                    policy.policy.fullyQualifiedName || ''
+                  )}>
+                  {getEntityName(policy.policy)}
+                </Link>
+                <Badge
+                  className="tw:inline-flex tw:mr-2"
+                  color={policyTagColor}
+                  size="sm"
+                  type="color">
+                  {policy.effect}
+                </Badge>
+                <Typography color="secondary">
+                  <span>{policy.rules.length}</span>
+                  {t('label.rule-lowercase-plural')}
+                </Typography>
+              </Box>
             </Box>
-          }
-          key={index}>
-          <div className="rules-container">
-            {policy.rules.map((rule, ruleIndex) => renderRule(rule, ruleIndex))}
-          </div>
-        </Panel>
-      </Collapse>
+          </Box>
+          <AccordionPanel>
+            <div className="rules-container">
+              {policy.rules.map((rule, ruleIndex) =>
+                renderRule(rule, ruleIndex)
+              )}
+            </div>
+          </AccordionPanel>
+        </AccordionItem>
+      </Accordion>
     );
   };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.style.less
index b62822b3b425..f0df2d372088 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserPermissions/UserPermissions.style.less
@@ -17,16 +17,6 @@
   padding: var(--om-space-16);
   max-width: 1200px;
 
-  .policy-collapse {
-    .ant-collapse-header {
-      padding-left: 0 !important;
-    }
-
-    .ant-collapse-content-box {
-      padding-left: var(--om-space-24);
-    }
-  }
-
   .rule-item {
     padding: var(--om-space-12);
     background-color: @grey-1;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx
index a159821e85ad..f7439e70d60f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx
@@ -12,6 +12,7 @@
  */
 
 import {
+  Box,
   Button,
   ButtonUtility,
   Divider,
@@ -44,7 +45,6 @@ const UserProfileTeams = ({
   const [isTeamsEdit, setIsTeamsEdit] = useState(false);
   const [selectedTeams, setSelectedTeams] = useState<EntityReference[]>([]);
   const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
-  const [popoverHeight, setPopoverHeight] = useState<number>(156);
   const teamsSelectableRef = useRef<HTMLDivElement | null>(null);
 
   const handleTeamsSave = async () => {
@@ -92,29 +92,6 @@ const UserProfileTeams = ({
     setIsDropdownOpen(visible);
   };
 
-  useEffect(() => {
-    const observer = new MutationObserver(() => {
-      const dropdown = document.querySelector(
-        '.teams-custom-dropdown-class'
-      ) as HTMLElement;
-
-      if (dropdown) {
-        setPopoverHeight(dropdown.scrollHeight + 156);
-      }
-    });
-
-    const dropdown = document.querySelector('.teams-custom-dropdown-class');
-    if (dropdown) {
-      observer.observe(dropdown, {
-        attributes: true,
-        childList: true,
-        subtree: true,
-      });
-    }
-
-    return () => observer.disconnect();
-  }, [isDropdownOpen]);
-
   return (
     <div
       className="d-flex flex-col w-full  p-[20px] user-profile-card"
@@ -144,21 +121,18 @@ const UserProfileTeams = ({
                 className="profile-edit-popover-card"
                 containerClassName="tw:w-95 tw:p-5"
                 placement="top end">
-                <div
-                  className="user-profile-edit-popover-card relative"
+                {/* The team tree opens in its own overlay, so the card keeps a fixed height. */}
+                <Box
+                  className="tw:h-39"
                   data-testid="profile-teams-edit-popover"
-                  style={{
-                    height: `${popoverHeight}px`,
-                  }}>
-                  <div className="d-flex justify-start items-center gap-2 m-b-sm">
-                    <div className="d-flex flex-start items-center">
-                      <IconTeamsGrey height={16} />
-                    </div>
-
-                    <Typography className="user-profile-edit-popover-card-title">
+                  direction="col"
+                  gap={3}>
+                  <Box align="center" gap={2}>
+                    <IconTeamsGrey height={16} />
+                    <Typography size="text-sm" weight="semibold">
                       {t('label.team-plural')}
                     </Typography>
-                  </div>
+                  </Box>
 
                   <div
                     className="border p-2 bg-gray-100 rounded-md"
@@ -175,18 +149,13 @@ const UserProfileTeams = ({
                     />
                   </div>
 
-                  <div className="flex justify-end gap-2 mt-4">
+                  <Box className="tw:mt-auto" gap={2} justify="end">
                     <Button
                       aria-label={t('label.cancel')}
                       color="primary"
                       data-testid="teams-edit-close-btn"
                       iconLeading={<ClosePopoverIcon height={24} />}
                       size="xs"
-                      style={{
-                        position: 'absolute',
-                        bottom: '0px',
-                        right: '38px',
-                      }}
                       onClick={handleCloseEditTeam}
                     />
                     <Button
@@ -196,11 +165,10 @@ const UserProfileTeams = ({
                       iconLeading={<SavePopoverIcon height={24} />}
                       isLoading={isLoading}
                       size="xs"
-                      style={{ position: 'absolute', bottom: '0px' }}
                       onClick={handleTeamsSave}
                     />
-                  </div>
-                </div>
+                  </Box>
+                </Box>
               </Popover>
             </PopoverTrigger>
           )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx
index 465554657c6e..8f28fac98604 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/SSOConfigurationForm.tsx
@@ -11,16 +11,16 @@
  *  limitations under the License.
  */
 
-import { Button, Card, Typography } from '@openmetadata/ui-core-components';
 import {
-  Check,
-  UploadCloud02,
-  X,
-} from '@openmetadata/ui-core-components/icons';
+  Button,
+  Card,
+  FileUploadDropZone,
+  Typography,
+} from '@openmetadata/ui-core-components';
+import { Check, X } from '@openmetadata/ui-core-components/icons';
 import Form from '@rjsf/core';
 import { RegistryFieldsType, WidgetProps } from '@rjsf/utils';
 import validator from '@rjsf/validator-ajv8';
-import { Upload } from 'antd';
 import classNames from 'classnames';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -313,43 +313,17 @@ const SSOConfigurationFormRJSF = ({
     showSamlUpload ? (
       <div className="m-b-md">
         {metadataUploadStatus === null && (
-          <Upload.Dragger
+          <FileUploadDropZone
             accept=".xml,application/xml,text/xml"
-            beforeUpload={(file) => {
-              const dataTransfer = new DataTransfer();
-              dataTransfer.items.add(file);
-              handleMetadataFileUpload(dataTransfer.files);
-
-              return false;
-            }}
-            className="saml-metadata-upload-drop-zone"
+            allowsMultiple={false}
+            clickToUploadLabel={t('label.upload-lowercase')}
             data-testid="file-uploader"
-            multiple={false}
-            showUploadList={false}>
-            <div
-              className="flex flex-center flex-column gap-1"
-              data-testid="file-upload-drop-zone">
-              <div
-                className="flex flex-shrink items-center justify-center bg-white border border-radius-xs"
-                style={{ width: '40px', height: '40px' }}>
-                <UploadCloud02 className="text-grey-600" size={20} />
-              </div>
-              <div
-                className="flex align-center flex-wrap gap-4 justify-center"
-                style={{ maxWidth: '220px' }}>
-                <Typography className="font-medium">
-                  {t('label.click-to')}{' '}
-                  <Button color="link-color" size="xs">
-                    {t('label.upload-lowercase')}
-                  </Button>{' '}
-                  {t('label.or-drag-and-drop-an-xml-file-here')}
-                </Typography>
-              </div>
-              <Typography className="text-xs" color="secondary">
-                {t('message.upload-saml-metadata-xml-description')}
-              </Typography>
-            </div>
-          </Upload.Dragger>
+            hint={t('message.upload-saml-metadata-xml-description')}
+            input-data-testid="file-upload-input"
+            orDragAndDropLabel={t('label.or-drag-and-drop-an-xml-file-here')}
+            onDropFiles={handleMetadataFileUpload}
+            onDropUnacceptedFiles={handleMetadataFileUpload}
+          />
         )}
         {metadataUploadStatus !== null && (
           <MetadataUploadStatusCard
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less
index 05a27a6e2d5d..bd0f88ef979a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOConfigurationForm/sso-configuration-form.less
@@ -848,18 +848,6 @@
   background-color: @red-7;
 }
 
-.saml-metadata-upload-drop-zone {
-  &.ant-upload-drag {
-    background-color: @grey-9;
-    border: 1px solid @grey-15;
-    border-radius: @border-rad-xs;
-  }
-
-  &.ant-upload.ant-upload-drag:not(.ant-upload-disabled):hover {
-    border-color: @grey-15;
-  }
-}
-
 .sso-form-sticky-header {
   height: @size-lg;
   background-color: var(--tw-color-bg-primary);
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/SSOGroupedFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/SSOGroupedFieldTemplate.tsx
index 62c4b9e923c8..22d7e515b32e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/SSOGroupedFieldTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/SSOGroupedFieldTemplate.tsx
@@ -12,12 +12,18 @@
  */
 
 import { PlusOutlined } from '@ant-design/icons';
-import { Box, Button } from '@openmetadata/ui-core-components';
+import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+  Box,
+  Button,
+} from '@openmetadata/ui-core-components';
 import {
   ObjectFieldTemplatePropertyType,
   ObjectFieldTemplateProps,
 } from '@rjsf/utils';
-import { Collapse } from 'antd';
 import classNames from 'classnames';
 import { isEmpty, isUndefined } from 'lodash';
 import { createElement, Fragment, FunctionComponent } from 'react';
@@ -459,36 +465,36 @@ export const SSOGroupedFieldTemplate: FunctionComponent<
       })}
 
       {!isEmpty(advancedProperties) && (
-        <Collapse
+        <Accordion
+          allowsMultipleExpanded
           className={classNames('sso-advanced-properties-collapse', {
             'm-t-sm': shouldApplyGrouping,
-          })}
-          expandIconPosition="end">
+          })}>
           {/* Advanced fields must stay mounted: transformErrors discards any error whose
               field is absent from the DOM, so destroying the collapsed panel silently
               swallowed both client and server validation errors for fields like
               tokenValidity instead of surfacing them. */}
-          <Collapse.Panel
-            forceRender
-            header={t('label.advanced-config')}
-            key="1">
-            <div
-              className={classNames({
-                'sso-field-group-box': shouldApplyGrouping,
-                'default-object-field': !shouldApplyGrouping,
-              })}>
-              {advancedProperties.map((element) => (
-                <div
-                  className={classNames('property-wrapper', {
-                    'additional-fields': schema.additionalProperties,
-                  })}
-                  key={element.content.key}>
-                  {element.content}
-                </div>
-              ))}
-            </div>
-          </Collapse.Panel>
-        </Collapse>
+          <AccordionItem id="1" key="1">
+            <AccordionHeader>{t('label.advanced-config')}</AccordionHeader>
+            <AccordionPanel>
+              <div
+                className={classNames({
+                  'sso-field-group-box': shouldApplyGrouping,
+                  'default-object-field': !shouldApplyGrouping,
+                })}>
+                {advancedProperties.map((element) => (
+                  <div
+                    className={classNames('property-wrapper', {
+                      'additional-fields': schema.additionalProperties,
+                    })}
+                    key={element.content.key}>
+                    {element.content}
+                  </div>
+                ))}
+              </div>
+            </AccordionPanel>
+          </AccordionItem>
+        </Accordion>
       )}
     </Fragment>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/sso-grouped-field-template.less b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/sso-grouped-field-template.less
index f71f65e79c90..255c6add846f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/sso-grouped-field-template.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOGroupedFieldTemplate/sso-grouped-field-template.less
@@ -162,27 +162,3 @@
   align-items: center;
   gap: @size-xs;
 }
-
-.ant-collapse.sso-advanced-properties-collapse {
-  border-radius: @border-rad-xs;
-
-  .ant-collapse-item {
-    border-radius: @border-rad-xs;
-
-    .ant-collapse-header {
-      background: @grey-9;
-      border-radius: @border-rad-xs;
-    }
-    .ant-collapse-content {
-      border: none;
-      border-radius: 0 0 @border-rad-xs @border-rad-xs;
-      .ant-collapse-content-box {
-        padding: 0;
-        border-radius: 0 0 @border-rad-xs @border-rad-xs;
-        .sso-field-group-box {
-          border-radius: 0 0 @border-rad-xs @border-rad-xs;
-        }
-      }
-    }
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagChipTooltip/TagChipTooltip.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagChipTooltip/TagChipTooltip.test.tsx
new file mode 100644
index 000000000000..8a462ea0d0e2
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagChipTooltip/TagChipTooltip.test.tsx
@@ -0,0 +1,61 @@
+/*
+ *  Copyright 2026 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 { act, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { TagChipTooltip } from './TagChipTooltip';
+
+const advance = (ms: number) =>
+  act(async () => {
+    jest.advanceTimersByTime(ms);
+  });
+
+describe('TagChipTooltip', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
+  it('keeps the tooltip open for as long as the chip is hovered', async () => {
+    const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+    render(
+      <TagChipTooltip title="Tier.Tier2 description">
+        <a href="/tag/Tier.Tier2">Tier2</a>
+      </TagChipTooltip>
+    );
+    const chip = screen.getByText('Tier2');
+
+    // react-aria needs one warm-up hover before the delayed open, as in TopicCard.test.
+    await user.hover(chip);
+    await advance(1000);
+    await user.unhover(chip);
+    await user.hover(chip);
+    await advance(1000);
+
+    expect(screen.getByRole('tooltip')).toHaveTextContent(
+      'Tier.Tier2 description'
+    );
+
+    await advance(5000);
+
+    expect(screen.getByRole('tooltip')).toBeInTheDocument();
+
+    await user.unhover(chip);
+    await advance(1000);
+
+    expect(screen.queryByRole('tooltip')).not.toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagChipTooltip/TagChipTooltip.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagChipTooltip/TagChipTooltip.tsx
new file mode 100644
index 000000000000..155357edb1c2
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagChipTooltip/TagChipTooltip.tsx
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2026 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 { Tooltip } from '@openmetadata/ui-core-components';
+import { ReactNode, useState } from 'react';
+import { useFocusWithin } from 'react-aria';
+import { Focusable } from 'react-aria-components';
+
+/**
+ * Anchors a chip's tooltip on a wrapper kept out of the tab order, so the chip
+ * is one tab stop, its link. The tooltip opens on hover, and when focus reaches
+ * the link inside: the wrapper itself is never focused.
+ */
+export const TagChipTooltip = ({
+  title,
+  children,
+}: {
+  title: ReactNode;
+  children: ReactNode;
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const { focusWithinProps } = useFocusWithin({
+    onFocusWithinChange: setIsOpen,
+  });
+
+  return (
+    <Tooltip
+      arrow
+      delay={500}
+      isOpen={isOpen}
+      placement="top"
+      title={title}
+      onOpenChange={setIsOpen}>
+      <Focusable excludeFromTabOrder>
+        <span className="tw:inline-flex" {...focusWithinProps}>
+          {children}
+        </span>
+      </Focusable>
+    </Tooltip>
+  );
+};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx
index 4a78634b0990..5fa784cff092 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/TagsViewer.tsx
@@ -25,15 +25,7 @@ import {
 } from '@openmetadata/ui-core-components';
 import { isEmpty, sortBy, uniqBy } from 'lodash';
 import { EntityTags } from 'Models';
-import {
-  FunctionComponent,
-  ReactNode,
-  useCallback,
-  useMemo,
-  useState,
-} from 'react';
-import { useFocusWithin } from 'react-aria';
-import { Focusable } from 'react-aria-components';
+import { FunctionComponent, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { LIST_SIZE, NO_DATA_PLACEHOLDER } from '../../../constants/constants';
 import { LabelType, TagSource } from '../../../generated/type/tagLabel';
@@ -41,43 +33,10 @@ import EntityLink from '../../../utils/EntityLink';
 import tagClassBase from '../../../utils/TagClassBase';
 import { getTagName, getTagRedirectLink } from '../../../utils/TagsPureUtils';
 import { getTagTooltip } from '../../../utils/TagsUtils';
+import { TagChipTooltip } from '../TagChipTooltip/TagChipTooltip';
 import './tags-viewer.less';
 import { DisplayType, TagsViewerProps } from './TagsViewer.interface';
 
-/**
- * Anchors a chip's tooltip on a wrapper kept out of the tab order, so the chip
- * is one tab stop, its link. The tooltip opens on hover, and when focus reaches
- * the link inside: the wrapper itself is never focused.
- */
-const TagChipTooltip = ({
-  title,
-  children,
-}: {
-  title: ReactNode;
-  children: ReactNode;
-}) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const { focusWithinProps } = useFocusWithin({
-    onFocusWithinChange: setIsOpen,
-  });
-
-  return (
-    <Tooltip
-      arrow
-      delay={500}
-      isOpen={isOpen}
-      placement="top"
-      title={title}
-      onOpenChange={setIsOpen}>
-      <Focusable excludeFromTabOrder>
-        <span className="tw:inline-flex" {...focusWithinProps}>
-          {children}
-        </span>
-      </Focusable>
-    </Tooltip>
-  );
-};
-
 const TagsViewer: FunctionComponent<TagsViewerProps> = ({
   tags,
   sizeCap = LIST_SIZE,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.interface.tsx
index 5fd3d1a58de5..d5b3d7e8bc3b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.interface.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.interface.tsx
@@ -11,9 +11,9 @@
  *  limitations under the License.
  */
 
-import { TableProps } from 'antd';
 import { HTMLAttributes, ReactNode } from 'react';
 import { Field } from '../../../generated/entity/data/topic';
+import { TableProps } from '../../common/Table/Table.interface';
 
 export interface TopicSchemaFieldsProps
   extends HTMLAttributes<TableProps<Field>> {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.interface.ts
index 4e4342ed90cb..f9a89274b687 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.interface.ts
@@ -10,7 +10,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import type { RcFile } from 'antd/lib/upload';
 
 declare type BeforeUploadValueType = void | boolean | string | Blob | File;
 
@@ -20,8 +19,8 @@ export interface UploadFileProps {
   fileType: string;
   variant?: 'compact' | 'default';
   beforeUpload?: (
-    file: RcFile,
-    FileList: RcFile[]
+    file: File,
+    FileList: File[]
   ) => BeforeUploadValueType | Promise<BeforeUploadValueType>;
-  onCSVUploaded: (event: ProgressEvent<FileReader>, file?: RcFile) => void;
+  onCSVUploaded: (event: ProgressEvent<FileReader>, file?: File) => void;
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.test.tsx
index f6338f441cbe..29940fd9ba21 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.test.tsx
@@ -39,14 +39,12 @@ describe('UploadFile Component', () => {
 
     expect(screen.getByTestId('upload-file-widget')).toBeInTheDocument();
 
-    const uploadIcon = screen.getByRole('button').querySelector('svg');
-
-    expect(uploadIcon).toHaveClass('tw:text-fg-quaternary');
-    expect(uploadIcon).toHaveAttribute('stroke', 'currentColor');
-    expect(uploadIcon).toHaveAttribute('width', '86');
-    expect(uploadIcon).toHaveAttribute('height', '86');
+    expect(screen.getByTestId('upload-file-input')).toHaveAttribute(
+      'accept',
+      '.csv'
+    );
     expect(
-      await screen.findByText(/message.drag-and-drop-or-browse-csv-files-here/)
+      screen.getByRole('button', { name: 'label.click-to-browse' })
     ).toBeInTheDocument();
   });
 
@@ -55,23 +53,23 @@ describe('UploadFile Component', () => {
 
     const uploadWidget = screen.getByTestId('upload-file-widget');
 
-    expect(uploadWidget).toHaveAttribute('disabled');
+    expect(uploadWidget).toHaveAttribute('aria-disabled', 'true');
+    expect(screen.getByTestId('upload-file-input')).toBeDisabled();
   });
 
   it('should not render with disabled state', () => {
     render(<UploadFile {...defaultProps} />);
 
-    const uploadWidget = screen.getByTestId('upload-file-widget');
-
-    expect(uploadWidget).not.toHaveAttribute('disabled');
+    expect(screen.getByTestId('upload-file-input')).not.toBeDisabled();
   });
 
   it('should render with custom file type', () => {
     render(<UploadFile {...defaultProps} fileType=".json,.xml" />);
 
-    const uploadWidget = screen.getByTestId('upload-file-widget');
-
-    expect(uploadWidget).toHaveAttribute('accept', '.json,.xml');
+    expect(screen.getByTestId('upload-file-input')).toHaveAttribute(
+      'accept',
+      '.json,.xml'
+    );
   });
 
   it('should call onCSVUploaded when file is uploaded successfully', async () => {
@@ -207,12 +205,12 @@ describe('UploadFile Component', () => {
     render(<UploadFile {...defaultProps} />);
 
     expect(
-      await screen.findByText(/message.drag-and-drop-or-browse-csv-files-here/)
+      await screen.findByText(/label.click-to-browse/)
     ).toBeInTheDocument();
   });
 
   it('should render compact upload variant', async () => {
-    const { container } = render(
+    render(
       <UploadFile
         {...defaultProps}
         acceptedFileDescription="Accepts .csv up to 10 MB"
@@ -220,11 +218,9 @@ describe('UploadFile Component', () => {
       />
     );
 
+    expect(screen.getByTestId('upload-file-widget')).toBeInTheDocument();
     expect(
-      container.querySelector('.file-dragger-wrapper-compact')
-    ).toBeInTheDocument();
-    expect(
-      await screen.findByText(/message.drop-csv-or-browse/)
+      await screen.findByText(/label.click-to-browse/)
     ).toBeInTheDocument();
     expect(screen.getByText('Accepts .csv up to 10 MB')).toBeInTheDocument();
   });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.tsx
index e8ecc107c881..394364fcaeee 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/UploadFile.tsx
@@ -10,118 +10,81 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Box, Typography } from '@openmetadata/ui-core-components';
-import { UploadCloud01 } from '@openmetadata/ui-core-components/icons';
-import { UploadProps } from 'antd';
-import type { RcFile } from 'antd/lib/upload';
-import Dragger from 'antd/lib/upload/Dragger';
+import { FileUploadDropZone } from '@openmetadata/ui-core-components';
 import { AxiosError } from 'axios';
-import type { UploadRequestOption } from 'rc-upload/lib/interface';
-import { FC, useCallback, useState } from 'react';
+import { FC, useCallback, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Transi18next } from '../../utils/i18next/LocalUtil';
 import { showErrorToast } from '../../utils/ToastUtils';
 import Loader from '../common/Loader/Loader';
-import './upload-file.less';
 import { UploadFileProps } from './UploadFile.interface';
 
 const UploadFile: FC<UploadFileProps> = ({
   acceptedFileDescription,
   disabled,
   fileType,
-  variant = 'default',
   beforeUpload,
   onCSVUploaded,
 }) => {
   const [uploading, setUploading] = useState(false);
+  const processing = useRef(false);
   const { t } = useTranslation();
-
-  const handleUpload: UploadProps['customRequest'] = useCallback(
-    (options: UploadRequestOption) => {
+  const handleUpload = useCallback(
+    async (files: FileList) => {
+      const file = files[0];
+      if (!file || processing.current) {
+        return;
+      }
+      processing.current = true;
       setUploading(true);
-      const reader = new FileReader();
-      reader.onload = (e) => {
+      const finish = () => {
+        processing.current = false;
         setUploading(false);
-        onCSVUploaded(e, options.file as RcFile);
-      };
-      reader.onerror = () => {
-        setUploading(false);
-        showErrorToast(new Error(t('server.unexpected-error')) as AxiosError);
       };
       try {
-        reader.readAsText(options.file as Blob);
+        const result = await beforeUpload?.(file, Array.from(files));
+        if (result === false || typeof result === 'string') {
+          finish();
+
+          return;
+        }
+        const reader = new FileReader();
+        reader.onload = (event) => {
+          finish();
+          onCSVUploaded(event, file);
+        };
+        reader.onerror = () => {
+          finish();
+          showErrorToast(new Error(t('server.unexpected-error')) as AxiosError);
+        };
+        // beforeUpload may transform the contents while callers still need the
+        // original file's name for the import preview and downloaded report.
+        reader.readAsText(result instanceof Blob ? result : file);
       } catch (error) {
-        setUploading(false);
+        finish();
         showErrorToast(error as AxiosError);
       }
     },
-    [onCSVUploaded, t]
+    [beforeUpload, onCSVUploaded, t]
   );
-
   if (uploading) {
     return <Loader />;
   }
 
-  const isCompact = variant === 'compact';
-
   return (
-    <Dragger
+    <FileUploadDropZone
       accept={fileType}
-      beforeUpload={beforeUpload}
-      className={`file-dragger-wrapper${
-        isCompact ? ' file-dragger-wrapper-compact' : ''
-      }`}
-      customRequest={handleUpload}
+      allowsMultiple={false}
+      clickToUploadLabel={t('label.click-to-browse')}
       data-testid="upload-file-widget"
-      disabled={disabled}
-      multiple={false}
-      showUploadList={false}>
-      {isCompact ? (
-        <div className="file-dragger-compact-content">
-          <span className="file-dragger-compact-icon">
-            <UploadCloud01 size={22} />
-          </span>
-          <Typography className="file-dragger-compact-title">
-            <Transi18next
-              i18nKey="message.drop-csv-or-browse"
-              renderElement={<span className="browse-text" />}
-              values={{
-                text: t('label.click-to-browse'),
-              }}
-            />
-          </Typography>
-          <Typography className="file-dragger-compact-description">
-            {acceptedFileDescription ??
-              t('message.accepts-file-up-to-size', {
-                fileType,
-                size: '10 MB',
-              })}
-          </Typography>
-        </div>
-      ) : (
-        <Box
-          inline
-          align="center"
-          className="layout-space w-full justify-center"
-          direction="col"
-          itemClassName="layout-space-item"
-          style={{
-            columnGap: 'var(--om-space-42)',
-            rowGap: 'var(--om-space-42)',
-          }}>
-          <UploadCloud01 className="tw:text-fg-quaternary" size={86} />
-          <Typography className="file-dragger-text">
-            <Transi18next
-              i18nKey="message.drag-and-drop-or-browse-csv-files-here"
-              renderElement={<span className="browse-text" />}
-              values={{
-                text: t('label.browse'),
-              }}
-            />
-          </Typography>
-        </Box>
-      )}
-    </Dragger>
+      hint={
+        acceptedFileDescription ??
+        t('message.accepts-file-up-to-size', { fileType, size: '10 MB' })
+      }
+      input-data-testid="upload-file-input"
+      isDisabled={disabled}
+      orDragAndDropLabel={t('label.or-drag-and-drop')}
+      onDropFiles={handleUpload}
+    />
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/upload-file.less b/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/upload-file.less
deleted file mode 100644
index b7dc6717f79c..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/UploadFile/upload-file.less
+++ /dev/null
@@ -1,99 +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';
-
-.file-dragger-wrapper {
-  padding: @padding-lg;
-  background: var(--tw-color-bg-primary);
-  .file-dragger-text {
-    font-weight: var(--om-font-weight-medium);
-    font-size: var(--om-font-size-md);
-
-    .browse-text {
-      color: @primary-color;
-    }
-  }
-  .ant-upload-disabled {
-    .file-dragger-text,
-    .file-dragger-compact-title,
-    .file-dragger-compact-description {
-      color: @grey-300;
-
-      .browse-text {
-        color: @grey-300;
-      }
-    }
-  }
-}
-
-.file-dragger-wrapper-compact {
-  background: transparent;
-  padding: 0;
-
-  &.ant-upload-wrapper .ant-upload-drag {
-    background: @grey-26;
-    border: 1.5px dashed @grey-15;
-    border-radius: var(--om-radius-xl);
-    transition: background var(--om-duration-180) ease,
-      border-color var(--om-duration-180) ease;
-
-    &:hover {
-      background: @primary-50;
-      border-color: @primary-6;
-    }
-  }
-
-  &.ant-upload-wrapper .ant-upload-drag .ant-upload {
-    padding: var(--om-space-38) var(--om-space-24);
-  }
-}
-
-.file-dragger-compact-content {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  gap: var(--om-space-8);
-  justify-content: center;
-  min-height: 136px;
-  text-align: center;
-}
-
-.file-dragger-compact-icon {
-  align-items: center;
-  background: @primary-50;
-  border-radius: var(--om-radius-999);
-  color: @primary-6;
-  display: inline-flex;
-  height: 40px;
-  justify-content: center;
-  margin-bottom: var(--om-space-6);
-  width: 40px;
-}
-
-.file-dragger-compact-title {
-  color: @grey-900;
-  font-size: var(--om-font-size-15);
-  font-weight: @font-semibold;
-  line-height: 22px;
-
-  .browse-text {
-    color: @primary-6;
-  }
-}
-
-.file-dragger-compact-description {
-  color: @grey-600;
-  font-size: var(--om-font-size-13);
-  font-weight: @font-regular;
-  line-height: 18px;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/WorkflowBuilder/WorkflowHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/WorkflowBuilder/WorkflowHeader.tsx
index 344b754c6a85..418ab19cb1c2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/WorkflowBuilder/WorkflowHeader.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/WorkflowBuilder/WorkflowHeader.tsx
@@ -27,11 +27,11 @@ import {
 import { AxiosError } from 'axios';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg';
 import { ReactComponent as WorkflowIcon } from '../../../assets/svg/workflow.svg';
 import { useWorkflowModeContext } from '../../../contexts/WorkflowModeContext';
 import { WorkflowHeaderProps } from '../../../interface/workflow-builder-components.interface';
 import { showErrorToast } from '../../../utils/ToastUtils';
+import { EditIconButton } from '../../common/IconButtons/EditIconButton';
 import { WorkflowControls } from './WorkflowControls';
 
 const getInitialDisplayName = (title?: string) => title ?? '';
@@ -160,15 +160,15 @@ export const WorkflowHeader: React.FC<WorkflowHeaderProps> = ({
     () =>
       !isViewMode &&
       !isNoOp && (
-        <Button
-          color="tertiary"
+        <EditIconButton
+          newLook
           data-testid="edit-workflow-title-button"
-          iconLeading={EditIcon}
-          size="sm"
-          onPress={handleOpenEditModal}
+          size="small"
+          title={t('label.edit-entity', { entity: t('label.workflow') })}
+          onClick={handleOpenEditModal}
         />
       ),
-    [isViewMode, isNoOp, handleOpenEditModal]
+    [isViewMode, isNoOp, handleOpenEditModal, t]
   );
 
   const workflowIcon = (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/CollapseHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/CollapseHeader.tsx
index 1c42e5033f16..1e41e0ec5285 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/CollapseHeader.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/CollapseHeader.tsx
@@ -10,8 +10,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Button, Dropdown, Typography } from '@openmetadata/ui-core-components';
+import { Box, Button, Dropdown } from '@openmetadata/ui-core-components';
 import { Plus } from '@openmetadata/ui-core-components/icons';
+import { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
 export interface CollapseHeaderMenuItem {
@@ -21,7 +22,7 @@ export interface CollapseHeaderMenuItem {
 }
 
 interface CollapseHeaderProps {
-  title: string;
+  title: ReactNode;
   menuItems?: CollapseHeaderMenuItem[];
   handleAddNewBoost?: () => void;
   dataTestId?: string;
@@ -37,7 +38,7 @@ const CollapseHeader = ({
 
   return (
     <div className="d-flex items-center justify-between">
-      <Typography className="text-md font-semibold">{title}</Typography>
+      <Box className="tw:min-w-0 tw:flex-1">{title}</Box>
       {menuItems ? (
         <Dropdown.Root>
           <Button
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx
index cd6105566eea..fcdada4d2310 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx
@@ -128,7 +128,9 @@ describe('EntityImport component', () => {
     expect(uploadDragger).toBeInTheDocument();
 
     await act(async () => {
-      fireEvent.change(uploadDragger, { target: { files: [file] } });
+      fireEvent.change(screen.getByTestId('upload-file-input'), {
+        target: { files: [file] },
+      });
     });
 
     expect(
@@ -195,7 +197,9 @@ describe('EntityImport component', () => {
     expect(uploadDragger).toBeInTheDocument();
 
     await act(async () => {
-      fireEvent.change(uploadDragger, { target: { files: [file] } });
+      fireEvent.change(screen.getByTestId('upload-file-input'), {
+        target: { files: [file] },
+      });
     });
 
     expect(
@@ -260,7 +264,9 @@ describe('EntityImport component', () => {
     expect(uploadDragger).toBeInTheDocument();
 
     await act(async () => {
-      fireEvent.change(uploadDragger, { target: { files: [file] } });
+      fireEvent.change(screen.getByTestId('upload-file-input'), {
+        target: { files: [file] },
+      });
     });
 
     expect(
@@ -312,7 +318,9 @@ describe('EntityImport component', () => {
     expect(uploadDragger).toBeInTheDocument();
 
     await act(async () => {
-      fireEvent.change(uploadDragger, { target: { files: [file] } });
+      fireEvent.change(screen.getByTestId('upload-file-input'), {
+        target: { files: [file] },
+      });
     });
 
     expect(
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FilterPattern/FilterPattern.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FilterPattern/FilterPattern.tsx
index a2aade4d277c..2e7c2963bcfb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FilterPattern/FilterPattern.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FilterPattern/FilterPattern.tsx
@@ -13,11 +13,12 @@
 
 import {
   Box,
+  Checkbox,
   Divider,
   Grid,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Checkbox, Select } from 'antd';
+import { Select } from 'antd';
 import { capitalize } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { getLayoutGutter } from '../../../utils/common/layout.utils';
@@ -48,13 +49,14 @@ const FilterPattern = ({
         </Grid.Item>
         <Grid.Item className="layout-column" span={16}>
           <Checkbox
-            checked={checked}
+            aria-label={`${type} ${t('label.filter-pattern')}`}
             className="filter-pattern-checkbox"
             data-testid={`${type}-filter-pattern-checkbox`}
-            disabled={isDisabled}
             id={`root/${type}FilterPattern`}
+            isDisabled={isDisabled}
+            isSelected={checked}
             name={`root/${type}FilterPattern`}
-            onChange={(e) => handleChecked(e.target.checked)}
+            onChange={(e) => handleChecked(e)}
           />
         </Grid.Item>
       </Grid>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx
index 9ba0851b19cf..2a26df4e6fbc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx
@@ -12,12 +12,11 @@
  */
 
 import { InfoCircleOutlined } from '@ant-design/icons';
-import { Tooltip } from '@openmetadata/ui-core-components';
-import { Badge } from 'antd';
+import { Badge, Tooltip } from '@openmetadata/ui-core-components';
+
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { GRAYED_OUT_COLOR } from '../../../constants/constants';
-import { useApplicationStore } from '../../../hooks/useApplicationStore';
 import { HelperTextType } from '../../../interface/FormUtils.interface';
 import { FormItemLabelProps } from './Form.interface';
 
@@ -32,7 +31,6 @@ const FormItemLabel = ({
   betaBadgeClassName,
 }: FormItemLabelProps) => {
   const { t } = useTranslation();
-  const { theme } = useApplicationStore();
 
   return (
     <>
@@ -60,10 +58,10 @@ const FormItemLabel = ({
       {isBeta && (
         <Badge
           className={classNames('m-l-xs', betaBadgeClassName)}
-          color={theme.primaryColor}
-          count={t('label.beta')}
-          size="small"
-        />
+          color="brand"
+          size="sm">
+          {t('label.beta')}
+        </Badge>
       )}
     </>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.test.tsx
index ea254de9932c..5b5debb441d4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.test.tsx
@@ -121,7 +121,7 @@ describe('ObjectFieldTemplate', () => {
         <ObjectFieldTemplate {...propsWithAdvanced} />
       );
 
-      const collapse = container.querySelector('.ant-collapse');
+      const collapse = container.querySelector('.advanced-properties-collapse');
 
       expect(collapse).toBeInTheDocument();
 
@@ -138,7 +138,7 @@ describe('ObjectFieldTemplate', () => {
       );
 
       // The collapse should exist
-      const collapse = container.querySelector('.ant-collapse');
+      const collapse = container.querySelector('.advanced-properties-collapse');
 
       expect(collapse).toBeInTheDocument();
 
@@ -154,7 +154,9 @@ describe('ObjectFieldTemplate', () => {
     it('should not render collapse when no advanced properties', () => {
       const { container } = render(<ObjectFieldTemplate {...defaultProps} />);
 
-      expect(container.querySelector('.ant-collapse')).not.toBeInTheDocument();
+      expect(
+        container.querySelector('.advanced-properties-collapse')
+      ).not.toBeInTheDocument();
     });
 
     it('should separate normal and advanced properties correctly', () => {
@@ -163,7 +165,7 @@ describe('ObjectFieldTemplate', () => {
       );
 
       // Check that collapse exists for advanced properties
-      const collapse = container.querySelector('.ant-collapse');
+      const collapse = container.querySelector('.advanced-properties-collapse');
 
       expect(collapse).toBeInTheDocument();
 
@@ -380,7 +382,9 @@ describe('ObjectFieldTemplate', () => {
         <ObjectFieldTemplate {...allAdvancedProps} />
       );
 
-      expect(container.querySelector('.ant-collapse')).toBeInTheDocument();
+      expect(
+        container.querySelector('.advanced-properties-collapse')
+      ).toBeInTheDocument();
 
       // Advanced properties are in collapsed panel, so check for the header
       const collapseHeader = screen.getByRole('button', {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx
index 683fbf6b0e68..a1977b4e3855 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx
@@ -12,12 +12,18 @@
  */
 
 import { PlusOutlined } from '@ant-design/icons';
-import { Box, Button } from '@openmetadata/ui-core-components';
+import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
+  Box,
+  Button,
+} from '@openmetadata/ui-core-components';
 import {
   ObjectFieldTemplatePropertyType,
   ObjectFieldTemplateProps,
 } from '@rjsf/utils';
-import { Collapse } from 'antd';
 import classNames from 'classnames';
 import { isEmpty, isUndefined } from 'lodash';
 import { createElement, Fragment, FunctionComponent } from 'react';
@@ -26,8 +32,6 @@ import { ADVANCED_PROPERTIES } from '../../../../../constants/Services.constant'
 import serviceUtilClassBase from '../../../../../utils/ServiceUtilClassBase';
 import './object-field-template.less';
 
-const { Panel } = Collapse;
-
 interface PropertyMap {
   advancedProperties: ObjectFieldTemplatePropertyType[];
   normalProperties: ObjectFieldTemplatePropertyType[];
@@ -139,22 +143,26 @@ export const ObjectFieldTemplate: FunctionComponent<
         </div>
       ))}
       {!isEmpty(advancedProperties) && (
-        <Collapse
-          destroyInactivePanel
-          className="advanced-properties-collapse m-t-sm"
-          expandIconPosition="end">
-          <Panel header={`${title} ${t('label.advanced-config')}`} key="1">
-            {advancedProperties.map((element) => (
-              <div
-                className={classNames('property-wrapper', {
-                  'additional-fields': schema.additionalProperties,
-                })}
-                key={element.content.key}>
-                {element.content}
-              </div>
-            ))}
-          </Panel>
-        </Collapse>
+        <Accordion
+          allowsMultipleExpanded
+          className="advanced-properties-collapse m-t-sm">
+          <AccordionItem id="1" key="1">
+            <AccordionHeader>{`${title} ${t(
+              'label.advanced-config'
+            )}`}</AccordionHeader>
+            <AccordionPanel unmountOnCollapse>
+              {advancedProperties.map((element) => (
+                <div
+                  className={classNames('property-wrapper', {
+                    'additional-fields': schema.additionalProperties,
+                  })}
+                  key={element.content.key}>
+                  {element.content}
+                </div>
+              ))}
+            </AccordionPanel>
+          </AccordionItem>
+        </Accordion>
       )}
     </Fragment>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/object-field-template.less b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/object-field-template.less
index 84490821cffa..493224abf06f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/object-field-template.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/object-field-template.less
@@ -10,17 +10,3 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-.advanced-properties-collapse {
-  .ant-collapse-item {
-    .ant-collapse-content {
-      background-color: inherit;
-      border-top: none;
-    }
-    .ant-collapse-content > .ant-collapse-content-box {
-      padding-left: var(--om-space-20);
-    }
-    .ant-collapse-header > .ant-collapse-header-text {
-      font-size: var(--om-font-size-md);
-    }
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/ManifestJsonWidget/ManifestJsonWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/ManifestJsonWidget/ManifestJsonWidget.tsx
index 04ec48666558..2317dc0bf313 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/ManifestJsonWidget/ManifestJsonWidget.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/ManifestJsonWidget/ManifestJsonWidget.tsx
@@ -10,9 +10,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Typography } from '@openmetadata/ui-core-components';
+import { Alert, Typography } from '@openmetadata/ui-core-components';
 import { WidgetProps } from '@rjsf/utils';
-import { Alert } from 'antd';
+
 import { TFunction } from 'i18next';
 import { lazy, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -159,22 +159,22 @@ const ManifestJsonWidget = ({
         <Alert
           showIcon
           className="m-t-xs"
-          message={
+          title={
             <Typography>
               {t('label.valid-manifest-entry-count', {
                 count: validation.entryCount,
               })}
             </Typography>
           }
-          type="success"
+          variant="success"
         />
       )}
       {validation.status === 'error' && (
         <Alert
           showIcon
           className="m-t-xs"
-          message={formatValidationError(validation.error, t)}
-          type="error"
+          title={formatValidationError(validation.error, t)}
+          variant="error"
         />
       )}
     </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/LimitBanner/LimitBanner.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/LimitBanner/LimitBanner.tsx
index d29f673cc017..c4aded7a576a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/LimitBanner/LimitBanner.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/LimitBanner/LimitBanner.tsx
@@ -11,7 +11,6 @@
  *  limitations under the License.
  */
 import Icon from '@ant-design/icons';
-import { Header } from 'antd/lib/layout/layout';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
@@ -29,7 +28,7 @@ export const LimitBanner = () => {
   const showBanner = bannerDetails && !(isTourOpen || isTourPage);
 
   return (
-    <Header
+    <header
       className={classNames('pricing-banner', {
         errored: bannerDetails?.type === 'danger',
       })}
@@ -56,6 +55,6 @@ export const LimitBanner = () => {
         style={{ color: '#546E7A', fontSize: '14px' }}
         onClick={() => setBannerDetails(null)}
       />
-    </Header>
+    </header>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.component.tsx
index e128539ead0b..752a912da8f5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.component.tsx
@@ -12,15 +12,15 @@
  */
 import {
   Box,
+  ProgressBarCircle,
   SkeletonParagraph,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Progress } from 'antd';
+
 import classNames from 'classnames';
 import { isNumber, round } from 'lodash';
 import { useMemo } from 'react';
 import { formatNumberWithComma } from '../../../utils/NumberUtils';
-import { progressBarFormatter } from '../../../utils/ProgressBar/ProgressBar.utils';
 import './summary-card.style.less';
 import { SummaryCardProps } from './SummaryCard.interface';
 
@@ -38,7 +38,8 @@ export const SummaryCard = ({
 }: SummaryCardProps) => {
   const percent = useMemo(() => {
     if (isNumber(value)) {
-      return round((value / total) * 100, 1);
+      // Empty summaries have no completed work; dividing by zero would produce an invalid progress value.
+      return round((total > 0 ? value / total : 0) * 100, 1);
     }
 
     return 0;
@@ -92,14 +93,24 @@ export const SummaryCard = ({
       </div>
 
       {showProgressBar && (
-        <Progress
-          className={type}
-          data-testid="progress-bar"
-          format={progressBarFormatter}
-          percent={percent}
-          type="circle"
-          width={65}
-        />
+        <div className={type} data-testid="progress-bar">
+          <ProgressBarCircle
+            color={
+              (
+                {
+                  success: 'success',
+                  failed: 'error',
+                  aborted: 'warning',
+                  assigned: 'purple',
+                } as const
+              )[type as 'success' | 'failed' | 'aborted' | 'assigned'] ??
+              'brand'
+            }
+            size="xxs"
+            value={Math.min(100, Math.max(0, percent))}
+            valueFormatter={() => `${percent}%`}
+          />
+        </div>
       )}
     </Box>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.test.tsx
index 14b7039cbe63..215b98ef10c0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/SummaryCard.test.tsx
@@ -21,6 +21,16 @@ const mockProps: SummaryCardProps = {
 };
 
 describe('SummaryCard component', () => {
+  it('shows zero progress for an empty summary', () => {
+    render(<SummaryCard {...mockProps} total={0} value={0} />);
+
+    expect(screen.getByRole('progressbar')).toHaveAttribute(
+      'aria-valuenow',
+      '0'
+    );
+    expect(screen.getByText('0%')).toBeInTheDocument();
+  });
+
   it('component should render', async () => {
     render(<SummaryCard {...mockProps} />);
 
@@ -31,13 +41,13 @@ describe('SummaryCard component', () => {
     expect(
       await screen.findByTestId('summary-card-description')
     ).toBeInTheDocument();
-    expect(await screen.findByRole('presentation')).toBeInTheDocument();
+    expect(await screen.findByRole('progressbar')).toBeInTheDocument();
   });
 
   it('should not render progress bar, if showProgressBar is false', async () => {
     render(<SummaryCard {...mockProps} showProgressBar={false} />);
 
-    expect(screen.queryByRole('presentation')).not.toBeInTheDocument();
+    expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
   });
 
   it('should not render skeleton loader, if isLoading is true', async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/summary-card.style.less b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/summary-card.style.less
index 48ac41865f4b..2ede99d2c8f6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/summary-card.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryCard/summary-card.style.less
@@ -36,12 +36,6 @@
     margin-bottom: 0;
   }
 
-  .ant-progress-circle {
-    .ant-progress-text {
-      font-weight: var(--om-font-weight-medium);
-    }
-  }
-
   &.bg-success {
     background-color: @green-8;
   }
@@ -54,53 +48,4 @@
   &.bg-primary {
     background-color: @blue-8;
   }
-
-  .new.ant-progress-circle {
-    .ant-progress-circle-path {
-      stroke: @blue-3 !important;
-    }
-    .ant-progress-text {
-      color: @blue-3;
-    }
-  }
-  .success.ant-progress-circle {
-    .ant-progress-circle-path {
-      stroke: @green-3 !important;
-    }
-    .ant-progress-text {
-      color: @green-3;
-    }
-  }
-  .aborted.ant-progress-circle {
-    .ant-progress-circle-path {
-      stroke: @yellow-2 !important;
-    }
-    .ant-progress-text {
-      color: @yellow-2;
-    }
-  }
-  .failed.ant-progress-circle {
-    .ant-progress-circle-path {
-      stroke: @red-3 !important;
-    }
-    .ant-progress-text {
-      color: @red-3;
-    }
-  }
-  .acknowledged.ant-progress-circle {
-    .ant-progress-circle-path {
-      stroke: @blue-2 !important;
-    }
-    .ant-progress-text {
-      color: @blue-2;
-    }
-  }
-  .assigned.ant-progress-circle {
-    .ant-progress-circle-path {
-      stroke: @purple-3 !important;
-    }
-    .ant-progress-text {
-      color: @purple-3;
-    }
-  }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Table/TableV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Table/TableV2.tsx
index 25b4459f6e7b..8ef65aecdab9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Table/TableV2.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Table/TableV2.tsx
@@ -740,6 +740,8 @@ const ExpandControl = <T extends object>({
   rowKey,
   onToggle,
 }: ExpandControlProps<T>) => {
+  const { t } = useTranslation();
+
   if (hasChildren) {
     if (ExpandIcon) {
       return (
@@ -759,6 +761,7 @@ const ExpandControl = <T extends object>({
     return (
       <button
         aria-expanded={isExpanded}
+        aria-label={isExpanded ? t('label.collapse') : t('label.expand')}
         className="tw:p-0 tw:bg-transparent tw:border-0 tw:cursor-pointer tw:mr-1 tw:inline-flex"
         data-testid="expand-icon"
         onClick={(e) => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx
index 4d89c4877f3e..f031461db71b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx
@@ -10,8 +10,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Skeleton, useTabItemState } from '@openmetadata/ui-core-components';
-import { Badge } from 'antd';
+import {
+  Badge,
+  Skeleton,
+  useTabItemState,
+} from '@openmetadata/ui-core-components';
+
 import { isNil } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { getCountBadge } from '../../../utils/EntityDisplayPureUtils';
@@ -51,7 +55,9 @@ const TabsLabel = ({
           )
         )}
         {isBeta && (
-          <Badge className="service-beta-tag" count={t('label.beta')} />
+          <Badge className="service-beta-tag" color="brand" size="sm">
+            {t('label.beta')}
+          </Badge>
         )}
       </div>
       {/* Note: add ".custom-menu-with-description" class in Menu component if need description in menu */}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.test.tsx
index d4e017be3644..33dc536246bb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.test.tsx
@@ -315,7 +315,7 @@ describe('ExploreSearchCard', () => {
     );
   });
 
-  it('centers the search and filters in a constrained column beside the Explore information', () => {
+  it('centers the search and filters in a column that grows with the header row', () => {
     render(<ExploreSearchCard />);
 
     const headerLayout = screen.getByTestId('explore-header-layout');
@@ -339,7 +339,7 @@ describe('ExploreSearchCard', () => {
       'tw:w-full',
       'tw:min-w-0',
       'tw:flex-1',
-      'tw:max-w-4xl',
+      'tw:max-w-[max(56rem,55%)]',
       'tw:mx-auto',
       'tw:px-12'
     );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.tsx
index 5024d0c25c38..840a8666a130 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/discovery/explore/ExploreHeader/ExploreSearchCard.tsx
@@ -212,11 +212,11 @@ export const ExploreSearchCard = () => {
   }, [debouncedSuggestionSearch, navigate]);
 
   // Keep the inset on the shared wrapper so the search and quick filters stay
-  // aligned. The 896px cap minus 48px per side leaves the requested 800px
-  // usable width without introducing another arbitrary outer width.
+  // aligned. Centred, at least 56rem (the old 800px usable width) and 55% of
+  // the header row beyond that, so it grows on wide screens without spanning it.
   const searchActions = (
     <Box
-      className="tw:mx-auto tw:flex tw:w-full tw:max-w-4xl tw:min-w-0 tw:flex-1 tw:flex-col tw:gap-3 tw:px-12"
+      className="tw:mx-auto tw:flex tw:w-full tw:max-w-[max(56rem,55%)] tw:min-w-0 tw:flex-1 tw:flex-col tw:gap-3 tw:px-12"
       data-testid="explore-search-actions"
       direction="col">
       <ExploreSearchInput
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/integration/ConnectionServiceDetailsPage/DataAssetHeaderDetailsRow/DataAssetHeaderDetailsRow.tsx b/openmetadata-ui/src/main/resources/ui/src/components/integration/ConnectionServiceDetailsPage/DataAssetHeaderDetailsRow/DataAssetHeaderDetailsRow.tsx
index 9495b5668198..9e6ec947d241 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/integration/ConnectionServiceDetailsPage/DataAssetHeaderDetailsRow/DataAssetHeaderDetailsRow.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/integration/ConnectionServiceDetailsPage/DataAssetHeaderDetailsRow/DataAssetHeaderDetailsRow.tsx
@@ -13,7 +13,6 @@
 
 import {
   Button,
-  ButtonUtility,
   Dot,
   Owner,
   Popover,
@@ -28,9 +27,9 @@ import {
 } from '@openmetadata/ui-core-components/icons';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg';
 import { getTierTags } from '../../../../utils/TablePureUtils';
 import DomainSelectableList from '../../../common/DomainSelectableList/DomainSelectableList.component';
+import { EditIconButton } from '../../../common/IconButtons/EditIconButton';
 import TierCard from '../../../common/TierCard/TierCard';
 import { UserTeamSelectableList } from '../../../common/UserTeamSelectableList/UserTeamSelectableList.component';
 import { DataAssetHeaderDetailsRowProps } from './DataAssetHeaderDetailsRow.interface';
@@ -128,13 +127,11 @@ const DataAssetHeaderDetailsRow: React.FC<DataAssetHeaderDetailsRowProps> = ({
             multiple
             selectedDomain={domains}
             onUpdate={onUpdateDomain}>
-            <ButtonUtility
-              className="tw:h-5.5 tw:w-5.5 tw:p-1"
-              color="tertiary"
+            <EditIconButton
+              newLook
               data-testid="edit-domain-button"
-              icon={<EditIcon className="tw:h-4.5 tw:w-4.5 tw:text-primary" />}
-              size="sm"
-              type="button"
+              size="small"
+              title={t('label.edit-entity', { entity: t('label.domain') })}
             />
           </DomainSelectableList>
         )}
@@ -169,13 +166,13 @@ const DataAssetHeaderDetailsRow: React.FC<DataAssetHeaderDetailsRowProps> = ({
             multiple={{ user: true, team: true }}
             owner={owners}
             onUpdate={onUpdateOwners}>
-            <ButtonUtility
-              className="tw:h-5.5 tw:w-5.5 tw:p-1"
-              color="tertiary"
+            <EditIconButton
+              newLook
               data-testid="edit-owner-button"
-              icon={<EditIcon className="tw:h-4.5 tw:w-4.5 tw:text-primary" />}
-              size="sm"
-              type="button"
+              size="small"
+              title={t('label.edit-entity', {
+                entity: t('label.owner-plural'),
+              })}
             />
           </UserTeamSelectableList>
         )}
@@ -204,15 +201,13 @@ const DataAssetHeaderDetailsRow: React.FC<DataAssetHeaderDetailsRowProps> = ({
               : t('label.add-entity', { entity: t('label.tier') })}
           </Typography>
           {canEditTier && onUpdateTier && (
-            <ButtonUtility
+            <EditIconButton
+              newLook
               aria-expanded={tierPopoverOpen}
               aria-haspopup="dialog"
-              className="tw:h-5.5 tw:w-5.5 tw:p-1"
-              color="tertiary"
               data-testid="edit-tier-button"
-              icon={<EditIcon className=" tw:h-4.5 tw:w-4.5 tw:text-primary" />}
-              size="sm"
-              type="button"
+              size="small"
+              title={t('label.edit-entity', { entity: t('label.tier') })}
               onClick={() => setTierPopoverOpen(true)}
             />
           )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/interface/sidebar.interface.ts b/openmetadata-ui/src/main/resources/ui/src/interface/sidebar.interface.ts
index 8c1087a4cdf1..6bd50fc689ed 100644
--- a/openmetadata-ui/src/main/resources/ui/src/interface/sidebar.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/interface/sidebar.interface.ts
@@ -31,3 +31,10 @@ export interface LeftSidebarItem {
    */
   onClick?: () => void;
 }
+
+export interface NavigationTreeNode {
+  key: string;
+  title: string;
+  icon?: SvgComponent;
+  children?: NavigationTreeNode[];
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/interface/tree.interface.ts b/openmetadata-ui/src/main/resources/ui/src/interface/tree.interface.ts
new file mode 100644
index 000000000000..d7431ae7e6aa
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/interface/tree.interface.ts
@@ -0,0 +1,21 @@
+/*
+ *  Copyright 2026 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 { ReactNode } from 'react';
+
+export interface TreeNode {
+  key: string | number;
+  title: ReactNode;
+  icon?: ReactNode;
+  isLeaf?: boolean;
+  children?: TreeNode[];
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ar-sa.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ar-sa.json
index 2eb52f8a90e5..3a0e2e800141 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ar-sa.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ar-sa.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "هل تحتاج مساعدة؟ <0>{{doc}}</0>.",
     "new-conversation": "أنت تبدأ محادثة جديدة",
     "new-to-the-platform": "هل أنت جديد على المنصة؟",
+    "new-version-available": "يتوفر إصدار جديد",
     "no-access-placeholder": "ليس لديك الصلاحيات اللازمة. يرجى التحقق مع المسؤول للحصول على صلاحية <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "جارٍ إعادة التوجيه إلى الصفحة الرئيسية",
     "refer-to-our-doc": "هل ما زلت بحاجة إلى مساعدة؟ ارجع إلى <0>{{doc}}</0> الخاص بنا لمزيد من المعلومات.",
     "refresh-frequency-contract-description": "التردد المتوقع لتحديثات البيانات",
+    "refresh-page-recommended": "للحصول على تجربة سلسة، نوصي بتحديث الصفحة.",
     "relation-color-tooltip": "رمز لون سداسي عشري يستخدم لتصور نوع العلاقة هذا في رسم الأنطولوجيا البياني (مثلاً، #1890ff).",
     "relation-type-in-use-count": "مستخدم بواسطة {{count}} علاقة مصطلح",
     "relation-type-not-in-use": "غير مستخدم حالياً",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "حلّ {{user}} الحادثة",
     "task-event-rejected": "{{user}} رفض هذه المهمة",
     "task-event-revoked": "{{user}} ألغى هذا الطلب",
+    "task-form-builder-description": "استخدم المنشئ لنماذج الإنشاء والحل والانتقال وتعيينات المراحل. تظل محررات JSON متاحة ضمن الخيارات المتقدمة.",
+    "task-form-builder-title": "تصميم نماذج المهام بصريًا",
     "task-opened-by": "فتحها {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} فتح هذه الحادثة {{time}}",
     "task-outcome-by-on": "{{status}} بواسطة {{user}} في {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
index a8cde3649c68..a6292f1d4aa1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Brauchen Sie Hilfe? <0>{{doc}}</0>.",
     "new-conversation": "Sie beginnen eine neue Konversation.",
     "new-to-the-platform": "Neu auf der Plattform?",
+    "new-version-available": "Eine neue Version ist verfügbar",
     "no-access-placeholder": "Sie haben nicht die erforderlichen Berechtigungen. Bitte wenden Sie sich an den Administrator, um die Berechtigung für <0>{{entity}}</0> zu erhalten.",
     "no-access-token-subtitle": "Generieren Sie ein Token, um mit authentifizierten API-Aufrufen zu beginnen. Sie können es jederzeit widerrufen.",
     "no-access-token-title": "Noch kein persönliches Zugriffstoken",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Umleitung zur Startseite",
     "refer-to-our-doc": "Brauchen Sie immer noch Hilfe? Siehe unser <0>{{doc}}</0> für weitere Informationen.",
     "refresh-frequency-contract-description": "Erwartete Häufigkeit von Datenaktualisierungen",
+    "refresh-page-recommended": "Für eine reibungslose Nutzung empfehlen wir, die Seite neu zu laden.",
     "relation-color-tooltip": "Hexadezimaler Farbcode zur Visualisierung dieses Beziehungstyps im Ontologie-Graphen (z.B. #1890ff).",
     "relation-type-in-use-count": "Verwendet von {{count}} Begriffsbeziehung(en)",
     "relation-type-not-in-use": "Derzeit nicht in Verwendung",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} hat den Vorfall gelöst",
     "task-event-rejected": "{{user}} hat diese Aufgabe abgelehnt",
     "task-event-revoked": "{{user}} hat diese Anfrage widerrufen",
+    "task-form-builder-description": "Verwenden Sie den Builder für Erstellungs-, Lösungs- und Übergangsformulare sowie Phasenzuordnungen. Die JSON-Editoren sind weiterhin unter Erweitert verfügbar.",
+    "task-form-builder-title": "Aufgabenformulare visuell gestalten",
     "task-opened-by": "Eröffnet von {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} hat diesen Vorfall {{time}} eröffnet",
     "task-outcome-by-on": "{{status}} von {{user}} am {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index 69185f0a0e6e..e03bac9e8b1a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Need help? <0>{{doc}}</0>.",
     "new-conversation": "You are starting a new conversation",
     "new-to-the-platform": "New to the platform?",
+    "new-version-available": "A new version is available",
     "no-access-placeholder": "You don't have necessary permissions. Please check with the admin to get the <0>{{entity}}</0> permission.",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Redirecting to the home page",
     "refer-to-our-doc": "Still need help? Refer to our <0>{{doc}}</0> for more information.",
     "refresh-frequency-contract-description": "Expected frequency of data updates",
+    "refresh-page-recommended": "For a seamless experience, we recommend refreshing the page.",
     "relation-color-tooltip": "Hex color code used to visualize this relation type in the ontology graph (e.g., #1890ff).",
     "relation-type-in-use-count": "Used by {{count}} term relation(s)",
     "relation-type-not-in-use": "Not currently in use",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} resolved the incident",
     "task-event-rejected": "{{user}} rejected this task",
     "task-event-revoked": "{{user}} revoked this request",
+    "task-form-builder-description": "Use the builder for create forms, resolve forms, transition forms, and stage mappings. The raw JSON editors are still available under Advanced.",
+    "task-form-builder-title": "Design task forms visually",
     "task-opened-by": "Opened by {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} opened this incident {{time}}",
     "task-outcome-by-on": "{{status}} by {{user}} on {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
index 9a82f3fd2d39..09104a5d57c9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "¿Necesitas ayuda? <0>{{doc}}</0>.",
     "new-conversation": "Estás iniciando una nueva conversación",
     "new-to-the-platform": "¿Nuevo en la plataforma?",
+    "new-version-available": "Hay una nueva versión disponible",
     "no-access-placeholder": "No tienes los permisos necesarios. Por favor, contacta con el administrador para obtener el permiso de <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Genera un token para empezar a realizar llamadas autenticadas a la API. Puedes revocarlo en cualquier momento.",
     "no-access-token-title": "Aún no hay ningún token de acceso personal",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Redirigiendo a la página principal",
     "refer-to-our-doc": "¿Necesitas más ayuda? Consulta nuestra <0>{{doc}}</0> para obtener más información.",
     "refresh-frequency-contract-description": "Frecuencia esperada de actualizaciones de datos",
+    "refresh-page-recommended": "Para una experiencia fluida, recomendamos actualizar la página.",
     "relation-color-tooltip": "Código de color hexadecimal utilizado para visualizar este tipo de relación en el grafo de ontología (por ejemplo, #1890ff).",
     "relation-type-in-use-count": "Utilizado por {{count}} relación(es) de términos",
     "relation-type-not-in-use": "No está en uso actualmente",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} resolvió el incidente",
     "task-event-rejected": "{{user}} rechazó esta tarea",
     "task-event-revoked": "{{user}} revocó esta solicitud",
+    "task-form-builder-description": "Usa el constructor para formularios de creación, resolución y transición, y asignaciones de etapas. Los editores JSON siguen disponibles en Avanzado.",
+    "task-form-builder-title": "Diseña formularios de tareas visualmente",
     "task-opened-by": "Abierta por {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} abrió este incidente {{time}}",
     "task-outcome-by-on": "{{status}} por {{user}} el {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
index 323229ee720e..b0c7fabfa19a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Besoin d'aide ? <0>{{doc}}</0>.",
     "new-conversation": "Vous commencez une nouvelle conversation",
     "new-to-the-platform": "Nouveau sur la plateforme ?",
+    "new-version-available": "Une nouvelle version est disponible",
     "no-access-placeholder": "Vous n'avez pas les autorisations nécessaires. Veuillez contacter l'administrateur pour obtenir l'autorisation <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Générez un jeton pour commencer à effectuer des appels d'API authentifiés. Vous pouvez le révoquer à tout moment.",
     "no-access-token-title": "Aucun jeton d'accès personnel pour l'instant",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Rediriger vers la page d'accueil",
     "refer-to-our-doc": "Toujours besoin d'aide ? Consultez notre <0>{{doc}}</0> pour plus d'informations.",
     "refresh-frequency-contract-description": "Fréquence attendue de mise à jour des données",
+    "refresh-page-recommended": "Pour une expérience fluide, nous vous recommandons de recharger la page.",
     "relation-color-tooltip": "Code couleur hexadécimal utilisé pour visualiser ce type de relation dans le graphe d'ontologie (par ex. #1890ff).",
     "relation-type-in-use-count": "Utilisé par {{count}} relation(s) de termes",
     "relation-type-not-in-use": "Actuellement non utilisé",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} a résolu l'incident",
     "task-event-rejected": "{{user}} a rejeté cette tâche",
     "task-event-revoked": "{{user}} a révoqué cette demande",
+    "task-form-builder-description": "Utilisez le concepteur pour les formulaires de création, de résolution et de transition, ainsi que les associations d’étapes. Les éditeurs JSON restent disponibles dans Avancé.",
+    "task-form-builder-title": "Concevoir visuellement les formulaires de tâches",
     "task-opened-by": "Ouverte par {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} a ouvert cet incident {{time}}",
     "task-outcome-by-on": "{{status}} par {{user}} le {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json
index 33cada9a921e..6445b9f073fc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "¿Necesitas ayuda? <0>{{doc}}</0>.",
     "new-conversation": "Estás comezando unha nova conversa",
     "new-to-the-platform": "Es novo na plataforma?",
+    "new-version-available": "Hai unha nova versión dispoñible",
     "no-access-placeholder": "Non tes os permisos necesarios. Consulta co administrador para obter permisos <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Xera un token para comezar a facer chamadas autenticadas á API. Podes revogalo en calquera momento.",
     "no-access-token-title": "Aínda non hai token de acceso persoal",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Redirixindo á páxina de inicio",
     "refer-to-our-doc": "Aínda necesitas axuda? Consulta o noso <0>{{doc}}</0> para máis información.",
     "refresh-frequency-contract-description": "Frecuencia esperada de actualizacións de datos",
+    "refresh-page-recommended": "Para unha experiencia fluída, recomendamos actualizar a páxina.",
     "relation-color-tooltip": "Código de cor hexadecimal utilizado para visualizar este tipo de relación no grafo de ontoloxía (por exemplo, #1890ff).",
     "relation-type-in-use-count": "Utilizado por {{count}} relación(s) de termos",
     "relation-type-not-in-use": "Non está en uso actualmente",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} resolveu o incidente",
     "task-event-rejected": "{{user}} rexeitou esta tarefa",
     "task-event-revoked": "{{user}} revogou esta solicitude",
+    "task-form-builder-description": "Usa o construtor para formularios de creación, resolución e transición, e asignacións de etapas. Os editores JSON seguen dispoñibles en Avanzado.",
+    "task-form-builder-title": "Deseña formularios de tarefas visualmente",
     "task-opened-by": "Aberta por {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} abriu este incidente {{time}}",
     "task-outcome-by-on": "{{status}} por {{user}} o {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
index 856a84a9c238..f0757c89e507 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "צריך עזרה? <0>{{doc}}</0>.",
     "new-conversation": "אתה מתחיל שיחה חדשה",
     "new-to-the-platform": "חדש בפלטפורמה?",
+    "new-version-available": "גרסה חדשה זמינה",
     "no-access-placeholder": "אין לך את ההרשאות הנדרשות. אנא פנה למנהל כדי לקבל הרשאת <0>{{entity}}</0>.",
     "no-access-token-subtitle": "צור אסימון כדי להתחיל לבצע קריאות API מאומתות. תוכל לבטל אותו בכל עת.",
     "no-access-token-title": "אין עדיין אסימון גישה אישי",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "מועבר לדף הבית",
     "refer-to-our-doc": "זקוק.ה לעזרה נוספת? בקר.י ב-<0>{{doc}}</0> לקבלת מידע נוסף.",
     "refresh-frequency-contract-description": "תדירות צפויה של עדכוני נתונים",
+    "refresh-page-recommended": "לחוויה חלקה, מומלץ לרענן את הדף.",
     "relation-color-tooltip": "קוד צבע הקסדצימלי המשמש להמחשת סוג קשר זה בגרף האונטולוגיה (למשל, #1890ff).",
     "relation-type-in-use-count": "בשימוש על ידי {{count}} קשר(י) מונח",
     "relation-type-not-in-use": "לא בשימוש כרגע",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} פתר/ה את התקרית",
     "task-event-rejected": "{{user}} דחה משימה זו",
     "task-event-revoked": "{{user}} ביטל בקשה זו",
+    "task-form-builder-description": "השתמש בבונה עבור טופסי יצירה, פתרון ומעבר ומיפויי שלבים. עורכי JSON עדיין זמינים תחת מתקדם.",
+    "task-form-builder-title": "עיצוב חזותי של טופסי משימות",
     "task-opened-by": "נפתח על ידי {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} פתח תקרית זו {{time}}",
     "task-outcome-by-on": "{{status}} על ידי {{user}} ב-{{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
index f882f231da82..a51c02c745ad 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "お困りですか？ <0>{{doc}}</0>",
     "new-conversation": "新しく会話を始める",
     "new-to-the-platform": "このプラットフォームを初めて利用する方へ",
+    "new-version-available": "新しいバージョンが利用可能です",
     "no-access-placeholder": "必要な権限がありません。管理者に連絡して <0>{{entity}}</0> の権限を取得してください。",
     "no-access-token-subtitle": "認証済みAPIコールを開始するためのトークンを生成してください。いつでも取り消すことができます。",
     "no-access-token-title": "個人アクセストークンはまだありません",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "ホームページへリダイレクト中です",
     "refer-to-our-doc": "さらに詳しく知りたいですか？こちらの <0>{{doc}}</0> をご覧ください。",
     "refresh-frequency-contract-description": "データ更新の想定頻度",
+    "refresh-page-recommended": "快適に使用するため、ページの再読み込みをお勧めします。",
     "relation-color-tooltip": "オントロジーグラフでこの関係タイプを可視化するために使用される16進カラーコード（例: #1890ff）。",
     "relation-type-in-use-count": "{{count}}件の用語関係で使用中",
     "relation-type-not-in-use": "現在使用されていません",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} がインシデントを解決しました",
     "task-event-rejected": "{{user}} がこのタスクを却下しました",
     "task-event-revoked": "{{user}} がこのリクエストを取り消しました",
+    "task-form-builder-description": "ビルダーで作成、解決、遷移のフォームとステージの対応付けを設定できます。JSONエディターは引き続き詳細設定で利用できます。",
+    "task-form-builder-title": "タスクフォームを視覚的に設計",
     "task-opened-by": "{{user}} が {{time}} に開始しました",
     "task-opened-this-incident": "{{user}} が {{time}} にこのインシデントを開始しました",
     "task-outcome-by-on": "{{date}} に {{user}} が{{status}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json
index f69bd549d102..eb1b02f29004 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "도움이 필요하신가요? <0>{{doc}}</0>.",
     "new-conversation": "새 대화를 시작하고 있습니다",
     "new-to-the-platform": "플랫폼이 처음이신가요?",
+    "new-version-available": "새 버전을 사용할 수 있습니다",
     "no-access-placeholder": "필요한 권한이 없습니다. 관리자에게 문의하여 <0>{{entity}}</0> 권한을 받으세요.",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "홈 페이지로 리디렉션 중",
     "refer-to-our-doc": "더 많은 도움이 필요하신가요? 자세한 정보는 <0>{{doc}}</0>를 참조하세요.",
     "refresh-frequency-contract-description": "예상 데이터 업데이트 빈도",
+    "refresh-page-recommended": "원활한 사용을 위해 페이지를 새로고침하는 것이 좋습니다.",
     "relation-color-tooltip": "온톨로지 그래프에서 이 관계 유형을 시각화하는 데 사용되는 16진수 색상 코드(예: #1890ff).",
     "relation-type-in-use-count": "{{count}}개의 용어 관계에서 사용 중",
     "relation-type-not-in-use": "현재 사용되지 않음",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}}님이 인시던트를 해결했습니다",
     "task-event-rejected": "{{user}}님이 이 작업을 거부했습니다",
     "task-event-revoked": "{{user}}님이 이 요청을 철회했습니다",
+    "task-form-builder-description": "빌더에서 생성, 해결, 전환 양식과 단계 매핑을 설정하세요. JSON 편집기는 고급에서 계속 사용할 수 있습니다.",
+    "task-form-builder-title": "작업 양식을 시각적으로 설계",
     "task-opened-by": "{{user}}님이 {{time}}에 열었습니다",
     "task-opened-this-incident": "{{user}}님이 {{time}}에 이 사고를 열었습니다",
     "task-outcome-by-on": "{{date}}에 {{user}}님이 {{status}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json
index 94e7bef4a4ec..556d32a77bfc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "मदत आवश्यक आहे? <0>{{doc}}</0>.",
     "new-conversation": "तुम्ही नवीन संभाषण सुरू करत आहात",
     "new-to-the-platform": "प्लॅटफॉर्मवर नवीन?",
+    "new-version-available": "नवीन आवृत्ती उपलब्ध आहे",
     "no-access-placeholder": "तुमच्याकडे आवश्यक परवानग्या नाहीत. कृपया प्रशासकाशी संपर्क करा जेणेकरून तुम्हाला <0>{{entity}}</0> ची परवानगी मिळेल.",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "मुख्यपृष्ठावर पुनर्निर्देशित करत आहे",
     "refer-to-our-doc": "अजूनही मदत हवी आहे? अधिक माहितीसाठी आमच्या <0>{{doc}}</0> चा संदर्भ घ्या.",
     "refresh-frequency-contract-description": "डेटा अद्ययावत करण्याची अपेक्षित वारंवारता",
+    "refresh-page-recommended": "सुरळीत अनुभवासाठी पृष्ठ रिफ्रेश करण्याची शिफारस करतो.",
     "relation-color-tooltip": "ऑन्टोलॉजी आलेखात या संबंध प्रकाराचे दृश्यमान करण्यासाठी वापरला जाणारा Hex रंग कोड (उदा., #1890ff).",
     "relation-type-in-use-count": "{{count}} संज्ञा संबंधांमध्ये वापरात आहे",
     "relation-type-not-in-use": "सध्या वापरात नाही",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} यांनी घटना सोडवली",
     "task-event-rejected": "{{user}} यांनी हे कार्य नाकारले",
     "task-event-revoked": "{{user}} यांनी ही विनंती मागे घेतली",
+    "task-form-builder-description": "निर्मिती, निराकरण आणि संक्रमण फॉर्म तसेच टप्प्यांच्या मॅपिंगसाठी बिल्डर वापरा. JSON संपादक प्रगत पर्यायांत अजूनही उपलब्ध आहेत.",
+    "task-form-builder-title": "कार्य फॉर्म दृश्यरूपात तयार करा",
     "task-opened-by": "{{user}} यांनी {{time}} उघडले",
     "task-opened-this-incident": "{{user}} यांनी {{time}} ही घटना उघडली",
     "task-outcome-by-on": "{{date}} रोजी {{user}} यांनी {{status}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
index a9407224ea38..335ec1b9b5f1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Je hebt hulp nodig? <0>{{doc}}</0>.",
     "new-conversation": "Je begint een nieuw gesprek",
     "new-to-the-platform": "Nieuw op het platform?",
+    "new-version-available": "Er is een nieuwe versie beschikbaar",
     "no-access-placeholder": "Je hebt niet de benodigde rechten. Neem contact op met de beheerder om toestemming voor <0>{{entity}}</0> te krijgen.",
     "no-access-token-subtitle": "Genereer een token om geauthenticeerde API-aanroepen te starten. Je kunt het op elk moment intrekken.",
     "no-access-token-title": "Nog geen persoonlijk toegangstoken",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Doorgaan naar de startpagina",
     "refer-to-our-doc": "Hulp nodig? Raadpleeg onze <0>{{doc}}</0> voor meer informatie.",
     "refresh-frequency-contract-description": "Verwachte frequentie van gegevensupdates",
+    "refresh-page-recommended": "Voor een soepele ervaring raden we aan de pagina te vernieuwen.",
     "relation-color-tooltip": "Hexadecimale kleurcode voor de visualisatie van dit relatietype in de ontologiegraf (bijv. #1890ff).",
     "relation-type-in-use-count": "Gebruikt door {{count}} termrelatie(s)",
     "relation-type-not-in-use": "Momenteel niet in gebruik",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} heeft het incident opgelost",
     "task-event-rejected": "{{user}} heeft deze taak geweigerd",
     "task-event-revoked": "{{user}} heeft dit verzoek ingetrokken",
+    "task-form-builder-description": "Gebruik de builder voor aanmaak-, afhandelings- en overgangsformulieren en fasekoppelingen. De JSON-editors blijven beschikbaar onder Geavanceerd.",
+    "task-form-builder-title": "Taakformulieren visueel ontwerpen",
     "task-opened-by": "Geopend door {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} heeft dit incident {{time}} geopend",
     "task-outcome-by-on": "{{status}} door {{user}} op {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
index 07600389b405..a84b7693622c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "آیا نیاز به کمک دارید؟ <0>{{doc}}</0>.",
     "new-conversation": "شما در حال شروع یک مکالمه جدید هستید.",
     "new-to-the-platform": "جدید در این پلتفرم هستید؟",
+    "new-version-available": "نسخه جدیدی در دسترس است",
     "no-access-placeholder": "شما دسترسی‌های لازم را ندارید. لطفاً برای دریافت دسترسی <0>{{entity}}</0> با مدیر سیستم تماس بگیرید.",
     "no-access-token-subtitle": "یک توکن تولید کنید تا شروع به انجام فراخوانی‌های احراز هویت‌شده API کنید. می‌توانید هر زمان آن را باطل کنید.",
     "no-access-token-title": "هنوز هیچ توکن دسترسی شخصی وجود ندارد",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "در حال انتقال به صفحه اصلی.",
     "refer-to-our-doc": "هنوز نیاز به کمک دارید؟ به <0>{{doc}}</0> ما مراجعه کنید برای اطلاعات بیشتر.",
     "refresh-frequency-contract-description": "فرکانس مورد انتظار به‌روزرسانی داده‌ها",
+    "refresh-page-recommended": "برای تجربه‌ای روان، توصیه می‌کنیم صفحه را تازه‌سازی کنید.",
     "relation-color-tooltip": "کد رنگ Hex برای نمایش این نوع رابطه در نمودار هستی‌شناسی (مثلاً #1890ff).",
     "relation-type-in-use-count": "توسط {{count}} رابطه اصطلاح استفاده می‌شود",
     "relation-type-not-in-use": "در حال حاضر استفاده نمی‌شود",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} حادثه را حل کرد",
     "task-event-rejected": "{{user}} این وظیفه را رد کرد",
     "task-event-revoked": "{{user}} این درخواست را لغو کرد",
+    "task-form-builder-description": "از سازنده برای فرم‌های ایجاد، حل و انتقال و نگاشت مراحل استفاده کنید. ویرایشگرهای JSON همچنان در بخش پیشرفته در دسترس هستند.",
+    "task-form-builder-title": "طراحی بصری فرم‌های وظایف",
     "task-opened-by": "باز شده توسط {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} این حادثه را {{time}} باز کرد",
     "task-outcome-by-on": "{{status}} توسط {{user}} در {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
index d3bbc0c06d41..f4cb02467414 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Precisa de ajuda? <0>{{doc}}</0>.",
     "new-conversation": "Você está iniciando uma nova conversa",
     "new-to-the-platform": "Novo na plataforma?",
+    "new-version-available": "Uma nova versão está disponível",
     "no-access-placeholder": "Você não tem as permissões necessárias. Verifique com o administrador para obter a permissão de <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Gere um token para começar a fazer chamadas de API autenticadas. Você pode revogá-lo a qualquer momento.",
     "no-access-token-title": "Ainda não há token de acesso pessoal",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Redirecionando para a página inicial",
     "refer-to-our-doc": "Ainda precisa de ajuda? Consulte nossa <0>{{doc}}</0> para mais informações.",
     "refresh-frequency-contract-description": "Frequência esperada de atualizações de dados",
+    "refresh-page-recommended": "Para uma experiência fluida, recomendamos atualizar a página.",
     "relation-color-tooltip": "Código de cor hexadecimal usado para visualizar este tipo de relação no grafo de ontologia (por exemplo, #1890ff).",
     "relation-type-in-use-count": "Utilizado por {{count}} relação(ões) de termos",
     "relation-type-not-in-use": "Não está em uso atualmente",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} resolveu o incidente",
     "task-event-rejected": "{{user}} rejeitou esta tarefa",
     "task-event-revoked": "{{user}} revogou esta solicitação",
+    "task-form-builder-description": "Use o construtor para formulários de criação, resolução e transição e mapeamentos de etapas. Os editores JSON continuam disponíveis em Avançado.",
+    "task-form-builder-title": "Crie formulários de tarefas visualmente",
     "task-opened-by": "Aberta por {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} abriu este incidente {{time}}",
     "task-outcome-by-on": "{{status}} por {{user}} em {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json
index 6fb98991dd28..5753f9820033 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Precisa de ajuda? <0>{{doc}}</0>.",
     "new-conversation": "Você está iniciando uma nova conversa",
     "new-to-the-platform": "Novo na plataforma?",
+    "new-version-available": "Está disponível uma nova versão",
     "no-access-placeholder": "Não tem as permissões necessárias. Verifique com o administrador para obter a permissão de <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Gere um token para começar a fazer chamadas de API autenticadas. Pode revogá-lo a qualquer momento.",
     "no-access-token-title": "Ainda não há token de acesso pessoal",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Redirecionando para a página inicial",
     "refer-to-our-doc": "Ainda precisa de ajuda? Consulte nossa <0>{{doc}}</0> para mais informações.",
     "refresh-frequency-contract-description": "Frequência esperada de atualizações de dados",
+    "refresh-page-recommended": "Para uma experiência fluida, recomendamos atualizar a página.",
     "relation-color-tooltip": "Código de cor hexadecimal utilizado para visualizar este tipo de relação no grafo de ontologia (por exemplo, #1890ff).",
     "relation-type-in-use-count": "Utilizado por {{count}} relação(ões) de termos",
     "relation-type-not-in-use": "Não está em utilização atualmente",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} resolveu o incidente",
     "task-event-rejected": "{{user}} rejeitou esta tarefa",
     "task-event-revoked": "{{user}} revogou este pedido",
+    "task-form-builder-description": "Utilize o construtor para formulários de criação, resolução e transição e mapeamentos de etapas. Os editores JSON continuam disponíveis em Avançado.",
+    "task-form-builder-title": "Crie formulários de tarefas visualmente",
     "task-opened-by": "Aberta por {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} abriu este incidente {{time}}",
     "task-outcome-by-on": "{{status}} por {{user}} em {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
index 34670319e574..f32bc47c2053 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Нужна помощь? <0>{{doc}}</0>.",
     "new-conversation": "Начать новое обсуждение",
     "new-to-the-platform": "Новичок на платформе?",
+    "new-version-available": "Доступна новая версия",
     "no-access-placeholder": "У вас нет доступа, обратитесь к администратору, чтобы получить разрешения",
     "no-access-token-subtitle": "Сгенерируйте токен, чтобы начать делать аутентифицированные вызовы API. Вы можете отозвать его в любой момент.",
     "no-access-token-title": "Персонального токена доступа пока нет",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Перенаправление на главную страницу",
     "refer-to-our-doc": "Все еще нужна помощь? Дополнительную информацию см. по ссылке — <0>{{doc}}</0>.",
     "refresh-frequency-contract-description": "Ожидаемая частота обновления данных",
+    "refresh-page-recommended": "Для корректной работы рекомендуем обновить страницу.",
     "relation-color-tooltip": "Шестнадцатеричный код цвета для визуализации этого типа отношения в графе онтологии (например, #1890ff).",
     "relation-type-in-use-count": "Используется в {{count}} связях терминов",
     "relation-type-not-in-use": "В настоящее время не используется",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} решил(а) инцидент",
     "task-event-rejected": "{{user}} отклонил эту задачу",
     "task-event-revoked": "{{user}} отозвал этот запрос",
+    "task-form-builder-description": "Используйте конструктор для форм создания, решения и переходов, а также сопоставления этапов. Редакторы JSON по-прежнему доступны в разделе дополнительных настроек.",
+    "task-form-builder-title": "Визуальное создание форм задач",
     "task-opened-by": "Открыто пользователем {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} открыл этот инцидент {{time}}",
     "task-outcome-by-on": "{{status}}: {{user}}, {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/sv-se.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/sv-se.json
index ff709dc3dff6..d88d437ddd7c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/sv-se.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/sv-se.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Behöver du hjälp? <0>{{doc}}</0>.",
     "new-conversation": "Du startar en ny konversation",
     "new-to-the-platform": "Ny på plattformen?",
+    "new-version-available": "En ny version är tillgänglig",
     "no-access-placeholder": "Du har inte nödvändiga behörigheter. Kontakta administratören för att få behörigheten <0>{{entity}}</0>.",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Omdirigerar till startsidan",
     "refer-to-our-doc": "Behöver du fortfarande hjälp? Se vår <0>{{doc}}</0> för mer information.",
     "refresh-frequency-contract-description": "Förväntad frekvens för datauppdateringar",
+    "refresh-page-recommended": "För en smidig upplevelse rekommenderar vi att du uppdaterar sidan.",
     "relation-color-tooltip": "Hex-färgkod som används för att visualisera den här relationstypen i ontologigrafen (t.ex. #1890ff).",
     "relation-type-in-use-count": "Används av {{count}} termrelation(er)",
     "relation-type-not-in-use": "Används inte för närvarande",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} löste incidenten",
     "task-event-rejected": "{{user}} avvisade denna uppgift",
     "task-event-revoked": "{{user}} återkallade denna begäran",
+    "task-form-builder-description": "Använd byggaren för formulär för skapande, lösning och övergångar samt etappmappningar. JSON-redigerarna finns fortfarande under Avancerat.",
+    "task-form-builder-title": "Utforma uppgiftsformulär visuellt",
     "task-opened-by": "Öppnad av {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} öppnade denna incident {{time}}",
     "task-outcome-by-on": "{{status}} av {{user}} den {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json
index 909705618e57..5b98eb367223 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "คุณต้องการความช่วยเหลือหรือไม่? <0>{{doc}}</0>.",
     "new-conversation": "คุณกำลังเริ่มการสนทนาใหม่",
     "new-to-the-platform": "ใหม่ต่อแพลตฟอร์มหรือไม่?",
+    "new-version-available": "มีเวอร์ชันใหม่พร้อมใช้งาน",
     "no-access-placeholder": "คุณไม่มีสิทธิ์ที่จำเป็น โปรดติดต่อผู้ดูแลระบบเพื่อขอสิทธิ์ <0>{{entity}}</0>.",
     "no-access-token-subtitle": "สร้างโทเค็นเพื่อเริ่มเรียกใช้ API ที่ยืนยันตัวตนแล้ว คุณสามารถเพิกถอนได้ทุกเมื่อ",
     "no-access-token-title": "ยังไม่มีโทเค็นการเข้าถึงส่วนบุคคล",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "กำลังเปลี่ยนเส้นทางไปยังหน้าแรก",
     "refer-to-our-doc": "ยังต้องการความช่วยเหลืออยู่ใช่ไหม? โปรดดูเอกสารของเรา <0>{{doc}}</0> สำหรับข้อมูลเพิ่มเติม",
     "refresh-frequency-contract-description": "ความถี่ที่คาดว่าจะมีการอัปเดตข้อมูล",
+    "refresh-page-recommended": "เพื่อการใช้งานที่ราบรื่น เราแนะนำให้รีเฟรชหน้า",
     "relation-color-tooltip": "รหัสสี Hex ที่ใช้แสดงประเภทความสัมพันธ์นี้ในกราฟออนโทโลยี (เช่น #1890ff)",
     "relation-type-in-use-count": "ใช้อยู่ใน {{count}} ความสัมพันธ์ของคำศัพท์",
     "relation-type-not-in-use": "ยังไม่ได้ใช้งาน",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} แก้ไขเหตุการณ์แล้ว",
     "task-event-rejected": "{{user}} ปฏิเสธงานนี้",
     "task-event-revoked": "{{user}} เพิกถอนคำขอนี้",
+    "task-form-builder-description": "ใช้ตัวสร้างสำหรับแบบฟอร์มสร้าง แก้ไข และเปลี่ยนสถานะ รวมถึงการจับคู่ขั้นตอน ตัวแก้ไข JSON ยังคงอยู่ในส่วนขั้นสูง",
+    "task-form-builder-title": "ออกแบบแบบฟอร์มงานด้วยภาพ",
     "task-opened-by": "เปิดโดย {{user}} {{time}}",
     "task-opened-this-incident": "{{user}} เปิดเหตุการณ์นี้ {{time}}",
     "task-outcome-by-on": "{{status}} โดย {{user}} เมื่อ {{date}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json
index 81510a01bcf1..70a268b63653 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/tr-tr.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "Yardıma mı ihtiyacınız var? <0>{{doc}}</0>.",
     "new-conversation": "Yeni bir konuşma başlatıyorsunuz",
     "new-to-the-platform": "Platformda yeni misiniz?",
+    "new-version-available": "Yeni bir sürüm mevcut",
     "no-access-placeholder": "Gerekli izinlere sahip değilsiniz. Lütfen <0>{{entity}}</0> iznini almak için yöneticiyle iletişime geçin.",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "Ana sayfaya yönlendiriliyor",
     "refer-to-our-doc": "Hala yardıma mı ihtiyacınız var? Daha fazla bilgi için <0>{{doc}}</0> bölümümüze bakın.",
     "refresh-frequency-contract-description": "Beklenen veri güncelleme sıklığı",
+    "refresh-page-recommended": "Sorunsuz bir deneyim için sayfayı yenilemenizi öneririz.",
     "relation-color-tooltip": "Ontoloji grafiklerinde bu ilişki türünü görselleştirmek için kullanılan on altılık renk kodu (örneğin, #1890ff).",
     "relation-type-in-use-count": "{{count}} terim ilişkisi tarafından kullanılıyor",
     "relation-type-not-in-use": "Şu anda kullanılmıyor",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} olayı çözdü",
     "task-event-rejected": "{{user}} bu görevi reddetti",
     "task-event-revoked": "{{user}} bu talebi geri aldı",
+    "task-form-builder-description": "Oluşturma, çözüm ve geçiş formları ile aşama eşlemeleri için oluşturucuyu kullanın. JSON düzenleyicileri Gelişmiş bölümünde kullanılabilir.",
+    "task-form-builder-title": "Görev formlarını görsel olarak tasarlayın",
     "task-opened-by": "{{user}} tarafından {{time}} açıldı",
     "task-opened-this-incident": "{{user}} bu olayı {{time}} açtı",
     "task-outcome-by-on": "{{date}} tarihinde {{user}} tarafından {{status}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
index f5ec3835291e..7305aeb6d05f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "需要帮助吗？<0>{{doc}}</0>.",
     "new-conversation": "您正在开始一次新的对话",
     "new-to-the-platform": "您是平台新用户？",
+    "new-version-available": "有新版本可用",
     "no-access-placeholder": "您没有所需的权限。请联系管理员以获取<0>{{entity}}</0>的权限.",
     "no-access-token-subtitle": "生成一个令牌以开始进行经过身份验证的 API 调用。您可以随时撤销它。",
     "no-access-token-title": "尚无个人访问令牌",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "正在重定向到主页",
     "refer-to-our-doc": "仍需要帮助？请参考我们的相关<0>{{doc}}</0>以获取更多信息。",
     "refresh-frequency-contract-description": "预期的数据更新频率",
+    "refresh-page-recommended": "为了获得流畅的体验，建议刷新页面。",
     "relation-color-tooltip": "用于在本体图中可视化此关系类型的十六进制颜色代码（例如：#1890ff）。",
     "relation-type-in-use-count": "被{{count}}个术语关系使用",
     "relation-type-not-in-use": "当前未使用",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} 解决了该事件",
     "task-event-rejected": "{{user}} 拒绝了此任务",
     "task-event-revoked": "{{user}} 撤销了此请求",
+    "task-form-builder-description": "使用构建器配置创建、解决和转换表单，以及阶段映射。原始 JSON 编辑器仍可在高级选项中使用。",
+    "task-form-builder-title": "可视化设计任务表单",
     "task-opened-by": "由 {{user}} 于 {{time}} 打开",
     "task-opened-this-incident": "{{user}} 于 {{time}} 打开了此事件",
     "task-outcome-by-on": "{{user}} 于 {{date}} {{status}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-tw.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-tw.json
index d126594dadc3..fc25b9f22a92 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-tw.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-tw.json
@@ -4853,6 +4853,7 @@
     "need-help-message": "需要協助嗎？<0>{{doc}}</0>。",
     "new-conversation": "您正在開始一個新對話",
     "new-to-the-platform": "是平台新手嗎？",
+    "new-version-available": "有新版本可用",
     "no-access-placeholder": "您沒有必要的權限。請洽詢管理員以取得 <0>{{entity}}</0> 權限。",
     "no-access-token-subtitle": "Generate a token to start making authenticated API calls. You can revoke it any time.",
     "no-access-token-title": "No personal access token yet",
@@ -5338,6 +5339,7 @@
     "redirecting-to-home-page": "正在重新導向到首頁",
     "refer-to-our-doc": "仍需要協助嗎？請參考我們的 <0>{{doc}}</0> 以獲取更多資訊。",
     "refresh-frequency-contract-description": "預期資料更新頻率",
+    "refresh-page-recommended": "為了獲得流暢的體驗，建議重新整理頁面。",
     "relation-color-tooltip": "用於在本體圖中視覺化此關係類型的十六進位色碼（例如：#1890ff）。",
     "relation-type-in-use-count": "被{{count}}個術語關係使用",
     "relation-type-not-in-use": "目前未使用",
@@ -5550,6 +5552,8 @@
     "task-event-incident-resolved": "{{user}} 解決了該事件",
     "task-event-rejected": "{{user}} 拒絕了此任務",
     "task-event-revoked": "{{user}} 撤銷了此請求",
+    "task-form-builder-description": "使用建構器設定建立、解決和轉換表單，以及階段對應。原始 JSON 編輯器仍可在進階選項中使用。",
+    "task-form-builder-title": "視覺化設計任務表單",
     "task-opened-by": "由 {{user}} 於 {{time}} 開啟",
     "task-opened-this-incident": "{{user}} 於 {{time}} 開啟了此事件",
     "task-outcome-by-on": "{{user}} 於 {{date}} {{status}}",
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AppearanceConfigSettingsPage/appearance-config-settings-page.less b/openmetadata-ui/src/main/resources/ui/src/pages/AppearanceConfigSettingsPage/appearance-config-settings-page.less
index 230b918e2455..9452e2f30770 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AppearanceConfigSettingsPage/appearance-config-settings-page.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AppearanceConfigSettingsPage/appearance-config-settings-page.less
@@ -35,13 +35,3 @@
   padding: var(--om-space-8);
   border-radius: var(--om-radius-sm);
 }
-
-.custom-theme-beta-tag {
-  .ant-badge-count {
-    background-color: @primary-color;
-    color: var(--tw-color-text-white);
-    padding: 0 var(--om-space-4);
-    margin-left: var(--om-space-2);
-    font-size: var(--om-font-size-10);
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AuditLogsPage/AuditLogsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AuditLogsPage/AuditLogsPage.tsx
index 026753a0e44d..3e8673a6d6b2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/AuditLogsPage/AuditLogsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/AuditLogsPage/AuditLogsPage.tsx
@@ -17,11 +17,11 @@ import {
   ButtonUtility,
   Card,
   Input,
+  ProgressBar,
   SimpleModal,
   Typography,
 } from '@openmetadata/ui-core-components';
 import { Search, XClose } from '@openmetadata/ui-core-components/icons';
-import { Progress } from 'antd';
 import { AxiosError } from 'axios';
 import { debounce, isString } from 'lodash';
 import { DateTime } from 'luxon';
@@ -421,14 +421,13 @@ const AuditLogsPage = () => {
   const renderExportProgress = () =>
     exportJob?.status === 'IN_PROGRESS' ? (
       <div className="export-progress-container">
-        <Progress
-          percent={
+        <ProgressBar
+          className="tw:h-1.5"
+          value={
             exportJob.total && exportJob.total > 0
               ? Math.round(((exportJob.progress ?? 0) / exportJob.total) * 100)
               : 0
           }
-          size="small"
-          status="active"
         />
         <Typography as="p" className="tw:mt-2!" size="text-md">
           {exportJob.message ?? t('message.exporting')}
@@ -520,7 +519,7 @@ const AuditLogsPage = () => {
                 <div className="tw:flex tw:gap-2 tw:flex-wrap tw:flex-1">
                   {activeFilters.map((filter) => (
                     <Badge
-                      className="tw:outline-0 tw:gap-1"
+                      className="tw:gap-1"
                       color="brand"
                       key={filter.category}
                       size="lg"
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeAppModeSidebarPage/CustomizeAppModeSidebarPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeAppModeSidebarPage/CustomizeAppModeSidebarPage.tsx
index 86e218cade16..b2bb2e319bbc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeAppModeSidebarPage/CustomizeAppModeSidebarPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizeAppModeSidebarPage/CustomizeAppModeSidebarPage.tsx
@@ -56,7 +56,6 @@ import {
 import { getPersonaByName } from '../../rest/PersonaAPI';
 import { getPersonaDetailsPath } from '../../utils/RouterUtils';
 import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils';
-import '../SettingsNavigationPage/settings-navigation-page.less';
 import {
   getSidebarHiddenKeys,
   getSidebarNavigationItems,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts
index 090bd6c6bc05..9d81a4760c30 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightClassBase.ts
@@ -10,10 +10,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import { ReactComponent as AppAnalyticsIcon } from '../../assets/svg/app-analytics.svg';
 import { ReactComponent as DataAssetsIcon } from '../../assets/svg/data-asset.svg';
 import { ReactComponent as KPIIcon } from '../../assets/svg/kpi.svg';
+import { ManageMenuItem as ItemType } from '../../components/common/EntityPageInfos/ManageButton/ManageMenu';
 import AppAnalyticsTab from '../../components/DataInsight/AppAnalyticsTab/AppAnalyticsTab.component';
 import DataAssetsTab from '../../components/DataInsight/DataAssetsTab/DataAssetsTab.component';
 import { DataInsightTabs } from '../../interface/data-insight.interface';
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.test.tsx
index ac7619559411..5f41be21133d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.test.tsx
@@ -12,6 +12,7 @@
  */
 
 import { act, fireEvent, render, screen } from '@testing-library/react';
+import { RouterProvider } from 'react-aria-components';
 import DataInsightLeftPanel from './DataInsightLeftPanel';
 
 const mockNavigate = jest.fn();
@@ -23,7 +24,11 @@ jest.mock('react-router-dom', () => ({
 
 describe('Test Data insight left panel', () => {
   it('Should render the menu items', async () => {
-    render(<DataInsightLeftPanel />);
+    render(
+      <RouterProvider navigate={mockNavigate}>
+        <DataInsightLeftPanel />
+      </RouterProvider>
+    );
 
     const menuContainer = await screen.findByTestId('data-insight-left-panel');
 
@@ -38,7 +43,11 @@ describe('Test Data insight left panel', () => {
   });
 
   it('On clicking the menu item, route should change', async () => {
-    render(<DataInsightLeftPanel />);
+    render(
+      <RouterProvider navigate={mockNavigate}>
+        <DataInsightLeftPanel />
+      </RouterProvider>
+    );
 
     const appAnalytics = await screen.findByText('label.app-analytic-plural');
     const kpi = await screen.findByText('label.kpi-uppercase-plural');
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx
index 4ba967943e80..fe5459bc5f37 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx
@@ -11,47 +11,41 @@
  *  limitations under the License.
  */
 
-import { Menu, MenuProps } from 'antd';
+import { NavItemBase } from '@openmetadata/ui-core-components';
 import { useMemo } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
 import LeftPanelCard from '../../../components/common/LeftPanelCard/LeftPanelCard';
 import { DataInsightTabs } from '../../../interface/data-insight.interface';
 import { getDataInsightPathWithFqn } from '../../../utils/DataInsightPureUtils';
 import { useRequiredParams } from '../../../utils/useRequiredParams';
 import DataInsightClassBase from '../DataInsightClassBase';
+
 const DataInsightLeftPanel = () => {
+  const { t } = useTranslation();
   const { tab } = useRequiredParams<{ tab: DataInsightTabs }>();
-
-  const navigate = useNavigate();
-
-  const menuItems: MenuProps['items'] = useMemo(() => {
-    const data = DataInsightClassBase.getLeftSideBar();
-
-    return data.map((value) => {
-      const SvgIcon = value.icon;
-
-      return {
-        key: value.key,
-        label: value.label,
-        icon: <SvgIcon {...value.iconProps} />,
-      };
-    });
-  }, []);
-
-  const handleMenuClick: MenuProps['onClick'] = (e) => {
-    navigate(getDataInsightPathWithFqn(e.key as DataInsightTabs));
-  };
+  const menuItems = useMemo(() => DataInsightClassBase.getLeftSideBar(), []);
 
   return (
     <LeftPanelCard id="data-insight">
-      <Menu
+      <nav
+        aria-label={t('label.data-insight')}
         className="data-insight-left-panel"
-        data-testid="data-insight-left-panel"
-        items={menuItems}
-        mode="inline"
-        selectedKeys={[tab ?? DataInsightTabs.DATA_ASSETS]}
-        onClick={handleMenuClick}
-      />
+        data-testid="data-insight-left-panel">
+        <ul className="tw:m-0 tw:list-none tw:p-0">
+          {menuItems.map((item) => (
+            <li key={item.key}>
+              <NavItemBase
+                current={item.key === (tab ?? DataInsightTabs.DATA_ASSETS)}
+                href={getDataInsightPathWithFqn(item.key)}
+                icon={item.icon}
+                size="sm"
+                type="link">
+                {item.label}
+              </NavItemBase>
+            </li>
+          ))}
+        </ul>
+      </nav>
     </LeftPanelCard>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/data-insight.less b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/data-insight.less
index c8e7c6fbde14..6d9db2e18637 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/data-insight.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/data-insight.less
@@ -90,36 +90,15 @@
 }
 
 .data-insight-progress-bar {
-  .ant-progress-outer {
-    margin-right: 0;
-    padding-right: 0;
-  }
-  .ant-progress-inner,
-  .ant-progress-bg,
-  .ant-progress-success-bg {
-    border-radius: var(--om-radius-sm);
-  }
-  .ant-progress-text {
-    display: flex;
-    margin: 0;
-    position: absolute;
-    width: 100%;
-    justify-content: space-between;
-    align-items: center;
-    height: 100%;
-    top: 0px;
-    right: 2px;
-    left: 2px;
-    padding: 0 var(--om-space-16) 0 var(--om-space-8);
-    font-size: var(--om-font-size-xs);
-    color: @text-color;
-  }
   .data-insight-kpi-target {
     position: absolute;
+    top: 0;
+    height: 100%;
     left: 0;
     border-right: 2px solid @target-blue-color;
 
     .target-text {
+      color: var(--om-color-text-primary);
       position: relative;
       right: -12px;
       top: -14px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/BulkEntityImportPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/BulkEntityImportPage.tsx
index 0e3742744a18..8a45bf11df48 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/BulkEntityImportPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/BulkEntityImportPage.tsx
@@ -34,7 +34,7 @@ import {
   StopCircle,
   XClose,
 } from '@openmetadata/ui-core-components/icons';
-import type { RcFile } from 'antd/lib/upload';
+
 import { AxiosError } from 'axios';
 import { capitalize, isEmpty, startCase } from 'lodash';
 import { unparse } from 'papaparse';
@@ -827,7 +827,7 @@ const BulkEntityImportPage = () => {
   );
 
   const handleLoadData = useCallback(
-    (e: ProgressEvent<FileReader>, file?: RcFile) => {
+    (e: ProgressEvent<FileReader>, file?: File) => {
       const result = String(e.target?.result ?? '');
 
       setSelectedCsvFile({
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/bulk-entity-import-page.less b/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/bulk-entity-import-page.less
index c518d8862f3c..e16190572fff 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/bulk-entity-import-page.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/EntityImport/BulkEntityImportPage/bulk-entity-import-page.less
@@ -368,16 +368,6 @@
       font-weight: @font-semibold;
     }
   }
-
-  .ant-alert {
-    background: var(--tw-color-bg-brand-primary);
-    border: 1px solid var(--tw-color-border-brand_alt);
-    border-radius: var(--om-radius-10);
-    color: var(--tw-color-text-brand-secondary);
-    font-size: var(--om-font-size-13);
-    margin-top: var(--om-space-18);
-    padding: var(--om-space-12) var(--om-space-14);
-  }
 }
 
 .csv-import-banner-stack {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourceForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourceForm.component.tsx
index 9bf62e4c454e..c6b9e1f1d13d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourceForm.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourceForm.component.tsx
@@ -16,11 +16,11 @@ import {
   Button,
   getField,
   HookForm,
+  SlideoutMenu,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Drawer } from 'antd';
 import { AxiosError } from 'axios';
-import React, { Fragment, useEffect, useState } from 'react';
+import React, { Fragment, useEffect, useId, useState } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import {
@@ -82,6 +82,8 @@ export const LearningResourceForm: React.FC<LearningResourceFormProps> = ({
     }
   };
 
+  const drawerTitleId = useId();
+
   const drawerTitle = (
     <div className="drawer-title-container">
       <Typography className="drawer-title">
@@ -107,27 +109,36 @@ export const LearningResourceForm: React.FC<LearningResourceFormProps> = ({
   );
 
   return (
-    <Drawer
-      destroyOnClose
-      className="learning-resource-form-drawer"
-      closable={false}
+    <SlideoutMenu
+      isDismissable
+      aria-labelledby={drawerTitleId}
       data-testid="learning-resource-form-drawer"
-      footer={drawerFooter}
-      // A core Select closes on pointerup, so the click lands on the mask.
-      maskClosable={false}
-      open={open}
-      placement="right"
-      title={drawerTitle}
+      dialogClassName="learning-resource-form-drawer"
+      isOpen={open}
+      // Select popovers render in the top layer, outside the slideout.
+      shouldCloseOnInteractOutside={(element) =>
+        !element.closest('[data-react-aria-top-layer]')
+      }
       width={600}
-      onClose={onClose}>
-      <HookForm
-        className="learning-resource-form tw:flex tw:flex-col tw:gap-4"
-        form={form}
-        onSubmit={form.handleSubmit(handleSubmit)}>
-        {fields.map((field) => (
-          <Fragment key={field.name}>{getField(field)}</Fragment>
-        ))}
-      </HookForm>
-    </Drawer>
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen) {
+          onClose();
+        }
+      }}>
+      <SlideoutMenu.Header id={drawerTitleId} showCloseButton={false}>
+        {drawerTitle}
+      </SlideoutMenu.Header>
+      <SlideoutMenu.Content role="region">
+        <HookForm
+          className="learning-resource-form tw:flex tw:flex-col tw:gap-4"
+          form={form}
+          onSubmit={form.handleSubmit(handleSubmit)}>
+          {fields.map((field) => (
+            <Fragment key={field.name}>{getField(field)}</Fragment>
+          ))}
+        </HookForm>
+      </SlideoutMenu.Content>
+      <SlideoutMenu.Footer>{drawerFooter}</SlideoutMenu.Footer>
+    </SlideoutMenu>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourcesPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourcesPage.tsx
index c4a8be3f53de..0c007930c292 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourcesPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/LearningResourcesPage.tsx
@@ -374,6 +374,7 @@ export const LearningResourcesPage: React.FC = () => {
                   {(col) => (
                     <Table.Head
                       id={col.id}
+                      isRowHeader={col.id === 'name'}
                       key={col.id}
                       label={col.label}
                       width={col.width}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/learning-resource-form.less b/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/learning-resource-form.less
index a3c4f8e2869f..438588cd2511 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/learning-resource-form.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/LearningResourcesPage/learning-resource-form.less
@@ -13,20 +13,6 @@
 @import (reference) '../../styles/variables.less';
 
 .learning-resource-form-drawer {
-  .ant-drawer-header {
-    padding: @padding-md @padding-lg;
-    border-bottom: 1px solid @border-color-1;
-  }
-
-  .ant-drawer-header-title {
-    flex: 1;
-  }
-
-  .ant-drawer-body {
-    padding: var(--om-space-20);
-    background-color: var(--tw-color-bg-primary);
-  }
-
   .drawer-title-container {
     display: flex;
     justify-content: space-between;
@@ -54,11 +40,6 @@
     }
   }
 
-  .ant-drawer-footer {
-    border-top: 1px solid @border-color-1;
-    padding: @padding-md @padding-lg;
-  }
-
   .drawer-footer {
     display: flex;
     justify-content: flex-end;
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 5e39dce00cf7..e977d3c3fe8c 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
@@ -19,7 +19,6 @@ import {
   Typography,
 } from '@openmetadata/ui-core-components';
 import { User03 } from '@openmetadata/ui-core-components/icons';
-import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import { AxiosError } from 'axios';
 import { compare } from 'fast-json-patch';
 import { isUndefined } from 'lodash';
@@ -30,6 +29,7 @@ import { ReactComponent as CheckCircleOutlined } from '../../../assets/svg/compl
 import { ReactComponent as CloseCircleOutlined } from '../../../assets/svg/ic-close-circle.svg';
 import Description from '../../../components/common/EntityDescription/Description';
 import ManageButton from '../../../components/common/EntityPageInfos/ManageButton/ManageButton';
+import { ManageMenuItem as ItemType } from '../../../components/common/EntityPageInfos/ManageButton/ManageMenu';
 import NoDataPlaceholder from '../../../components/common/ErrorWithPlaceholder/NoDataPlaceholder';
 import Loader from '../../../components/common/Loader/Loader';
 import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component';
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ProfilerConfigurationPage/ProfilerConfigurationPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ProfilerConfigurationPage/ProfilerConfigurationPage.test.tsx
index 135c7883ed99..5c0207aced20 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ProfilerConfigurationPage/ProfilerConfigurationPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ProfilerConfigurationPage/ProfilerConfigurationPage.test.tsx
@@ -104,7 +104,7 @@ describe('ProfilerConfigurationPage', () => {
     await user().click(await screen.findByTestId('disabled-switch'));
 
     expect(
-      within(screen.getByTestId('metric-type-select')).getByRole('textbox', {
+      within(screen.getByTestId('metric-type-select')).getByRole('combobox', {
         name: 'label.metric-type',
       })
     ).toBeDisabled();
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/SearchSettingsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/SearchSettingsPage.tsx
index cb81c5bcd3c2..3a0d082890a1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/SearchSettingsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/SearchSettingsPage.tsx
@@ -12,13 +12,17 @@
  */
 import Icon from '@ant-design/icons/lib/components/Icon';
 import {
+  Accordion,
+  AccordionHeader,
+  AccordionItem,
+  AccordionPanel,
   Box,
   Button,
   Grid,
+  Slider,
   Toggle,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Collapse, Slider } from 'antd';
 import { AxiosError } from 'axios';
 import { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -99,24 +103,28 @@ const SearchBoostsSection = ({
       className="layout-row boosts-section m-t-lg"
       style={getLayoutGutter(0, 16)}
       wrap="wrap">
-      <Collapse
-        accordion
-        bordered={false}
-        className="w-full search-settings-collapse">
-        <Collapse.Panel
-          className="term-boost-panel"
-          header={
-            <Box
-              className="layout-row d-flex items-center justify-between w-full"
-              wrap="wrap">
-              <Box className="layout-column d-flex items-center gap-4">
-                <Typography className="text-sm font-semibold m-0 tw:text-primary">
-                  {t('label.term-boost')}
-                </Typography>
-                <Typography className="count-label">
-                  {searchConfig?.globalSettings?.termBoosts?.length ?? 0}
-                </Typography>
-              </Box>
+      <Accordion className="w-full search-settings-collapse">
+        <AccordionItem className="term-boost-panel" id="1" key="1">
+          <Box align="center" className="tw:w-full" gap={2}>
+            {/* The core header's flex child is its heading wrapper, so give
+                the wrapper the remaining width and the whole row toggles. */}
+            <div className="tw:min-w-0 tw:flex-1">
+              <AccordionHeader>
+                <Box
+                  className="layout-row d-flex items-center justify-between w-full"
+                  wrap="wrap">
+                  <Box className="layout-column d-flex items-center gap-4">
+                    <Typography className="text-sm font-semibold m-0 tw:text-primary">
+                      {t('label.term-boost')}
+                    </Typography>
+                    <Typography className="count-label">
+                      {searchConfig?.globalSettings?.termBoosts?.length ?? 0}
+                    </Typography>
+                  </Box>
+                </Box>
+              </AccordionHeader>
+            </div>
+            <Box className="tw:ms-auto tw:pe-4">
               <Box className="layout-column d-flex items-center gap-2">
                 <Button
                   color="secondary"
@@ -135,31 +143,40 @@ const SearchBoostsSection = ({
                 </Button>
               </Box>
             </Box>
-          }
-          key="1">
-          <Grid.Item className="layout-column" span={24}>
-            <TermBoostList
-              handleDeleteTermBoost={onDeleteTermBoost}
-              handleTermBoostChange={onTermBoostChange}
-              showNewTermBoost={showNewTermBoost}
-              termBoosts={searchConfig?.globalSettings?.termBoosts ?? []}
-            />
-          </Grid.Item>
-        </Collapse.Panel>
-        <Collapse.Panel
-          className="field-value-boost-panel"
-          header={
-            <Box
-              className="layout-row d-flex items-center justify-between w-full"
-              wrap="wrap">
-              <Box className="layout-column d-flex items-center gap-4">
-                <Typography className="text-sm font-semibold m-0 tw:text-primary">
-                  {t('label.field-value-boost')}
-                </Typography>
-                <Typography className="count-label">
-                  {searchConfig?.globalSettings?.fieldValueBoosts?.length ?? 0}
-                </Typography>
-              </Box>
+          </Box>
+          <AccordionPanel>
+            <Grid.Item className="layout-column" span={24}>
+              <TermBoostList
+                handleDeleteTermBoost={onDeleteTermBoost}
+                handleTermBoostChange={onTermBoostChange}
+                showNewTermBoost={showNewTermBoost}
+                termBoosts={searchConfig?.globalSettings?.termBoosts ?? []}
+              />
+            </Grid.Item>
+          </AccordionPanel>
+        </AccordionItem>
+        <AccordionItem className="field-value-boost-panel" id="2" key="2">
+          <Box align="center" className="tw:w-full" gap={2}>
+            {/* The core header's flex child is its heading wrapper, so give
+                the wrapper the remaining width and the whole row toggles. */}
+            <div className="tw:min-w-0 tw:flex-1">
+              <AccordionHeader>
+                <Box
+                  className="layout-row d-flex items-center justify-between w-full"
+                  wrap="wrap">
+                  <Box className="layout-column d-flex items-center gap-4">
+                    <Typography className="text-sm font-semibold m-0 tw:text-primary">
+                      {t('label.field-value-boost')}
+                    </Typography>
+                    <Typography className="count-label">
+                      {searchConfig?.globalSettings?.fieldValueBoosts?.length ??
+                        0}
+                    </Typography>
+                  </Box>
+                </Box>
+              </AccordionHeader>
+            </div>
+            <Box className="tw:ms-auto tw:pe-4">
               <Box className="layout-column d-flex items-center gap-2">
                 <Button
                   color="secondary"
@@ -173,23 +190,24 @@ const SearchBoostsSection = ({
                 </Button>
               </Box>
             </Box>
-          }
-          key="2">
-          <Box className="layout-row p-t-sm w-full" wrap="wrap">
-            <div className="field-value-boost-table-container">
-              <FieldValueBoostList
-                dataTestId="field-value-boost-table"
-                fieldValueBoosts={
-                  searchConfig?.globalSettings?.fieldValueBoosts ?? []
-                }
-                handleDeleteFieldValueBoost={onDeleteFieldValueBoost}
-                handleEditFieldValueBoost={onEditFieldValueBoost}
-                isLoading={isLoading}
-              />
-            </div>
           </Box>
-        </Collapse.Panel>
-      </Collapse>
+          <AccordionPanel>
+            <Box className="layout-row p-t-sm w-full" wrap="wrap">
+              <div className="field-value-boost-table-container">
+                <FieldValueBoostList
+                  dataTestId="field-value-boost-table"
+                  fieldValueBoosts={
+                    searchConfig?.globalSettings?.fieldValueBoosts ?? []
+                  }
+                  handleDeleteFieldValueBoost={onDeleteFieldValueBoost}
+                  handleEditFieldValueBoost={onEditFieldValueBoost}
+                  isLoading={isLoading}
+                />
+              </div>
+            </Box>
+          </AccordionPanel>
+        </AccordionItem>
+      </Accordion>
     </Box>
   );
 };
@@ -232,7 +250,7 @@ const SearchSettingsPage = () => {
         GlobalSettingsMenuCategory.PREFERENCES,
         t('label.search')
       ),
-    []
+    [t]
   );
 
   const showHybridSearchWeights = useMemo(
@@ -682,17 +700,16 @@ const SearchSettingsPage = () => {
                     className="layout-column tw:block"
                     style={{ flex: 'auto' }}>
                     <Slider
-                      disabled={isUpdating}
-                      max={1}
-                      min={0}
+                      aria-label={t('label.value')}
+                      isDisabled={isUpdating}
+                      maxValue={1}
+                      minValue={0}
                       step={0.1}
-                      tooltip={{
-                        formatter: (val) => `${t('label.semantic')}: ${val}`,
-                      }}
                       value={
                         searchConfig?.globalSettings?.semanticWeight ?? 0.4
                       }
-                      onChange={(val: number) => {
+                      onChange={(value) => {
+                        const val = Array.isArray(value) ? value[0] : value;
                         if (!searchConfig) {
                           return;
                         }
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/search-settings.less b/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/search-settings.less
index 1a4f612bc6fd..6da07a3bafb8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/search-settings.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchSettingsPage/search-settings.less
@@ -57,33 +57,6 @@
   }
 }
 
-.boosts-section {
-  .ant-collapse {
-    .ant-collapse-item {
-      margin-bottom: var(--om-space-16);
-      border: 1px solid @grey-100;
-      border-radius: var(--om-radius-10);
-      overflow: hidden;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      > .ant-collapse-header {
-        display: flex;
-        align-items: center;
-      }
-
-      .ant-collapse-content {
-        border-top: 1px solid @grey-100;
-      }
-    }
-  }
-  .ant-collapse-borderless > .ant-collapse-item > .ant-collapse-content {
-    background-color: @grey-100;
-  }
-}
-
 .term-boost-add-btn,
 .term-boost-save-btn {
   background-color: @primary-heading-color;
@@ -94,24 +67,6 @@
 
 .search-settings-collapse {
   background-color: transparent;
-
-  .ant-collapse-item {
-    margin-bottom: var(--om-space-16);
-
-    &.term-boost-panel {
-      border: 1px solid @border-color-1;
-      background-color: @grey-50;
-      border-radius: var(--om-radius-lg);
-      overflow: hidden;
-    }
-
-    &.field-value-boost-panel {
-      border: 1px solid @border-color-1;
-      background-color: @grey-50;
-      border-radius: var(--om-radius-lg);
-      overflow: hidden;
-    }
-  }
 }
 
 .count-label {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.test.tsx
index 6dabb308866e..f4d86c3bd322 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.test.tsx
@@ -12,10 +12,10 @@
  */
 
 import { render, screen, waitFor } from '@testing-library/react';
-import { TreeDataNode } from 'antd';
 import { HelmetProvider } from 'react-helmet-async';
 import { Persona } from '../../generated/entity/teams/persona';
 import { NavigationItem } from '../../generated/system/ui/uiCustomization';
+import { NavigationTreeNode } from '../../interface/sidebar.interface';
 import { SettingsNavigationPage } from './SettingsNavigationPage';
 
 const mockNavigationItems: NavigationItem[] = [
@@ -47,26 +47,26 @@ const mockNavigationItems: NavigationItem[] = [
   },
 ];
 
-const mockTreeData: TreeDataNode[] = [
+const mockTreeData: NavigationTreeNode[] = [
   {
     key: 'explore',
     title: 'label.explore',
-    icon: <div>icon</div>,
+    icon: () => <svg />,
   },
   {
     key: 'observability',
     title: 'label.observability',
-    icon: <div>icon</div>,
+    icon: () => <svg />,
     children: [
       {
         key: 'incidents',
         title: 'label.incident-plural',
-        icon: <div>icon</div>,
+        icon: () => <svg />,
       },
       {
         key: 'data-quality',
         title: 'label.data-quality',
-        icon: <div>icon</div>,
+        icon: () => <svg />,
       },
     ],
   },
@@ -174,7 +174,7 @@ describe('SettingsNavigationPage', () => {
     expect(screen.getByTestId('page-layout-v1')).toBeInTheDocument();
     expect(screen.getByTestId('save-button')).toBeInTheDocument();
     expect(screen.getByTestId('reset-button')).toBeInTheDocument();
-    expect(screen.getByText('Navigation Menus')).toBeInTheDocument();
+    expect(screen.getAllByText('label.navigation')[0]).toBeInTheDocument();
   });
 
   it('should have save button enabled by default when state matches current navigation', () => {
@@ -196,13 +196,13 @@ describe('SettingsNavigationPage', () => {
       {
         key: 'observability',
         title: 'label.observability',
-        icon: <div>icon</div>,
+        icon: () => <svg />,
         children: [],
       },
       {
         key: 'explore',
         title: 'label.explore',
-        icon: <div>icon</div>,
+        icon: () => <svg />,
       },
     ];
 
@@ -260,15 +260,15 @@ describe('SettingsNavigationPage', () => {
   it('should render tree with draggable items', () => {
     renderComponent();
 
-    const tree = screen.getByRole('tree');
+    const tree = screen.getByRole('treegrid');
 
     expect(tree).toBeInTheDocument();
   });
 
   it('should show NavigationBlocker when there are unsaved changes', () => {
-    const { container } = renderComponent();
+    renderComponent();
 
-    expect(container.querySelector('.ant-tree')).toBeInTheDocument();
+    expect(screen.getByRole('treegrid')).toBeInTheDocument();
   });
 
   it('should render switches for all tree items', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.tsx
index 2bb2b0b23f3e..c9b7edfca64c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/SettingsNavigationPage.tsx
@@ -10,14 +10,20 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { HolderOutlined } from '@ant-design/icons';
-import { Card, Grid, Toggle } from '@openmetadata/ui-core-components';
-import { Tree, TreeDataNode, TreeProps } from 'antd';
-import { cloneDeep, isEqual } from 'lodash';
-import { useCallback, useMemo, useState } from 'react';
+import {
+  Box,
+  ButtonUtility,
+  Card,
+  Grid,
+  Toggle,
+  Tree,
+} from '@openmetadata/ui-core-components';
+import { DotsGrid } from '@openmetadata/ui-core-components/icons';
+import { NavigationTreeNode } from '../../interface/sidebar.interface';
+
+import { isEqual } from 'lodash';
+import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ReactComponent as IconDown } from '../../assets/svg/ic-arrow-down.svg';
-import { ReactComponent as IconRight } from '../../assets/svg/ic-arrow-right.svg';
 import { NavigationBlocker } from '../../components/common/NavigationBlocker/NavigationBlocker';
 import { CustomizablePageHeader } from '../../components/MyData/CustomizableComponents/CustomizablePageHeader/CustomizablePageHeader';
 import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
@@ -30,9 +36,11 @@ import {
   getTreeDataForNavigationItems,
 } from '../../utils/CustomizaNavigation/CustomizeNavigation';
 import { getEntityName } from '../../utils/EntityNameUtils';
-import { getNavigationItems } from '../../utils/SettingsNavigationPageUtils';
+import {
+  getNavigationItems,
+  moveNavigationItem,
+} from '../../utils/SettingsNavigationPageUtils';
 import { useCustomizeStore } from '../CustomizablePage/CustomizeStore';
-import './settings-navigation-page.less';
 
 interface Props {
   persona: Persona;
@@ -48,7 +56,7 @@ export const SettingsNavigationPage = ({ onSave, persona }: Props) => {
   const [hiddenKeys, setHiddenKeys] = useState<string[]>(
     getHiddenKeysFromNavigationItems(currentNavigation, plugins)
   );
-  const [treeData, setTreeData] = useState<TreeDataNode[]>(() =>
+  const [treeData, setTreeData] = useState<NavigationTreeNode[]>(() =>
     getTreeDataForNavigationItems(currentNavigation, plugins)
   );
 
@@ -65,67 +73,25 @@ export const SettingsNavigationPage = ({ onSave, persona }: Props) => {
     await onSave(navigationItems);
   };
 
-  const onDrop: TreeProps['onDrop'] = (info) => {
-    const dropKey = info.node.key;
-    const dragKey = info.dragNode.key;
-    const dropPos = info.node.pos.split('-');
-    const dropPosition =
-      info.dropPosition - Number(dropPos[dropPos.length - 1]); // the drop position relative to the drop node, inside 0, top -1, bottom 1
-
-    const loop = (
-      data: TreeDataNode[],
-      key: React.Key,
-      callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void
-    ) => {
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].key === key) {
-          return callback(data[i], i, data);
-        }
-        const children = data[i].children;
-        if (children) {
-          loop(children, key, callback);
-        }
-      }
-    };
-    const tempData = cloneDeep(treeData);
-
-    // Find dragObject
-    let dragObj!: TreeDataNode;
-    loop(tempData, dragKey, (item, index, arr) => {
-      arr.splice(index, 1);
-      dragObj = item;
-    });
-
-    if (!info.dropToGap) {
-      // Drop on the content
-      loop(tempData, dropKey, (item) => {
-        item.children = item.children || [];
-        // where to insert. New item was inserted to the start of the array in this example, but can be anywhere
-        item.children.unshift(dragObj);
-      });
-    } else {
-      let ar: TreeDataNode[] = [];
-      let i = 0;
-      loop(tempData, dropKey, (_item, index, arr) => {
-        ar = arr;
-        i = index;
-      });
-      if (dropPosition === -1) {
-        // Drop on the top of the drop node
-        ar.splice(i, 0, dragObj);
-      } else {
-        // Drop on the bottom of the drop node
-        ar.splice(i + 1, 0, dragObj);
-      }
-    }
-
-    setTreeData(tempData);
+  const onItemMove = ({
+    sourceKey,
+    targetKey,
+    dropPosition,
+  }: {
+    sourceKey: string | number;
+    targetKey: string | number;
+    dropPosition: 'before' | 'after' | 'on';
+  }) => {
+    setTreeData((nodes) =>
+      moveNavigationItem(
+        nodes,
+        String(sourceKey),
+        String(targetKey),
+        dropPosition
+      )
+    );
   };
 
-  const switcherIcon = useCallback(({ expanded }: { expanded?: boolean }) => {
-    return expanded ? <IconDown /> : <IconRight />;
-  }, []);
-
   const handleReset = () => {
     setTreeData(getTreeDataForNavigationItems(null, plugins));
     setHiddenKeys(getHiddenKeysFromNavigationItems(null, plugins));
@@ -137,17 +103,30 @@ export const SettingsNavigationPage = ({ onSave, persona }: Props) => {
     );
   };
 
-  const titleRenderer = (node: TreeDataNode) => (
-    <div className="space-between">
-      {t(node.title as string)}
-      <Toggle
-        data-testid={`navigation-switch-${node.key}`}
-        isSelected={!hiddenKeys.includes(node.key as string)}
-        onChange={(isSelected) =>
-          handleRemoveToggle(isSelected, node.key as string)
-        }
-      />
-    </div>
+  const renderNode = (node: NavigationTreeNode): React.ReactNode => (
+    <Tree.Item id={node.key} key={node.key} textValue={t(node.title)}>
+      <Tree.ItemContent className="tw:min-h-12" icon={node.icon}>
+        <Box align="center" className="tw:flex-1" gap={2} justify="between">
+          <ButtonUtility
+            aria-label={t('label.move')}
+            className="tw:invisible tw:group-hover/tree-item:visible tw:group-focus-within/tree-item:visible"
+            color="tertiary"
+            icon={DotsGrid}
+            size="xs"
+            slot="drag"
+          />
+          <span className="tw:flex-1">{t(node.title)}</span>
+          <Toggle
+            data-testid={`navigation-switch-${node.key}`}
+            isSelected={!hiddenKeys.includes(node.key as string)}
+            onChange={(isSelected) =>
+              handleRemoveToggle(isSelected, node.key as string)
+            }
+          />
+        </Box>
+      </Tree.ItemContent>
+      {node.children?.map(renderNode)}
+    </Tree.Item>
   );
 
   return (
@@ -171,20 +150,24 @@ export const SettingsNavigationPage = ({ onSave, persona }: Props) => {
 
           <Grid.Item className="layout-column" span={24}>
             <Card className="custom-navigation-tree-container" variant="ghost">
-              <Card.Header title="Navigation Menus" />
+              <Card.Header title={t('label.navigation')} />
               <Card.Content>
                 <Tree
-                  autoExpandParent
-                  blockNode
-                  defaultExpandAll
-                  showIcon
-                  draggable={{ icon: <HolderOutlined /> }}
-                  itemHeight={48}
-                  switcherIcon={switcherIcon}
-                  titleRender={titleRenderer}
-                  treeData={treeData}
-                  onDrop={onDrop}
-                />
+                  aria-label={t('label.navigation')}
+                  className="tw:max-w-105"
+                  defaultExpandedKeys={treeData.flatMap((node) => [
+                    node.key,
+                    ...(node.children?.map((child) => child.key) ?? []),
+                  ])}
+                  selectionMode="none"
+                  onItemMove={onItemMove}
+                  onItemRootDrop={(key) =>
+                    setTreeData((nodes) =>
+                      moveNavigationItem(nodes, String(key), undefined, 'after')
+                    )
+                  }>
+                  {treeData.map(renderNode)}
+                </Tree>
               </Card.Content>
             </Card>
           </Grid.Item>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/settings-navigation-page.less b/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/settings-navigation-page.less
deleted file mode 100644
index 53f620513385..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SettingsNavigationPage/settings-navigation-page.less
+++ /dev/null
@@ -1,79 +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';
-
-.custom-navigation-tree-container {
-  .ant-tree-list {
-    width: 420px;
-    .ant-tree-treenode {
-      padding: var(--om-space-12) 0;
-      border-radius: var(--om-radius-xl);
-
-      .ant-tree-node-content-wrapper {
-        &.ant-tree-node-selected {
-          background-color: transparent;
-        }
-        .ant-tree-title {
-          margin-left: var(--om-space-8);
-        }
-
-        &:hover {
-          background: transparent;
-        }
-      }
-
-      &:hover {
-        background: @primary-25;
-      }
-    }
-    .ant-tree-node-content-wrapper.ant-tree-node-selected {
-      color: @text-color;
-      .ant-tree-title {
-        font-weight: inherit;
-        color: @text-color;
-      }
-    }
-    .ant-tree-switcher.ant-tree-switcher-noop {
-      display: none;
-    }
-
-    .ant-tree-iconEle {
-      svg {
-        stroke-width: 1.5;
-      }
-    }
-
-    .ant-tree-title {
-      width: 100%;
-      & > div {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-      }
-    }
-
-    .ant-tree-treenode-draggable {
-      .ant-tree-draggable-icon {
-        visibility: hidden;
-      }
-
-      &:hover {
-        .ant-tree-draggable-icon {
-          visibility: visible;
-          color: @grey-4;
-        }
-      }
-    }
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TagPage/TagPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TagPage/TagPage.tsx
index 9e28085b4e4f..fd9215683025 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TagPage/TagPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TagPage/TagPage.tsx
@@ -624,7 +624,7 @@ const TagPage = () => {
           />
         ),
         key: EntityTabs.OVERVIEW,
-        children: <GenericTab type={PageType.Tag} variant="flat" />,
+        children: <GenericTab type={PageType.Tag} />,
       },
       {
         label: (
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/TaskFormSettingsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/TaskFormSettingsPage.tsx
index 65e74581a073..9360672ca2a8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/TaskFormSettingsPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/TaskFormSettingsPage.tsx
@@ -26,6 +26,7 @@
 
 import { PlusOutlined } from '@ant-design/icons';
 import {
+  Alert,
   Box,
   Button,
   Card,
@@ -37,7 +38,6 @@ import {
   TextArea,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Alert } from 'antd';
 import { AxiosError } from 'axios';
 import { FC, lazy, useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
@@ -864,10 +864,10 @@ const TaskFormSettingsPage = () => {
           <Alert
             showIcon
             className="task-form-settings-designer-pane__alert"
-            description="Use the builder for create forms, resolve forms, transition forms, and stage mappings. The raw JSON editors are still available under Advanced."
-            message="Design task forms visually"
-            type="info"
-          />
+            title={t('message.task-form-builder-title')}
+            variant="brand">
+            {t('message.task-form-builder-description')}
+          </Alert>
           <Tabs
             className="tw:gap-6"
             selectedKey={designerTab}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/components/TaskFormBuilderSection.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/components/TaskFormBuilderSection.tsx
index db8b283a4e44..2ae328fd6c33 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/components/TaskFormBuilderSection.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/TaskFormSettingsPage/components/TaskFormBuilderSection.tsx
@@ -30,6 +30,7 @@ import {
   Box,
   Button,
   Card,
+  Checkbox,
   EmptyPlaceholder,
   Input,
   Select,
@@ -37,7 +38,6 @@ import {
   Typography,
 } from '@openmetadata/ui-core-components';
 import { List } from '@openmetadata/ui-core-components/icons';
-import { Checkbox } from 'antd';
 import { Key, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { JsonSchemaObject } from '../../../rest/taskFormSchemasAPI';
@@ -331,27 +331,27 @@ const TaskFormBuilderSection = ({
                         gap={6}
                         itemClassName="layout-space-item">
                         <Checkbox
-                          checked={field.required}
                           data-testid={`${testIdPrefix}-field-required-${index}`}
+                          isSelected={field.required}
+                          label={<>{t('label.required')}</>}
                           onChange={(event) =>
                             updateField(index, (currentField) => ({
                               ...currentField,
-                              required: event.target.checked,
+                              required: event,
                             }))
-                          }>
-                          {t('label.required')}
-                        </Checkbox>
+                          }
+                        />
                         <Checkbox
-                          checked={field.hidden}
                           data-testid={`${testIdPrefix}-field-hidden-${index}`}
+                          isSelected={field.hidden}
+                          label={<>{t('label.hidden')}</>}
                           onChange={(event) =>
                             updateField(index, (currentField) => ({
                               ...currentField,
-                              hidden: event.target.checked,
+                              hidden: event,
                             }))
-                          }>
-                          {t('label.hidden')}
-                        </Checkbox>
+                          }
+                        />
                       </Box>
                     </div>
                   </Card.Content>
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
index 1b13ef2f0a06..503d0dffb253 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
@@ -1067,12 +1067,6 @@ a[href].link-text-grey,
   padding: 0;
   background: @user-profile-background;
   border: 0px;
-
-  .ant-collapse-content {
-    .ant-collapse-content-box {
-      padding: 0;
-    }
-  }
 }
 
 .data-asset-icon > svg {
@@ -1190,37 +1184,7 @@ a[href].link-text-grey,
 }
 
 // antd Alert paints static light tints per type (and antd heading-colour
-// text); in dark they read as white boxes with unreadable copy. Use the
-// theme-aware utility scale instead. Light keeps antd's values.
-.dark-mode .ant-alert {
-  &.ant-alert-info {
-    background-color: var(--tw-color-utility-blue-50);
-    border-color: var(--tw-color-utility-blue-200);
-  }
-
-  &.ant-alert-success {
-    background-color: var(--tw-color-utility-success-50);
-    border-color: var(--tw-color-utility-success-200);
-  }
-
-  &.ant-alert-warning {
-    background-color: var(--tw-color-utility-warning-50);
-    border-color: var(--tw-color-utility-warning-200);
-  }
-
-  &.ant-alert-error {
-    background-color: var(--tw-color-utility-error-50);
-    border-color: var(--tw-color-utility-error-200);
-  }
-
-  .ant-alert-message {
-    color: var(--om-color-text-primary);
-  }
-
-  .ant-alert-description {
-    color: var(--om-color-text-secondary);
-  }
-}
+// text);
 
 // antd DatePicker/RangePicker compile static light values: 25%-black
 // suffix/separator/clear icons and out-of-month cells, #bfbfbf placeholder,
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/drawer.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/drawer.less
index f98d0330884a..8a4c5798afd6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/drawer.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/drawer.less
@@ -12,50 +12,3 @@
  */
 @import (reference) '../variables.less';
 @import (reference) '../fonts.less';
-
-.feed-drawer {
-  .ant-drawer-header {
-    padding: 0;
-  }
-  .ant-drawer-body {
-    padding: var(--om-space-16);
-  }
-  .ant-drawer-title {
-    color: @text-color;
-    .text-sm(); // Using existing class: 14px font-size, 20px line-height
-    font-weight: @font-regular;
-  }
-  .ant-drawer-body {
-    overflow-x: hidden;
-  }
-}
-
-.ant-drawer-header {
-  border-bottom: none;
-}
-
-.custom-drawer-style {
-  .ant-drawer-footer {
-    box-shadow: 0px -13px 16px -4px var(--om-legacy-color-10-13-18-0-04),
-      0px -4px 6px -2px var(--om-legacy-color-10-13-18-0-04);
-    z-index: var(--om-z-1);
-  }
-  .ant-drawer-header {
-    box-shadow: 0px 9px 16px -4px var(--om-legacy-color-10-13-18-0-04);
-    z-index: var(--om-z-1);
-    .text-xl(); // Using existing class: 20px font-size, 30px line-height
-    font-weight: @font-semibold;
-    color: @grey-800;
-    display: flex;
-    align-items: center;
-
-    .drawer-close-icon {
-      width: 16px;
-      height: 16px;
-      color: @grey-700;
-      cursor: pointer;
-      flex-shrink: 0;
-      padding: 0;
-    }
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less
index baea6bde321e..c7b610ba84d0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/menu.less
@@ -57,18 +57,6 @@
   .ant-menu-item-selected {
     .ant-menu-title-content {
       font-weight: var(--om-font-weight-semibold);
-
-      .ant-badge {
-        color: @primary-color;
-      }
-    }
-  }
-
-  .ant-menu-item-active {
-    .ant-menu-title-content {
-      .ant-badge {
-        color: @primary-color;
-      }
     }
   }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/pagination.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/pagination.less
index 1de0e4e10e62..56196d3e8452 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/pagination.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/pagination.less
@@ -12,56 +12,7 @@
  */
 @import (reference) '../variables.less';
 
-.pagination-container,
-.ant-pagination {
-  .ant-pagination-item {
-    height: 40px;
-    padding: var(--om-space-4);
-    border: none;
-    border-radius: var(--om-radius-lg);
-    margin-right: var(--om-space-4);
-  }
-  .ant-pagination-item-active {
-    background-color: @primary-button-background;
-    border: none;
-  }
-
-  .ant-pagination-options {
-    .ant-select:not(.ant-select-customize-input) .ant-select-selector {
-      border: none;
-
-      .ant-select-selection-item {
-        font-weight: var(--om-font-weight-semibold);
-        color: @grey-500;
-      }
-    }
-    .ant-select-arrow {
-      color: @grey-500;
-      font-weight: var(--om-font-weight-semibold);
-    }
-  }
-
-  .ant-pagination-next,
-  .ant-pagination-prev {
-    margin-right: 0;
-    button {
-      border: none;
-    }
-  }
-
-  .ant-pagination-prev:hover button,
-  .ant-pagination-next:hover button {
-    border: none;
-  }
-
-  .ant-pagination-disabled {
-    .ant-btn-text[disabled] {
-      background-color: transparent;
-      border: transparent;
-      color: var(--om-legacy-color-0-0-0-0-25);
-    }
-  }
-
+.pagination-container {
   .ant-btn:disabled {
     background-color: transparent;
     border: transparent;
@@ -83,10 +34,3 @@
     font-size: var(--om-font-size-sm);
   }
 }
-
-// TODO: drop once PaginationComponent's itemRender moves to core Button (NextPrevious
-// already has). rc-pagination clones the antd prev/next Button as disabled and the
-// 25%-black rule above outranks the global `.dark-mode .ant-btn[disabled]` retint.
-.dark-mode .ant-pagination .ant-pagination-disabled .ant-btn-text[disabled] {
-  color: var(--om-color-text-disabled);
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/step.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/step.less
index 4a221177c277..1418f13502f8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/step.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/step.less
@@ -62,107 +62,3 @@
   margin-top: var(--om-space-2_4);
   z-index: var(--om-z-1);
 }
-
-.ant-steps-label-vertical .ant-steps-item-tail {
-  padding: var(--om-space-3_5) 0;
-}
-
-.ant-steps-item-finish
-  > .ant-steps-item-container
-  > .ant-steps-item-tail::after {
-  background-color: @primary-1;
-  height: 2px;
-}
-
-.ant-steps-item-process
-  > .ant-steps-item-container
-  > .ant-steps-item-tail::after {
-  background-color: @primary-1;
-  height: 2px;
-}
-
-.ant-steps-item-wait > .ant-steps-item-container > .ant-steps-item-tail::after {
-  background-color: @primary-1;
-  height: 2px;
-}
-
-.ant-steps-small .ant-steps-item-title {
-  font-size: var(--om-font-size-xs);
-  color: @primary-color;
-}
-
-.ant-steps-item-finish
-  > .ant-steps-item-container
-  > .ant-steps-item-content
-  > .ant-steps-item-title {
-  color: @primary-color;
-}
-
-.ant-steps-item-process
-  > .ant-steps-item-container
-  > .ant-steps-item-content
-  > .ant-steps-item-title {
-  color: black;
-}
-.ant-steps-item-wait
-  > .ant-steps-item-container
-  > .ant-steps-item-content
-  > .ant-steps-item-title {
-  color: black;
-}
-
-.task-resolution-steps {
-  .ant-steps-item-tail {
-    padding: var(--om-space-3_5) var(--om-space-24);
-  }
-
-  .ant-steps-item-finish
-    > .ant-steps-item-container
-    > .ant-steps-item-content
-    > .ant-steps-item-title {
-    color: @text-color;
-  }
-
-  .ant-steps-item-container > .ant-steps-item-tail::after {
-    background-color: var(--om-legacy-color-757575);
-    height: 1px;
-  }
-
-  .new {
-    .ant-steps-item-icon {
-      background-color: @purple-1;
-      border-color: @purple-2;
-      .ant-steps-icon {
-        color: @purple-2;
-      }
-    }
-  }
-
-  .ack {
-    .ant-steps-item-icon {
-      background-color: @blue-1;
-      border-color: @blue-2;
-      .ant-steps-icon {
-        color: @blue-2;
-      }
-    }
-  }
-  .assigned {
-    .ant-steps-item-icon {
-      background-color: @yellow-3;
-      border-color: @yellow-2;
-      .ant-steps-icon {
-        color: @yellow-2;
-      }
-    }
-  }
-  .resolved {
-    .ant-steps-item-icon {
-      background-color: @green-4;
-      border-color: @green-3;
-      .ant-steps-icon {
-        color: @green-3;
-      }
-    }
-  }
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/alerts-util.less b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/alerts-util.less
index 377a7194b65a..01a65d8fd133 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/alerts-util.less
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/alerts-util.less
@@ -30,23 +30,6 @@
   color: @warning-color;
 }
 
-.webhook-config-collapse.ant-collapse {
-  background-color: var(--tw-color-bg-primary);
-  .ant-collapse-content-box {
-    padding: var(--om-space-6) var(--om-space-16);
-  }
-  .ant-collapse-header {
-    padding: var(--om-space-6) var(--om-space-10);
-  }
-  .configuration-icon {
-    height: 14px;
-    width: 14px;
-  }
-  .ant-form-item-label {
-    padding: 0;
-  }
-}
-
 .entity-id-option {
   display: flex;
   flex-direction: column;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts
index ac8c9869a0e3..dc2dd178e40f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizaNavigation/CustomizeNavigation.ts
@@ -10,7 +10,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { TreeDataNode } from 'antd/lib';
 import { isEmpty, isNumber } from 'lodash';
 import { LeftSidebarItem } from '../../components/MyData/LeftSidebar/LeftSidebar.interface';
 import {
@@ -18,6 +17,7 @@ import {
   LeftSidebarItemExample,
 } from '../../components/Settings/Applications/plugins/AppPlugin';
 import { NavigationItem } from '../../generated/system/ui/uiCustomization';
+import { NavigationTreeNode } from '../../interface/sidebar.interface';
 import leftSidebarClassBase from '../LeftSidebarClassBase';
 
 const getBaseSidebarItems = (): LeftSidebarItem[] =>
@@ -121,26 +121,26 @@ const createNavigationMap = (
 
 const convertSidebarChildToTreeNode = (
   child: LeftSidebarItem
-): TreeDataNode => ({
+): NavigationTreeNode => ({
   title: child.title,
   key: child.key,
-  icon: child.icon as TreeDataNode['icon'],
+  icon: child.icon as NavigationTreeNode['icon'],
 });
 
 const collectNewDefaultChildNodes = (
   defaultChildren: LeftSidebarItem[],
   savedKeys: Set<string>
-): TreeDataNode[] =>
+): NavigationTreeNode[] =>
   defaultChildren
     .filter((child) => !savedKeys.has(child.key))
     .map(convertSidebarChildToTreeNode);
 
 const convertSidebarItemToTreeNode = (
   sidebarItem: LeftSidebarItem
-): TreeDataNode => ({
+): NavigationTreeNode => ({
   title: sidebarItem.title,
   key: sidebarItem.key,
-  icon: sidebarItem.icon as TreeDataNode['icon'],
+  icon: sidebarItem.icon as NavigationTreeNode['icon'],
   children: sidebarItem.children?.map(convertSidebarChildToTreeNode),
 });
 
@@ -160,14 +160,14 @@ const collectNavigationKeys = (
 const convertNavigationChildToTreeNode = (
   navChild: NavigationItem,
   sidebarMap: Map<string, LeftSidebarItem>
-): TreeDataNode | null => {
+): NavigationTreeNode | null => {
   const sidebarChild = sidebarMap.get(navChild.id);
 
   return sidebarChild
     ? {
         title: navChild.title,
         key: navChild.id,
-        icon: sidebarChild.icon as TreeDataNode['icon'],
+        icon: sidebarChild.icon as NavigationTreeNode['icon'],
       }
     : null;
 };
@@ -177,7 +177,7 @@ const buildChildrenForSavedItem = (
   sidebarItem: LeftSidebarItem | undefined,
   sidebarMap: Map<string, LeftSidebarItem>,
   savedKeys: Set<string>
-): TreeDataNode[] | undefined => {
+): NavigationTreeNode[] | undefined => {
   const defaultChildren = sidebarItem?.children ?? [];
 
   if (isEmpty(navItem.children) && isEmpty(defaultChildren)) {
@@ -186,7 +186,7 @@ const buildChildrenForSavedItem = (
 
   const savedChildNodes = (navItem.children ?? [])
     .map((child) => convertNavigationChildToTreeNode(child, sidebarMap))
-    .filter((node): node is TreeDataNode => node !== null);
+    .filter((node): node is NavigationTreeNode => node !== null);
 
   const newDefaultChildNodes = collectNewDefaultChildNodes(
     defaultChildren,
@@ -200,13 +200,13 @@ const buildTreeNodeFromSavedItem = (
   navItem: NavigationItem,
   sidebarMap: Map<string, LeftSidebarItem>,
   savedKeys: Set<string>
-): TreeDataNode => {
+): NavigationTreeNode => {
   const sidebarItem = sidebarMap.get(navItem.id);
 
   return {
     title: navItem.title,
     key: navItem.id,
-    icon: sidebarItem?.icon as TreeDataNode['icon'],
+    icon: sidebarItem?.icon as NavigationTreeNode['icon'],
     children: buildChildrenForSavedItem(
       navItem,
       sidebarItem,
@@ -219,10 +219,10 @@ const buildTreeNodeFromSavedItem = (
 const convertNewDefaultItemToTreeNode = (
   sidebarItem: LeftSidebarItem,
   savedKeys: Set<string>
-): TreeDataNode & { isHidden?: boolean } => ({
+): NavigationTreeNode & { isHidden?: boolean } => ({
   title: sidebarItem.title,
   key: sidebarItem.key,
-  icon: sidebarItem.icon as TreeDataNode['icon'],
+  icon: sidebarItem.icon as NavigationTreeNode['icon'],
   children: sidebarItem.children
     ? collectNewDefaultChildNodes(sidebarItem.children, savedKeys)
     : undefined,
@@ -232,7 +232,7 @@ const convertNewDefaultItemToTreeNode = (
 export const getTreeDataForNavigationItems = (
   navigationItems: NavigationItem[] | null,
   plugins?: AppPlugin[]
-): TreeDataNode[] => {
+): NavigationTreeNode[] => {
   const sidebarItemsWithPlugins = getSidebarItemsWithPlugins(plugins);
 
   if (navigationItems === null || isEmpty(navigationItems)) {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DataProductUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/DataProductUtils.tsx
index cb9ea9781131..949cb33dd776 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DataProductUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DataProductUtils.tsx
@@ -397,7 +397,7 @@ export const getDataProductDetailTabs = ({
         />
       ),
       key: EntityTabs.DOCUMENTATION,
-      children: <GenericTab type={PageType.DataProduct} variant="flat" />,
+      children: <GenericTab type={PageType.DataProduct} />,
     },
     ...(isVersionsView
       ? []
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx
index b7433186dd32..61a4c772deaa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx
@@ -228,7 +228,7 @@ export const getDomainDetailTabs = ({
         />
       ),
       key: EntityTabs.DOCUMENTATION,
-      children: <GenericTab type={PageType.Domain} variant="flat" />,
+      children: <GenericTab type={PageType.Domain} />,
     },
     ...(isVersionsView
       ? []
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtilsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtilsV1.tsx
index dc55f352f1aa..000f34682422 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtilsV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtilsV1.tsx
@@ -17,7 +17,6 @@ import {
   Grid,
   Typography,
 } from '@openmetadata/ui-core-components';
-import { Table } from 'antd';
 import { AxiosError } from 'axios';
 import { isEmpty, isUndefined } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
@@ -25,6 +24,7 @@ import { ReactComponent as NestedIcon } from '../assets/svg/nested.svg';
 import FieldCard from '../components/common/FieldCard/FieldCard';
 import { NestedFieldCardProps } from '../components/common/FieldCard/FieldCard.interface';
 import Loader from '../components/common/Loader/Loader';
+import Table from '../components/common/Table/TableV2';
 import '../components/Explore/EntitySummaryPanel/entity-summary-panel.less';
 import { SearchedDataProps } from '../components/SearchedData/SearchedData.interface';
 import TagsViewer from '../components/Tag/TagsViewer/TagsViewer';
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtilClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtilClassBase.ts
index efabca30f4ef..6395b707360a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtilClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtilClassBase.ts
@@ -11,11 +11,11 @@
  *  limitations under the License.
  */
 
-import type { ItemType } from 'antd/lib/menu/hooks/useItems';
 import type { Operation } from 'fast-json-patch';
 import { capitalize } from 'lodash';
 import type { FC } from 'react';
 import type { NavigateFunction } from 'react-router-dom';
+import { ManageMenuItem as ItemType } from '../components/common/EntityPageInfos/ManageButton/ManageMenu';
 import { GlobalSettingsMenuCategory } from '../constants/GlobalSettings.constants';
 import { type OperationPermission } from '../context/PermissionProvider/PermissionProvider.interface';
 import { EntityTabs, EntityType } from '../enums/entity.enum';
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Glossary/GlossaryTermUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Glossary/GlossaryTermUtils.tsx
index 586ba2d02142..50efa3d541f9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/Glossary/GlossaryTermUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/Glossary/GlossaryTermUtils.tsx
@@ -147,7 +147,7 @@ export const getGlossaryTermDetailPageTabs = (
       </div>
     ),
     key: EntityTabs.OVERVIEW,
-    children: <GenericTab type={PageType.GlossaryTerm} variant="flat" />,
+    children: <GenericTab type={PageType.GlossaryTerm} />,
   });
 
   const buildTermsTab = (): TabProps => ({
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/KnowledgePagePureUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/KnowledgePagePureUtils.ts
index e959def8c3dd..1e05a0a1a681 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/KnowledgePagePureUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/KnowledgePagePureUtils.ts
@@ -10,7 +10,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import type { DataNode } from 'antd/lib/tree';
 import { cloneDeep, isEmpty, unionBy } from 'lodash';
 import { FQN_SEPARATOR_CHAR } from '../constants/char.constants';
 import {
@@ -31,6 +30,7 @@ import type {
   PageHierarchy,
   PageSearchResult,
 } from '../interface/knowledge-center.interface';
+import { TreeNode } from '../interface/tree.interface';
 import { getEntityName } from './EntityNameUtils';
 import Fqn from './Fqn';
 import { t } from './i18next/LocalUtil';
@@ -93,7 +93,7 @@ export const convertToTreeData = (
   activePage?: KnowledgePage,
   pages: PageHierarchy[] = []
 ) => {
-  const treeData: DataNode[] = pages.map((page) => {
+  const treeData: TreeNode[] = pages.map((page) => {
     const isActive = activePage?.fullyQualifiedName === page.fullyQualifiedName;
     const resolvedPage = isActive ? activePage : page;
     const title = getKnowledgePageName(resolvedPage as KnowledgePage);
@@ -104,13 +104,13 @@ export const convertToTreeData = (
         key: page.fullyQualifiedName,
         title,
         isLeaf: page.childrenCount === 0,
-      } as DataNode;
+      } as TreeNode;
     } else {
       return {
         key: page.fullyQualifiedName,
         title,
         children: convertToTreeData(activePage, page.children),
-      } as DataNode;
+      } as TreeNode;
     }
   });
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
index 4ba152428b6c..d851bd458d84 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts
@@ -12,7 +12,6 @@
  */
 
 import { ObjectFieldTemplatePropertyType, RJSFSchema } from '@rjsf/utils';
-import { MenuProps } from 'antd';
 import { get, isEmpty } from 'lodash';
 import { ServiceTypes } from 'Models';
 import type { ComponentType } from 'react';
@@ -25,6 +24,7 @@ import QuickLinkIcon from '../assets/svg/ic-quick-link.svg';
 import DatabaseSchemaIcon from '../assets/svg/ic-schema.svg';
 import MetricIcon from '../assets/svg/metric.svg';
 import TagIcon from '../assets/svg/tag-grey.svg';
+import { ManageMenuItem } from '../components/common/EntityPageInfos/ManageButton/ManageMenu';
 import { EntityType } from '../enums/entity.enum';
 import { ExplorePageTabs } from '../enums/Explore.enum';
 import {
@@ -562,7 +562,7 @@ class ServiceUtilClassBase {
     _serviceName?: string,
     _navigate?: (path: string) => void,
     _serviceDetails?: ServicesType
-  ): MenuProps['items'] {
+  ): ManageMenuItem[] {
     return [];
   }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.test.tsx
index 159e9825275c..040c49918e1a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.test.tsx
@@ -11,13 +11,16 @@
  *  limitations under the License.
  */
 
-import { TreeDataNode } from 'antd';
-import { getNavigationItems } from './SettingsNavigationPageUtils';
+import { NavigationTreeNode } from '../interface/sidebar.interface';
+import {
+  getNavigationItems,
+  moveNavigationItem,
+} from './SettingsNavigationPageUtils';
 
 describe('SettingsNavigationPageUtils', () => {
   describe('getNavigationItems', () => {
     it('should convert empty tree data to empty navigation items', () => {
-      const treeData: TreeDataNode[] = [];
+      const treeData: NavigationTreeNode[] = [];
       const hiddenKeys: string[] = [];
 
       const result = getNavigationItems(treeData, hiddenKeys);
@@ -26,7 +29,7 @@ describe('SettingsNavigationPageUtils', () => {
     });
 
     it('should convert single tree node to navigation item with correct hidden state', () => {
-      const treeData: TreeDataNode[] = [
+      const treeData: NavigationTreeNode[] = [
         {
           key: 'test-key',
           title: 'Test Title',
@@ -47,7 +50,7 @@ describe('SettingsNavigationPageUtils', () => {
     });
 
     it('should handle tree data with children and nested hidden states', () => {
-      const treeData: TreeDataNode[] = [
+      const treeData: NavigationTreeNode[] = [
         {
           key: 'parent-key',
           title: 'Parent Title',
@@ -81,7 +84,7 @@ describe('SettingsNavigationPageUtils', () => {
     });
 
     it('should handle complex tree structure with multiple levels and mixed hidden states', () => {
-      const treeData: TreeDataNode[] = [
+      const treeData: NavigationTreeNode[] = [
         {
           key: 'root',
           title: 'Root',
@@ -138,3 +141,37 @@ describe('SettingsNavigationPageUtils', () => {
     });
   });
 });
+
+describe('moveNavigationItem', () => {
+  const nodes: NavigationTreeNode[] = [
+    { key: 'a', title: 'A', children: [{ key: 'child', title: 'Child' }] },
+    { key: 'b', title: 'B' },
+    { key: 'c', title: 'C' },
+  ];
+
+  it('reorders siblings without changing the original hierarchy', () => {
+    const moved = moveNavigationItem(nodes, 'a', 'b', 'after');
+
+    expect(moved.map((node) => node.key)).toEqual(['b', 'a', 'c']);
+    expect(moved[1].children?.[0].key).toBe('child');
+    expect(nodes.map((node) => node.key)).toEqual(['a', 'b', 'c']);
+  });
+
+  it('moves a child into another parent and back to the root', () => {
+    const moved = moveNavigationItem(nodes, 'child', 'b', 'on');
+
+    expect(moved[0].children).toEqual([]);
+    expect(moved[1].children?.[0].key).toBe('child');
+    expect(
+      moveNavigationItem(moved, 'child', undefined, 'after').map(
+        (node) => node.key
+      )
+    ).toEqual(['a', 'b', 'c', 'child']);
+  });
+
+  it('rejects missing targets, self drops, and drops into descendants', () => {
+    expect(moveNavigationItem(nodes, 'a', 'child', 'on')).toBe(nodes);
+    expect(moveNavigationItem(nodes, 'a', 'a', 'before')).toBe(nodes);
+    expect(moveNavigationItem(nodes, 'a', 'missing', 'on')).toBe(nodes);
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.tsx
index c3b3484daaff..d7d4801eba81 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/SettingsNavigationPageUtils.tsx
@@ -11,11 +11,11 @@
  *  limitations under the License.
  */
 
-import { TreeDataNode } from 'antd';
 import { NavigationItem } from '../generated/system/ui/uiCustomization';
+import { NavigationTreeNode } from '../interface/sidebar.interface';
 
 export const getNavigationItems = (
-  treeData: TreeDataNode[],
+  treeData: NavigationTreeNode[],
   hiddenKeys: string[]
 ): NavigationItem[] => {
   return treeData.map((item) => {
@@ -27,3 +27,67 @@ export const getNavigationItems = (
     } as NavigationItem;
   });
 };
+
+// Icons are React components, so clone the hierarchy without serializing them.
+const structuredCloneNavigation = (
+  nodes: NavigationTreeNode[]
+): NavigationTreeNode[] =>
+  nodes.map((node) => ({
+    ...node,
+    children: node.children
+      ? structuredCloneNavigation(node.children)
+      : undefined,
+  }));
+
+export const moveNavigationItem = (
+  treeData: NavigationTreeNode[],
+  sourceKey: string,
+  targetKey: string | undefined,
+  dropPosition: 'before' | 'after' | 'on'
+): NavigationTreeNode[] => {
+  const next = structuredCloneNavigation(treeData);
+  const find = (
+    nodes: NavigationTreeNode[],
+    key: string
+  ): { nodes: NavigationTreeNode[]; index: number } | undefined => {
+    for (let index = 0; index < nodes.length; index++) {
+      if (nodes[index].key === key) {
+        return { nodes, index };
+      }
+      const found = find(nodes[index].children ?? [], key);
+      if (found) {
+        return found;
+      }
+    }
+
+    return undefined;
+  };
+  const source = find(next, sourceKey);
+  if (!source || sourceKey === targetKey) {
+    return treeData;
+  }
+  const [item] = source.nodes.splice(source.index, 1);
+  if (targetKey === undefined) {
+    next.push(item);
+
+    return next;
+  }
+  // Removing the source also removes its descendants; an absent target therefore
+  // rejects dropping a parent into its own subtree without losing any items.
+  const target = find(next, targetKey);
+  if (!target) {
+    return treeData;
+  }
+  if (dropPosition === 'on') {
+    const parent = target.nodes[target.index];
+    parent.children = [item, ...(parent.children ?? [])];
+  } else {
+    target.nodes.splice(
+      target.index + (dropPosition === 'after' ? 1 : 0),
+      0,
+      item
+    );
+  }
+
+  return next;
+};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx
index 981c376ec450..5b1279377c95 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.test.tsx
@@ -19,7 +19,7 @@ import {
   getUsageCountLink,
   parseTagUsageBuckets,
 } from './TagsPureUtils';
-import { getDeleteIcon } from './TagsUtils';
+import { getDeleteIcon, getTagTooltip } from './TagsUtils';
 
 describe('getDeleteIcon', () => {
   it('renders CheckOutlined icon when deleteTagId matches id and status is "success"', () => {
@@ -190,3 +190,28 @@ describe('parseTagUsageBuckets', () => {
     expect(parseTagUsageBuckets(undefined, field)).toEqual({});
   });
 });
+
+describe('getTagTooltip', () => {
+  it('renders the FQN in bold when the description is HTML with a list', () => {
+    const { container } = render(
+      getTagTooltip(
+        'PII.Sensitive',
+        '<p>Why:</p><ul><li><strong>Business-Critical</strong></li></ul>'
+      )
+    );
+
+    expect(container.querySelector('strong')).toHaveTextContent(
+      'PII.Sensitive'
+    );
+    expect(container).not.toHaveTextContent('**');
+  });
+
+  it('renders only the FQN when there is no description', () => {
+    const { container } = render(getTagTooltip('PII.Sensitive'));
+
+    expect(container).toHaveTextContent('PII.Sensitive');
+    expect(
+      container.querySelector('[data-testid="viewer-container"]')
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx
index 2fc7840f3307..10406f98de70 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx
@@ -124,13 +124,17 @@ export const getTaglist = async (
 
 export const getTagTooltip = (fqn: string, description?: string) => (
   <div className="text-left p-xss">
-    <div className="m-b-xs">
-      <RichTextEditorPreviewerV1
-        enableSeeMoreVariant={false}
-        markdown={`**${fqn}**\n${description ?? ''}`}
-        textVariant="white"
-      />
-    </div>
+    {/* Not markdown: an HTML description makes the previewer skip markdown, leaving `**` literal. */}
+    <strong>{fqn}</strong>
+    {description && (
+      <div className="m-b-xs">
+        <RichTextEditorPreviewerV1
+          enableSeeMoreVariant={false}
+          markdown={description}
+          textVariant="white"
+        />
+      </div>
+    )}
   </div>
 );
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.test.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.test.tsx
index 1f8bba5d1de6..63ca48376e37 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.test.tsx
@@ -12,8 +12,8 @@
  */
 
 import { render, screen } from '@testing-library/react';
-import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import { MemoryRouter } from 'react-router-dom';
+import { ManageMenuItem as ItemType } from '../components/common/EntityPageInfos/ManageButton/ManageMenu';
 import { ExportTypes } from '../constants/Export.constants';
 import { EntityType } from '../enums/entity.enum';
 import { exportTestCasesInCSV } from '../rest/testAPI';
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.tsx
index d51f4f00b044..b394d33997e2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TestCaseUtils.tsx
@@ -13,12 +13,12 @@
 
 import { Typography } from '@openmetadata/ui-core-components';
 import { Upload01 as ImportIcon } from '@openmetadata/ui-core-components/icons';
-import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import { lowerCase } from 'lodash';
 import type { ReactElement, ReactNode } from 'react';
 import { NavigateFunction } from 'react-router-dom';
 import { ReactComponent as IconEdit } from '../assets/svg/edit-new.svg';
 import { ReactComponent as ExportIcon } from '../assets/svg/ic-export.svg';
+import { ManageMenuItem as ItemType } from '../components/common/EntityPageInfos/ManageButton/ManageMenu';
 import { ManageButtonItemLabel } from '../components/common/ManageButtonContentItem/ManageButtonContentItem.component';
 import { ManageMenuItem } from '../components/common/ManageMenuButton/ManageMenuButton.component';
 import { ExportData } from '../components/Entity/EntityExportModalProvider/EntityExportModalProvider.interface';
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TreeSelect.utils.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TreeSelect.utils.test.ts
new file mode 100644
index 000000000000..9f2692a233bd
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TreeSelect.utils.test.ts
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2024 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 {
+  getTreeSelectValue,
+  getTreeSelectValues,
+  toTreeSelectNodes,
+} from './TreeSelect.utils';
+const nodes = toTreeSelectNodes([
+  {
+    value: 'all',
+    title: 'All',
+    children: [
+      { value: 'a', title: 'A' },
+      { value: 'b', title: 'B' },
+    ],
+  },
+]);
+
+it('expands persisted parent selections and condenses checked descendants for the API', () => {
+  const selection = getTreeSelectValue(nodes, ['all']);
+
+  expect(selection.map((node) => node.id)).toEqual(['all', 'a', 'b']);
+  expect(getTreeSelectValues(selection)).toEqual(['all']);
+});
+
+it('keeps independent child selections and clearing intact', () => {
+  expect(getTreeSelectValues(getTreeSelectValue(nodes, ['b']))).toEqual(['b']);
+  expect(getTreeSelectValues(null)).toEqual([]);
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TreeSelect.utils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TreeSelect.utils.ts
new file mode 100644
index 000000000000..cfd6f89971ae
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TreeSelect.utils.ts
@@ -0,0 +1,75 @@
+/*
+ *  Copyright 2024 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 { TreeSelectNode } from '@openmetadata/ui-core-components';
+
+export interface TreeOption {
+  value: string | number;
+  label?: string;
+  title?: string;
+  children?: TreeOption[];
+  disabled?: boolean;
+}
+
+export const toTreeSelectNodes = (
+  options: TreeOption[],
+  parentId?: string
+): TreeSelectNode[] =>
+  options.map((option) => ({
+    id: String(option.value),
+    value: String(option.value),
+    // Core uses string values; preserve numeric enums for the schema payload.
+    data: option.value,
+    label: option.label ?? option.title ?? String(option.value),
+    parentId,
+    disabled: option.disabled,
+    children: option.children
+      ? toTreeSelectNodes(option.children, String(option.value))
+      : undefined,
+  }));
+
+export const getTreeSelectValue = (
+  nodes: TreeSelectNode[],
+  values: (string | number)[] = []
+): TreeSelectNode[] => {
+  const selected = new Set(values);
+  const result: TreeSelectNode[] = [];
+  const visit = (items: TreeSelectNode[], parentSelected = false) =>
+    items.forEach((node) => {
+      const isSelected =
+        parentSelected ||
+        selected.has(node.data as string | number) ||
+        selected.has((node.data as string | number) ?? node.value ?? node.id);
+      if (isSelected) {
+        result.push(node);
+      }
+      if (node.children) {
+        visit(node.children, isSelected);
+      }
+    });
+  // Core tracks each checked descendant; expand persisted parent values so the
+  // synthetic All row and its children agree when the picker first opens.
+  visit(nodes);
+
+  return result;
+};
+
+export const getTreeSelectValues = (
+  selection: TreeSelectNode | TreeSelectNode[] | null
+): (string | number)[] => {
+  const nodes = selection ? [selection].flat() : [];
+  const selectedIds = new Set(nodes.map((node) => node.id));
+
+  return nodes
+    .filter((node) => !node.parentId || !selectedIds.has(node.parentId))
+    .map((node) => node.value ?? node.id);
+};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/executionUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/executionUtils.tsx
index 22d2f1f374aa..d14b4ac6f1e6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/executionUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/executionUtils.tsx
@@ -13,7 +13,6 @@
 
 import Icon from '@ant-design/icons/lib/components/Icon';
 import { Box, Tooltip } from '@openmetadata/ui-core-components';
-import { DataNode } from 'antd/lib/tree';
 import { groupBy, isUndefined, map, toLower } from 'lodash';
 import React from 'react';
 import { MenuOptions } from '../constants/execution.constants';
@@ -23,6 +22,7 @@ import {
   Task,
   TaskStatus,
 } from '../generated/entity/data/pipeline';
+import { TreeNode } from '../interface/tree.interface';
 import { getLayoutGutter } from './common/layout.utils';
 import { formatDateTime, formatDuration } from './date-time/DateTimeUtils';
 import { t } from './i18next/LocalUtil';
@@ -150,7 +150,7 @@ export const buildCompleteTree = (
   key: string,
   parentKey: string
 ) => {
-  let node: DataNode;
+  let node: TreeNode;
 
   const nodeKey: string = parentKey + '-' + key;
 
@@ -197,8 +197,8 @@ export const getTreeData = (
   viewData: Record<string, ViewDataInterface[]>
 ) => {
   const icon = <div className="tree-view-dot" />;
-  const treeDataList: DataNode[] = [];
-  const treeLabelList: DataNode[] = [];
+  const treeDataList: TreeNode[] = [];
+  const treeLabelList: TreeNode[] = [];
 
   // map execution element to task name
   const viewElements = map(
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx
index 762701adbbd7..64576f1ea5d8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx
@@ -11,6 +11,7 @@
  *  limitations under the License.
  */
 import {
+  Alert,
   Divider,
   Input as UTInput,
   Select as UTSelect,
@@ -19,15 +20,7 @@ import {
   ToggleProps,
   Typography,
 } from '@openmetadata/ui-core-components';
-import {
-  Alert,
-  Checkbox,
-  Form,
-  FormItemProps,
-  Input,
-  InputNumber,
-  Select,
-} from 'antd';
+import { Form, FormItemProps, Input, Select } from 'antd';
 import { RuleObject } from 'antd/lib/form';
 import { AxiosError } from 'axios';
 import classNames from 'classnames';
@@ -99,11 +92,7 @@ const FIELD_ELEMENT_RENDERERS: Partial<
       />
     ),
   }),
-  [FieldTypes.NUMBER]: ({ props, id, placeholder }) => ({
-    element: (
-      <InputNumber id={id} placeholder={placeholder} size="small" {...props} />
-    ),
-  }),
+
   [FieldTypes.FILTER_PATTERN]: ({ props }) => ({
     element: <FilterPattern {...(props as unknown as FilterPatternProps)} />,
   }),
@@ -118,10 +107,7 @@ const FIELD_ELEMENT_RENDERERS: Partial<
       formPropsPatch: { valuePropName: 'isSelected' },
     };
   },
-  [FieldTypes.CHECK_BOX]: ({ props, id }) => ({
-    element: <Checkbox {...props} id={id} />,
-    formPropsPatch: { valuePropName: 'checked' },
-  }),
+
   [FieldTypes.SELECT]: ({ props, id }) => ({
     element: <Select {...props} id={id} />,
   }),
@@ -408,8 +394,8 @@ export const getField = (field: FieldProp) => {
           showIcon
           className="m-b-lg alert-icon"
           data-testid="form-item-alert"
-          message={helperText}
-          type="warning"
+          title={helperText}
+          variant="warning"
         />
       )}