diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
index f9220806c90..902854c17a3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
@@ -13,7 +13,7 @@
 
 import { Button, Col, Row, Typography } from 'antd';
 import classNames from 'classnames';
-import { ERROR_PLACEHOLDER_TYPE } from 'enums/common.enum';
+import { ERROR_PLACEHOLDER_TYPE, SIZE } from 'enums/common.enum';
 import { isUndefined } from 'lodash';
 import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -310,7 +310,11 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
             {entityName && feedFilter === FeedFilter.ALL && !threadType ? (
               <NoFeedPlaceholder entityName={entityName} />
             ) : !refreshFeedCount ? (
-              <ErrorPlaceHolder type={ERROR_PLACEHOLDER_TYPE.FILTER} />
+              <ErrorPlaceHolder
+                className="mt-0-important pt-8"
+                size={SIZE.MEDIUM}
+                type={ERROR_PLACEHOLDER_TYPE.FILTER}
+              />
             ) : null}
           </div>
         )
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx
index 38d7b12896c..b616d33cad0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx
@@ -10,8 +10,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
+import { Card } from 'antd';
 import classNames from 'classnames';
-import PageContainer from 'components/containers/PageContainer';
+import PageContainerV1 from 'components/containers/PageContainerV1';
+import PageLayoutV1 from 'components/containers/PageLayoutV1';
 import {
   ChangeDescription,
   Column,
@@ -384,11 +387,11 @@ const ContainerVersion: React.FC<ContainerVersionProp> = ({
   }, [currentVersionData]);
 
   return (
-    <PageContainer>
-      <div
-        className={classNames(
-          'tw-px-6 tw-w-full tw-h-full tw-flex tw-flex-col tw-relative'
-        )}>
+    <PageContainerV1>
+      <PageLayoutV1
+        pageTitle={t('label.entity-detail-plural', {
+          entity: getEntityName(currentVersionData),
+        })}>
         {isVersionLoading ? (
           <Loader />
         ) : (
@@ -408,7 +411,7 @@ const ContainerVersion: React.FC<ContainerVersionProp> = ({
             />
             <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
               <TabsPane activeTab={1} className="tw-flex-initial" tabs={tabs} />
-              <div className="tw-bg-white tw-flex-grow tw--mx-6 tw-px-7 tw-py-4">
+              <Card className="m-y-md">
                 <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
                   <div className="tw-col-span-full">
                     <Description
@@ -429,7 +432,7 @@ const ContainerVersion: React.FC<ContainerVersionProp> = ({
                     />
                   </div>
                 </div>
-              </div>
+              </Card>
             </div>
           </div>
         )}
@@ -441,8 +444,8 @@ const ContainerVersion: React.FC<ContainerVersionProp> = ({
           versionList={versionList}
           onBack={backHandler}
         />
-      </div>
-    </PageContainer>
+      </PageLayoutV1>
+    </PageContainerV1>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
index 71894a3f6f8..14b9cbb2a88 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
@@ -859,19 +859,18 @@ const DashboardDetails = ({
             </Card>
           )}
           {activeTab === 4 && (
-            <Card className={ENTITY_CARD_CLASS}>
-              <CustomPropertyTable
-                entityDetails={
-                  dashboardDetails as CustomPropertyProps['entityDetails']
-                }
-                entityType={EntityType.DASHBOARD}
-                handleExtensionUpdate={onExtensionUpdate}
-                hasEditAccess={
-                  dashboardPermissions.EditAll ||
-                  dashboardPermissions.EditCustomFields
-                }
-              />
-            </Card>
+            <CustomPropertyTable
+              className="mt-0-important"
+              entityDetails={
+                dashboardDetails as CustomPropertyProps['entityDetails']
+              }
+              entityType={EntityType.DASHBOARD}
+              handleExtensionUpdate={onExtensionUpdate}
+              hasEditAccess={
+                dashboardPermissions.EditAll ||
+                dashboardPermissions.EditCustomFields
+              }
+            />
           )}
           <div
             data-testid="observer-element"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx
index 8cc70cb6a91..cb68a273c72 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx
@@ -11,10 +11,11 @@
  *  limitations under the License.
  */
 
-import { Space, Table } from 'antd';
+import { Card, Space, Table } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
 import classNames from 'classnames';
-import PageContainer from 'components/containers/PageContainer';
+import PageContainerV1 from 'components/containers/PageContainerV1';
+import PageLayoutV1 from 'components/containers/PageLayoutV1';
 import { isUndefined } from 'lodash';
 import { ExtraInfo } from 'Models';
 import React, { FC, useEffect, useMemo, useState } from 'react';
@@ -263,69 +264,76 @@ const DashboardVersion: FC<DashboardVersionProp> = ({
   );
 
   return (
-    <PageContainer>
-      <div
-        className={classNames(
-          'tw-px-6 tw-w-full tw-h-full tw-flex tw-flex-col tw-relative'
-        )}
-        data-testid="dashboard-version-container">
-        {isVersionLoading ? (
-          <Loader />
-        ) : (
-          <div
-            className={classNames('version-data')}
-            data-testid="version-data">
-            <EntityPageInfo
-              isVersionSelected
-              deleted={deleted}
-              entityName={
-                currentVersionData.displayName ?? currentVersionData.name ?? ''
-              }
-              extraInfo={getExtraInfo()}
-              followersList={[]}
-              serviceType={currentVersionData.serviceType ?? ''}
-              tags={getTags()}
-              tier={{} as TagLabel}
-              titleLinks={slashedDashboardName}
-              version={Number(version)}
-              versionHandler={backHandler}
-            />
-            <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
-              <TabsPane activeTab={1} className="tw-flex-initial" tabs={tabs} />
-              <div className="tw-bg-white tw-flex-grow tw--mx-6 tw-px-7 tw-py-4">
-                <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
-                  <div className="tw-col-span-full">
-                    <Description
-                      isReadOnly
-                      description={getDashboardDescription()}
-                    />
+    <PageContainerV1>
+      <PageLayoutV1
+        pageTitle={t('label.entity-detail-plural', {
+          entity: getEntityName(currentVersionData),
+        })}>
+        <div data-testid="dashboard-version-container">
+          {isVersionLoading ? (
+            <Loader />
+          ) : (
+            <div
+              className={classNames('version-data')}
+              data-testid="version-data">
+              <EntityPageInfo
+                isVersionSelected
+                deleted={deleted}
+                entityName={
+                  currentVersionData.displayName ??
+                  currentVersionData.name ??
+                  ''
+                }
+                extraInfo={getExtraInfo()}
+                followersList={[]}
+                serviceType={currentVersionData.serviceType ?? ''}
+                tags={getTags()}
+                tier={{} as TagLabel}
+                titleLinks={slashedDashboardName}
+                version={Number(version)}
+                versionHandler={backHandler}
+              />
+              <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
+                <TabsPane
+                  activeTab={1}
+                  className="tw-flex-initial"
+                  tabs={tabs}
+                />
+                <Card className="m-y-md">
+                  <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
+                    <div className="tw-col-span-full">
+                      <Description
+                        isReadOnly
+                        description={getDashboardDescription()}
+                      />
+                    </div>
+                    <div className="m-y-md tw-col-span-full">
+                      <Table
+                        bordered
+                        columns={tableColumn}
+                        data-testid="schema-table"
+                        dataSource={(currentVersionData as Dashboard)?.charts}
+                        pagination={false}
+                        rowKey="id"
+                        size="small"
+                      />
+                    </div>
                   </div>
-                  <div className="m-y-md tw-col-span-full">
-                    <Table
-                      bordered
-                      columns={tableColumn}
-                      data-testid="schema-table"
-                      dataSource={(currentVersionData as Dashboard)?.charts}
-                      pagination={false}
-                      rowKey="id"
-                      size="small"
-                    />
-                  </div>
-                </div>
+                </Card>
               </div>
             </div>
-          </div>
-        )}
+          )}
 
-        <EntityVersionTimeLine
-          show
-          currentVersion={version}
-          versionHandler={versionHandler}
-          versionList={versionList}
-          onBack={backHandler}
-        />
-      </div>
-    </PageContainer>
+          <EntityVersionTimeLine
+            show
+            currentVersion={version}
+            versionHandler={versionHandler}
+            versionList={versionList}
+            onBack={backHandler}
+          />
+        </div>
+      </PageLayoutV1>
+    </PageContainerV1>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx
index cc2b01f1fa7..d3862f23b69 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx
@@ -12,7 +12,7 @@
  */
 
 import { findByTestId, findByText, render } from '@testing-library/react';
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import DashboardVersion from './DashboardVersion.component';
 import { DashboardVersionProp } from './DashboardVersion.interface';
@@ -65,6 +65,22 @@ jest.mock('../../utils/EntityVersionUtils', () => ({
   getTagsDiff: jest.fn(),
 }));
 
+jest.mock('components/containers/PageContainerV1', () => {
+  return jest
+    .fn()
+    .mockImplementation(({ children }: { children: ReactNode }) => (
+      <div data-testid="PageContainerV1">{children}</div>
+    ));
+});
+
+jest.mock('components/containers/PageLayoutV1', () => {
+  return jest
+    .fn()
+    .mockImplementation(({ children }: { children: ReactNode }) => (
+      <div data-testid="PageLayoutV1">{children}</div>
+    ));
+});
+
 JSON.parse = jest.fn().mockReturnValue([]);
 
 describe('Test DashboardVersion page', () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx
index ee6c2e9b652..5a8369dd766 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx
@@ -11,11 +11,12 @@
  *  limitations under the License.
  */
 
-import { Table, Typography } from 'antd';
+import { Card, Table, Typography } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
 import classNames from 'classnames';
 import RichTextEditorPreviewer from 'components/common/rich-text-editor/RichTextEditorPreviewer';
-import PageContainer from 'components/containers/PageContainer';
+import PageContainerV1 from 'components/containers/PageContainerV1';
+import PageLayoutV1 from 'components/containers/PageLayoutV1';
 import TagsViewer from 'components/Tag/TagsViewer/tags-viewer';
 import {
   ChangeDescription,
@@ -248,71 +249,78 @@ const DataModelVersion: FC<DataModelVersionProp> = ({
   );
 
   return (
-    <PageContainer>
-      <div
-        className={classNames(
-          'tw-px-6 tw-w-full tw-h-full tw-flex tw-flex-col tw-relative'
-        )}
-        data-testid="data-model-version-container">
-        {isVersionLoading ? (
-          <Loader />
-        ) : (
-          <div
-            className={classNames('version-data')}
-            data-testid="version-data">
-            <EntityPageInfo
-              isVersionSelected
-              deleted={deleted}
-              entityName={
-                currentVersionData.displayName ?? currentVersionData.name ?? ''
-              }
-              extraInfo={getExtraInfo()}
-              followersList={[]}
-              serviceType={currentVersionData.serviceType ?? ''}
-              tags={getTags()}
-              tier={{} as TagLabel}
-              titleLinks={slashedDataModelName}
-              version={Number(version)}
-              versionHandler={backHandler}
-            />
-            <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
-              <TabsPane activeTab={1} className="tw-flex-initial" tabs={tabs} />
-              <div className="tw-bg-white tw-flex-grow tw--mx-6 tw-px-7 tw-py-4">
-                <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
-                  <div className="tw-col-span-full">
-                    <Description
-                      isReadOnly
-                      description={getDashboardDescription()}
-                    />
+    <PageContainerV1>
+      <PageLayoutV1
+        pageTitle={t('label.entity-detail-plural', {
+          entity: getEntityName(currentVersionData),
+        })}>
+        <div data-testid="data-model-version-container">
+          {isVersionLoading ? (
+            <Loader />
+          ) : (
+            <div
+              className={classNames('version-data')}
+              data-testid="version-data">
+              <EntityPageInfo
+                isVersionSelected
+                deleted={deleted}
+                entityName={
+                  currentVersionData.displayName ??
+                  currentVersionData.name ??
+                  ''
+                }
+                extraInfo={getExtraInfo()}
+                followersList={[]}
+                serviceType={currentVersionData.serviceType ?? ''}
+                tags={getTags()}
+                tier={{} as TagLabel}
+                titleLinks={slashedDataModelName}
+                version={Number(version)}
+                versionHandler={backHandler}
+              />
+              <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
+                <TabsPane
+                  activeTab={1}
+                  className="tw-flex-initial"
+                  tabs={tabs}
+                />
+                <Card className="m-y-md">
+                  <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
+                    <div className="tw-col-span-full">
+                      <Description
+                        isReadOnly
+                        description={getDashboardDescription()}
+                      />
+                    </div>
+                    <div className="m-y-md tw-col-span-full">
+                      <Table
+                        bordered
+                        columns={tableColumn}
+                        data-testid="schema-table"
+                        dataSource={
+                          (currentVersionData as DashboardDataModel)?.columns
+                        }
+                        pagination={false}
+                        rowKey="id"
+                        size="small"
+                      />
+                    </div>
                   </div>
-                  <div className="m-y-md tw-col-span-full">
-                    <Table
-                      bordered
-                      columns={tableColumn}
-                      data-testid="schema-table"
-                      dataSource={
-                        (currentVersionData as DashboardDataModel)?.columns
-                      }
-                      pagination={false}
-                      rowKey="id"
-                      size="small"
-                    />
-                  </div>
-                </div>
+                </Card>
               </div>
             </div>
-          </div>
-        )}
+          )}
 
-        <EntityVersionTimeLine
-          show
-          currentVersion={version}
-          versionHandler={versionHandler}
-          versionList={versionList}
-          onBack={backHandler}
-        />
-      </div>
-    </PageContainer>
+          <EntityVersionTimeLine
+            show
+            currentVersion={version}
+            versionHandler={versionHandler}
+            versionList={versionList}
+            onBack={backHandler}
+          />
+        </div>
+      </PageLayoutV1>
+    </PageContainerV1>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
index ae1c1b228ee..e796b24a5d9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
@@ -796,12 +796,10 @@ const DatasetDetails: React.FC<DatasetDetailsProps> = ({
               </Card>
             )}
             {activeTab === 3 && (
-              <Card className="m-y-md h-full" id="sampleDataDetails">
-                <SampleDataTable
-                  isTableDeleted={tableDetails.deleted}
-                  tableId={tableDetails.id}
-                />
-              </Card>
+              <SampleDataTable
+                isTableDeleted={tableDetails.deleted}
+                tableId={tableDetails.id}
+              />
             )}
             {activeTab === 4 && (
               <TableQueries
@@ -835,19 +833,16 @@ const DatasetDetails: React.FC<DatasetDetailsProps> = ({
                 <DbtTab dataModel={dataModel} />
               )}
             {activeTab === 9 && (
-              <Card className="m-y-md h-full">
-                <CustomPropertyTable
-                  entityDetails={
-                    tableDetails as CustomPropertyProps['entityDetails']
-                  }
-                  entityType={EntityType.TABLE}
-                  handleExtensionUpdate={handleExtensionUpdate}
-                  hasEditAccess={
-                    tablePermissions.EditAll ||
-                    tablePermissions.EditCustomFields
-                  }
-                />
-              </Card>
+              <CustomPropertyTable
+                entityDetails={
+                  tableDetails as CustomPropertyProps['entityDetails']
+                }
+                entityType={EntityType.TABLE}
+                handleExtensionUpdate={handleExtensionUpdate}
+                hasEditAccess={
+                  tablePermissions.EditAll || tablePermissions.EditCustomFields
+                }
+              />
             )}
           </div>
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatasetVersion/DatasetVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatasetVersion/DatasetVersion.component.tsx
index 96eaf57f5eb..35ccbd54b4b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DatasetVersion/DatasetVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DatasetVersion/DatasetVersion.component.tsx
@@ -11,12 +11,15 @@
  *  limitations under the License.
  */
 
+import { Card } from 'antd';
 import classNames from 'classnames';
-import PageContainer from 'components/containers/PageContainer';
+import PageContainerV1 from 'components/containers/PageContainerV1';
+import PageLayoutV1 from 'components/containers/PageLayoutV1';
 import { cloneDeep, isEqual, isUndefined, toString } from 'lodash';
 import { ExtraInfo } from 'Models';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { getEntityName } from 'utils/EntityUtils';
 import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants';
 import { EntityField } from '../../constants/Feeds.constants';
 import { FqnPart } from '../../enums/entity.enum';
@@ -375,11 +378,11 @@ const DatasetVersion: React.FC<DatasetVersionProp> = ({
   }, [currentVersionData]);
 
   return (
-    <PageContainer>
-      <div
-        className={classNames(
-          'tw-px-6 tw-w-full tw-h-full tw-flex tw-flex-col tw-relative'
-        )}>
+    <PageContainerV1>
+      <PageLayoutV1
+        pageTitle={t('label.entity-detail-plural', {
+          entity: getEntityName(currentVersionData),
+        })}>
         {isVersionLoading ? (
           <Loader />
         ) : (
@@ -399,7 +402,7 @@ const DatasetVersion: React.FC<DatasetVersionProp> = ({
             />
             <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
               <TabsPane activeTab={1} className="tw-flex-initial" tabs={tabs} />
-              <div className="tw-bg-white tw-flex-grow tw--mx-6 tw-px-7 tw-py-4">
+              <Card className="m-y-md">
                 <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
                   <div className="tw-col-span-full">
                     <Description
@@ -422,7 +425,7 @@ const DatasetVersion: React.FC<DatasetVersionProp> = ({
                     />
                   </div>
                 </div>
-              </div>
+              </Card>
             </div>
           </div>
         )}
@@ -434,8 +437,8 @@ const DatasetVersion: React.FC<DatasetVersionProp> = ({
           versionList={versionList}
           onBack={backHandler}
         />
-      </div>
-    </PageContainer>
+      </PageLayoutV1>
+    </PageContainerV1>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
index d3976cd05a7..9607fd96c88 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
@@ -439,7 +439,7 @@ const EntityTable = ({
                   {hasDescriptionEditAccess && (
                     <>
                       <Button
-                        className="p-0 tw-self-start flex-center w-7 h-7 focus:tw-outline-none tw-flex-none hover-cell-icon"
+                        className="p-0 tw-self-start flex-center w-7 h-7 text-primary tw-flex-none hover-cell-icon"
                         type="text"
                         onClick={() => handleUpdate(record, index)}>
                         <IconEdit
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
index a513bb97d17..73b2d28c1a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
@@ -661,19 +661,18 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
             </Card>
           )}
           {activeTab === 5 && (
-            <Card className={ENTITY_CARD_CLASS}>
-              <CustomPropertyTable
-                entityDetails={
-                  mlModelDetail as CustomPropertyProps['entityDetails']
-                }
-                entityType={EntityType.MLMODEL}
-                handleExtensionUpdate={onExtensionUpdate}
-                hasEditAccess={
-                  mlModelPermissions.EditAll ||
-                  mlModelPermissions.EditCustomFields
-                }
-              />
-            </Card>
+            <CustomPropertyTable
+              className="mt-0-important"
+              entityDetails={
+                mlModelDetail as CustomPropertyProps['entityDetails']
+              }
+              entityType={EntityType.MLMODEL}
+              handleExtensionUpdate={onExtensionUpdate}
+              hasEditAccess={
+                mlModelPermissions.EditAll ||
+                mlModelPermissions.EditCustomFields
+              }
+            />
           )}
           <div
             data-testid="observer-element"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx
index 6d434a3d687..3d2cb25ea6e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx
@@ -15,6 +15,8 @@ import { Card, Col, Divider, Row, Space, Typography } from 'antd';
 import classNames from 'classnames';
 import ErrorPlaceHolder from 'components/common/error-with-placeholder/ErrorPlaceHolder';
 import RichTextEditorPreviewer from 'components/common/rich-text-editor/RichTextEditorPreviewer';
+import PageContainerV1 from 'components/containers/PageContainerV1';
+import PageLayoutV1 from 'components/containers/PageLayoutV1';
 import SourceList from 'components/MlModelDetail/SourceList.component';
 import TagsContainer from 'components/Tag/TagsContainer/tags-container';
 import { MlFeature, Mlmodel } from 'generated/entity/data/mlmodel';
@@ -22,6 +24,7 @@ import { isUndefined } from 'lodash';
 import { ExtraInfo } from 'Models';
 import React, { FC, Fragment, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { getEntityName } from 'utils/EntityUtils';
 import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants';
 import { EntityField } from '../../constants/Feeds.constants';
 import { OwnerType } from '../../enums/user.enum';
@@ -37,7 +40,6 @@ import { TagLabelWithStatus } from '../../utils/EntityVersionUtils.interface';
 import Description from '../common/description/Description';
 import EntityPageInfo from '../common/entityPageInfo/EntityPageInfo';
 import TabsPane from '../common/TabsPane/TabsPane';
-import PageContainer from '../containers/PageContainer';
 import EntityVersionTimeLine from '../EntityVersionTimeLine/EntityVersionTimeLine';
 import Loader from '../Loader/Loader';
 import { MlModelVersionProp } from './MlModelVersion.interface';
@@ -255,10 +257,11 @@ const MlModelVersion: FC<MlModelVersionProp> = ({
   }, [currentVersionData]);
 
   return (
-    <PageContainer>
-      <div
-        className={classNames('p-x-lg w-full h-full d-flex flex-col relative')}
-        data-testid="dashboard-version-container">
+    <PageContainerV1>
+      <PageLayoutV1
+        pageTitle={t('label.entity-detail-plural', {
+          entity: getEntityName(currentVersionData),
+        })}>
         {isVersionLoading ? (
           <Loader />
         ) : (
@@ -282,7 +285,7 @@ const MlModelVersion: FC<MlModelVersionProp> = ({
             />
             <div className="m-t-xss">
               <TabsPane activeTab={1} tabs={tabs} />
-              <div className="bg-white m--x-6 p-x-lg p-y-md">
+              <Card className="m-y-md">
                 <Description
                   isReadOnly
                   description={getDashboardDescription()}
@@ -397,7 +400,7 @@ const MlModelVersion: FC<MlModelVersionProp> = ({
                     <ErrorPlaceHolder />
                   )}
                 </div>
-              </div>
+              </Card>
             </div>
           </div>
         )}
@@ -409,8 +412,8 @@ const MlModelVersion: FC<MlModelVersionProp> = ({
           versionList={versionList}
           onBack={backHandler}
         />
-      </div>
-    </PageContainer>
+      </PageLayoutV1>
+    </PageContainerV1>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
index f48cc8bfab4..bc7c627b0d2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
@@ -964,19 +964,18 @@ const PipelineDetails = ({
                 {t('label.custom-property-plural')}
               </span>
             }>
-            <Card className="h-full">
-              <CustomPropertyTable
-                entityDetails={
-                  pipelineDetails as CustomPropertyProps['entityDetails']
-                }
-                entityType={EntityType.PIPELINE}
-                handleExtensionUpdate={onExtensionUpdate}
-                hasEditAccess={
-                  pipelinePermissions.EditAll ||
-                  pipelinePermissions.EditCustomFields
-                }
-              />
-            </Card>
+            <CustomPropertyTable
+              className="mt-0-important"
+              entityDetails={
+                pipelineDetails as CustomPropertyProps['entityDetails']
+              }
+              entityType={EntityType.PIPELINE}
+              handleExtensionUpdate={onExtensionUpdate}
+              hasEditAccess={
+                pipelinePermissions.EditAll ||
+                pipelinePermissions.EditCustomFields
+              }
+            />
           </Tabs.TabPane>
           <Tabs.TabPane key="*" tab="">
             <Redirect to={ROUTES.NOT_FOUND} />
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx
index 1679ced3256..09e745baaa0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx
@@ -12,7 +12,7 @@
  */
 
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
-import { Space, Typography } from 'antd';
+import { Card, Space, Typography } from 'antd';
 import { AxiosError } from 'axios';
 import classNames from 'classnames';
 import { ROUTES } from 'constants/constants';
@@ -150,29 +150,29 @@ const SampleDataTable: FunctionComponent<Props> = ({
     return <Loader />;
   }
 
-  return (
-    <div
-      className="tw-relative tw-flex tw-justify-between"
-      data-testid="sample-data"
-      onScrollCapture={() => {
-        setScrollOffSet(tableRef.current?.scrollLeft ?? 0);
-      }}>
-      {scrollHandle.left ? (
-        <button
-          className="tw-border tw-border-main tw-fixed tw-left-7 tw-top-2/3 tw-rounded-full tw-shadow-md tw-z-50 tw-bg-body-main tw-w-8 tw-h-8"
-          onClick={() => scrollHandler(-50)}>
-          <LeftOutlined className="tw-text-grey-muted" />
-        </button>
-      ) : null}
-      {scrollHandle.right ? (
-        <button
-          className="tw-border tw-border-main tw-fixed tw-right-7 tw-top-2/3 tw-rounded-full tw-shadow-md tw-z-50 tw-bg-body-main tw-w-8 tw-h-8"
-          onClick={() => scrollHandler(50)}>
-          <RightOutlined className="tw-text-grey-muted" />
-        </button>
-      ) : null}
+  return sampleData?.rows?.length && sampleData?.columns?.length ? (
+    <Card className="m-y-md h-full" id="sampleDataDetails">
+      <div
+        className="tw-relative tw-flex tw-justify-between"
+        data-testid="sample-data"
+        onScrollCapture={() => {
+          setScrollOffSet(tableRef.current?.scrollLeft ?? 0);
+        }}>
+        {scrollHandle.left ? (
+          <button
+            className="tw-border tw-border-main tw-fixed tw-left-7 tw-top-2/3 tw-rounded-full tw-shadow-md tw-z-50 tw-bg-body-main tw-w-8 tw-h-8"
+            onClick={() => scrollHandler(-50)}>
+            <LeftOutlined className="tw-text-grey-muted" />
+          </button>
+        ) : null}
+        {scrollHandle.right ? (
+          <button
+            className="tw-border tw-border-main tw-fixed tw-right-7 tw-top-2/3 tw-rounded-full tw-shadow-md tw-z-50 tw-bg-body-main tw-w-8 tw-h-8"
+            onClick={() => scrollHandler(50)}>
+            <RightOutlined className="tw-text-grey-muted" />
+          </button>
+        ) : null}
 
-      {sampleData?.rows?.length && sampleData?.columns?.length ? (
         <div
           className="tw-table-responsive tw-overflow-x-auto tw-table-container"
           ref={tableRef}>
@@ -224,27 +224,27 @@ const SampleDataTable: FunctionComponent<Props> = ({
             </tbody>
           </table>
         </div>
-      ) : (
-        <ErrorPlaceHolder>
-          <Typography.Paragraph>
-            <Transi18next
-              i18nKey="message.view-sample-data-entity"
-              renderElement={
-                <a
-                  href={WORKFLOWS_PROFILER_DOCS}
-                  rel="noreferrer"
-                  style={{ color: '#1890ff' }}
-                  target="_blank"
-                />
-              }
-              values={{
-                entity: t('label.profiler-ingestion'),
-              }}
+      </div>
+    </Card>
+  ) : (
+    <ErrorPlaceHolder>
+      <Typography.Paragraph>
+        <Transi18next
+          i18nKey="message.view-sample-data-entity"
+          renderElement={
+            <a
+              href={WORKFLOWS_PROFILER_DOCS}
+              rel="noreferrer"
+              style={{ color: '#1890ff' }}
+              target="_blank"
             />
-          </Typography.Paragraph>
-        </ErrorPlaceHolder>
-      )}
-    </div>
+          }
+          values={{
+            entity: t('label.profiler-ingestion'),
+          }}
+        />
+      </Typography.Paragraph>
+    </ErrorPlaceHolder>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx
index a26d6ea02f9..e92e63f5d5b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx
@@ -160,7 +160,7 @@ const TableTags = ({
           <div className="tw-mt-1 d-flex items-center">
             {tags[type].length && hasTagEditAccess ? (
               <Button
-                className="p-0 w-7 h-7 flex-center link-text focus:tw-outline-none hover-cell-icon"
+                className="p-0 w-7 h-7 flex-center text-primary hover-cell-icon"
                 data-testid="edit-button"
                 icon={
                   <IconEdit height={16} name={t('label.edit')} width={16} />
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainer/tags-container.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainer/tags-container.tsx
index 96e18d3cbb9..b8393e498d1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainer/tags-container.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainer/tags-container.tsx
@@ -203,7 +203,7 @@ const TagsContainer: FunctionComponent<TagsContainerProps> = ({
 
           {tags.length && showEditTagButton ? (
             <Button
-              className="p-0 flex-center"
+              className="p-0 flex-center text-primary"
               data-testid="edit-button"
               icon={
                 <IconEdit
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx
index 34a14819164..7899887a9e2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx
@@ -554,11 +554,7 @@ const TopicDetails: React.FC<TopicDetailsProps> = ({
               {loader}
             </Card>
           )}
-          {activeTab === 3 && (
-            <Card className={ENTITY_CARD_CLASS} data-testid="sample-data">
-              <SampleDataTopic topicFQN={topicFQN} />
-            </Card>
-          )}
+          {activeTab === 3 && <SampleDataTopic topicFQN={topicFQN} />}
           {activeTab === 4 && (
             <Card
               className={ENTITY_CARD_CLASS + ' h-full'}
@@ -583,18 +579,17 @@ const TopicDetails: React.FC<TopicDetailsProps> = ({
             </Card>
           )}
           {activeTab === 6 && (
-            <Card className={ENTITY_CARD_CLASS}>
-              <CustomPropertyTable
-                entityDetails={
-                  topicDetails as CustomPropertyProps['entityDetails']
-                }
-                entityType={EntityType.TOPIC}
-                handleExtensionUpdate={onExtensionUpdate}
-                hasEditAccess={
-                  topicPermissions.EditAll || topicPermissions.EditCustomFields
-                }
-              />
-            </Card>
+            <CustomPropertyTable
+              className="mt-0-important"
+              entityDetails={
+                topicDetails as CustomPropertyProps['entityDetails']
+              }
+              entityType={EntityType.TOPIC}
+              handleExtensionUpdate={onExtensionUpdate}
+              hasEditAccess={
+                topicPermissions.EditAll || topicPermissions.EditCustomFields
+              }
+            />
           )}
           <div
             data-testid="observer-element"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx
index 6f0f3b83074..d2dd0c7658c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx
@@ -225,7 +225,7 @@ describe('Test TopicDetails component', () => {
         wrapper: MemoryRouter,
       }
     );
-    const sampleData = await findByTestId(container, 'sample-data');
+    const sampleData = await findByText(container, 'SampleDataTopic');
 
     expect(sampleData).toBeInTheDocument();
   });
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx
index 2cd72d4e740..879b5b8798c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx
@@ -11,12 +11,15 @@
  *  limitations under the License.
  */
 
+import { Card } from 'antd';
 import classNames from 'classnames';
-import PageContainer from 'components/containers/PageContainer';
+import PageContainerV1 from 'components/containers/PageContainerV1';
+import PageLayoutV1 from 'components/containers/PageLayoutV1';
 import { isUndefined } from 'lodash';
 import { ExtraInfo } from 'Models';
 import React, { FC, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { getEntityName } from 'utils/EntityUtils';
 import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants';
 import { EntityField } from '../../constants/Feeds.constants';
 import { OwnerType } from '../../enums/user.enum';
@@ -258,11 +261,11 @@ const TopicVersion: FC<TopicVersionProp> = ({
   }, [currentVersionData]);
 
   return (
-    <PageContainer>
-      <div
-        className={classNames(
-          'tw-px-6 tw-w-full tw-h-full tw-flex tw-flex-col tw-relative'
-        )}>
+    <PageContainerV1>
+      <PageLayoutV1
+        pageTitle={t('label.entity-detail-plural', {
+          entity: getEntityName(currentVersionData),
+        })}>
         {isVersionLoading ? (
           <Loader />
         ) : (
@@ -282,7 +285,7 @@ const TopicVersion: FC<TopicVersionProp> = ({
             />
             <div className="tw-mt-1 tw-flex tw-flex-col tw-flex-grow ">
               <TabsPane activeTab={1} className="tw-flex-initial" tabs={tabs} />
-              <div className="tw-bg-white tw-flex-grow tw--mx-6 tw-px-7 tw-py-4">
+              <Card className="m-y-md">
                 <div className="tw-grid tw-grid-cols-4 tw-gap-4 tw-w-full">
                   <div className="tw-col-span-full">
                     <Description
@@ -310,7 +313,7 @@ const TopicVersion: FC<TopicVersionProp> = ({
                     </div>
                   </div>
                 </div>
-              </div>
+              </Card>
             </div>
           </div>
         )}
@@ -322,8 +325,8 @@ const TopicVersion: FC<TopicVersionProp> = ({
           versionList={versionList}
           onBack={backHandler}
         />
-      </div>
-    </PageContainer>
+      </PageLayoutV1>
+    </PageContainerV1>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx
index 82bf7b080ac..9a294774b1e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx
@@ -12,6 +12,7 @@
  */
 
 import { Col, Row, Table } from 'antd';
+import FilterTablePlaceHolder from 'components/common/error-with-placeholder/FilterTablePlaceHolder';
 import { NO_DATA_PLACEHOLDER } from 'constants/constants';
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -140,6 +141,7 @@ const VersionTable = ({ columnName, columns, joins }: VersionTableProps) => {
       </Col>
       <Col>
         <Table
+          bordered
           columns={versionTableColumns}
           data-testid="entity-table"
           dataSource={data}
@@ -147,6 +149,9 @@ const VersionTable = ({ columnName, columns, joins }: VersionTableProps) => {
             ...getTableExpandableConfig<Column>(),
             defaultExpandedRowKeys: [],
           }}
+          locale={{
+            emptyText: <FilterTablePlaceHolder />,
+          }}
           pagination={false}
           rowKey="name"
           scroll={{ x: 1200 }}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.interface.ts
index c0dd362d30b..fff94b3abfd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.interface.ts
@@ -31,4 +31,5 @@ export interface CustomPropertyProps {
   entityType: EntityType;
   handleExtensionUpdate: (updatedTable: EntityDetails) => Promise<void>;
   hasEditAccess: boolean;
+  className?: string;
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
index 26bf3daa2db..5a0838c400f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { Table, Typography } from 'antd';
+import { Card, Table, Typography } from 'antd';
 import { ColumnsType } from 'antd/lib/table';
 import { AxiosError } from 'axios';
 import Loader from 'components/Loader/Loader';
@@ -31,6 +31,7 @@ export const CustomPropertyTable: FC<CustomPropertyProps> = ({
   handleExtensionUpdate,
   entityType,
   hasEditAccess,
+  className,
 }) => {
   const { t } = useTranslation();
   const [entityTypeDetail, setEntityTypeDetail] = useState<Type>({} as Type);
@@ -97,7 +98,7 @@ export const CustomPropertyTable: FC<CustomPropertyProps> = ({
   return (
     <>
       {isEmpty(entityTypeDetail.customProperties) ? (
-        <ErrorPlaceHolder>
+        <ErrorPlaceHolder className={className}>
           <Typography.Paragraph>
             {t('message.adding-new-entity-is-easy-just-give-it-a-spin', {
               entity: t('label.custom-property-plural'),
@@ -105,15 +106,17 @@ export const CustomPropertyTable: FC<CustomPropertyProps> = ({
           </Typography.Paragraph>
         </ErrorPlaceHolder>
       ) : (
-        <Table
-          bordered
-          columns={tableColumn}
-          data-testid="custom-properties-table"
-          dataSource={entityTypeDetail.customProperties || []}
-          pagination={false}
-          rowKey="name"
-          size="small"
-        />
+        <Card className="m-y-md h-full">
+          <Table
+            bordered
+            columns={tableColumn}
+            data-testid="custom-properties-table"
+            dataSource={entityTypeDetail.customProperties || []}
+            pagination={false}
+            rowKey="name"
+            size="small"
+          />
+        </Card>
       )}
     </>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx
index 283d62e7cd6..661b023ed8a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx
@@ -181,7 +181,7 @@ const Description: FC<DescriptionProps> = ({
       <Space align="end" size={0}>
         {hasEditAccess && (
           <Button
-            className="w-7 h-7 p-0 flex-center"
+            className="w-7 h-7 p-0 flex-center text-primary"
             data-testid="edit-description"
             icon={<IconEdit height={16} width={16} />}
             type="text"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx
index ab7208a0062..1fad66b1f25 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx
@@ -464,7 +464,7 @@ const EntityPageInfo = ({
           <Row align="middle" data-testid="entity-tags" gutter={8}>
             {!deleted && (
               <>
-                <Col>
+                <Col className="p-0">
                   <Space
                     align="center"
                     className="w-full h-full"
diff --git a/openmetadata-ui/src/main/resources/ui/src/enums/common.enum.ts b/openmetadata-ui/src/main/resources/ui/src/enums/common.enum.ts
index 723fef67f5f..7c519d26703 100644
--- a/openmetadata-ui/src/main/resources/ui/src/enums/common.enum.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/enums/common.enum.ts
@@ -18,7 +18,7 @@ export enum ADMIN_ONLY_ACCESSIBLE_SECTION {
 
 export enum SIZE {
   SMALL = '60',
-  MEDIUM = '80',
+  MEDIUM = '86',
   LARGE = '126',
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx
index e5fdee6318c..eb496d5eb8b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx
@@ -743,16 +743,15 @@ const ContainerPage = () => {
                 {t('label.custom-property-plural')}
               </span>
             }>
-            <Card className="h-full">
-              <CustomPropertyTable
-                entityDetails={
-                  containerData as CustomPropertyProps['entityDetails']
-                }
-                entityType={EntityType.CONTAINER}
-                handleExtensionUpdate={handleExtensionUpdate}
-                hasEditAccess={hasEditCustomFieldsPermission}
-              />
-            </Card>
+            <CustomPropertyTable
+              className="mt-0-important"
+              entityDetails={
+                containerData as CustomPropertyProps['entityDetails']
+              }
+              entityType={EntityType.CONTAINER}
+              handleExtensionUpdate={handleExtensionUpdate}
+              hasEditAccess={hasEditCustomFieldsPermission}
+            />
           </Tabs.TabPane>
         </Tabs>
       </div>
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 30b3657dacb..9cb00467463 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
@@ -61,6 +61,9 @@
 // text color
 .text-primary {
   color: @primary;
+  &:hover {
+    color: @primary;
+  }
 }
 .error-text {
   color: #ff4c3b;
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less b/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less
index da58c2f73e3..dd2262b46e2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less
@@ -322,6 +322,10 @@
   padding-left: 0px;
 }
 
+.pt-8 {
+  padding-top: 2rem;
+}
+
 .padding-r-l-l {
   padding: 0 @padding-lg;
 }