diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
index 1e89515c5e7..e87508053f0 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
@@ -1008,6 +1008,14 @@ export const checkForEditActions = async ({
       continue;
     }
 
+    if (elementSelector === '[data-testid="entity-follow-button"]') {
+      deleted
+        ? await expect(page.locator(elementSelector)).not.toBeVisible()
+        : await expect(page.locator(elementSelector)).toBeVisible();
+
+      continue;
+    }
+
     const isDisabled = await page
       .locator(`${containerSelector} ${elementSelector}`)
       .isEnabled();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts
index e3ca0a875e6..0131441b439 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts
@@ -27,7 +27,7 @@ export const updateMetricType = async (page: Page, metric: string) => {
 
   // verify the metric type is updated
   await expect(
-    page.getByText(`Metric Type: ${metric.toUpperCase()}`)
+    page.getByText(`Metric Type ${metric.toUpperCase()}`)
   ).toBeVisible();
 };
 
@@ -60,7 +60,7 @@ export const updateUnitOfMeasurement = async (
 
   // verify the unit of measurement is updated
   await expect(
-    page.getByText(`Unit of Measurement: ${unitOfMeasurement.toUpperCase()}`)
+    page.getByText(`Unit of Measurement ${unitOfMeasurement.toUpperCase()}`)
   ).toBeVisible();
 };
 
@@ -88,7 +88,7 @@ export const updateGranularity = async (page: Page, granularity: string) => {
 
   // verify the granularity is updated
   await expect(
-    page.getByText(`Granularity: ${granularity.toUpperCase()}`)
+    page.getByText(`Granularity ${granularity.toUpperCase()}`)
   ).toBeVisible();
 };
 
@@ -260,20 +260,20 @@ export const addMetric = async (page: Page) => {
 
   // verify the metric type is updated
   await expect(
-    page.getByText(`Metric Type: ${metricData.metricType.toUpperCase()}`)
+    page.getByText(`Metric Type ${metricData.metricType.toUpperCase()}`)
   ).toBeVisible();
 
   // verify the unit of measurement is updated
 
   await expect(
     page.getByText(
-      `Unit of Measurement: ${metricData.unitOfMeasurement.toUpperCase()}`
+      `Unit of Measurement ${metricData.unitOfMeasurement.toUpperCase()}`
     )
   ).toBeVisible();
 
   // verify the granularity is updated
   await expect(
-    page.getByText(`Granularity: ${metricData.granularity.toUpperCase()}`)
+    page.getByText(`Granularity ${metricData.granularity.toUpperCase()}`)
   ).toBeVisible();
 
   // clean the created metric
diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/edit-new.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/edit-new.svg
index afcbb4e114c..d93d16a4b1b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/edit-new.svg
+++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/edit-new.svg
@@ -1,3 +1,3 @@
-<svg  viewBox="0 0 12 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.68216 0.398212C7.14369 0.136812 7.69023 0.0694717 8.20143 0.210998C8.42809 0.273752 8.62176 0.383072 8.80429 0.506545C8.97769 0.623812 9.17656 0.779065 9.40709 0.959005L9.44069 0.985258C9.67123 1.1652 9.87016 1.32045 10.026 1.46019C10.1901 1.60732 10.3432 1.76866 10.4591 1.97331C10.7205 2.43486 10.7878 2.98135 10.6463 3.49255C10.5836 3.71921 10.4742 3.9129 10.3508 4.09546C10.2335 4.26885 10.0782 4.46776 9.89823 4.69828L5.16309 10.7645C5.15109 10.7798 5.13929 10.7949 5.12763 10.8099C4.90536 11.0949 4.73729 11.3104 4.52923 11.4874C4.35313 11.6372 4.1583 11.7635 3.94964 11.863C3.70313 11.9806 3.43778 12.046 3.08679 12.1325C3.06839 12.1371 3.04975 12.1417 3.03087 12.1463L1.61432 12.496C1.51622 12.5203 1.40424 12.548 1.30546 12.5631C1.19534 12.5801 1.02482 12.5954 0.836488 12.5351C0.610088 12.4626 0.416914 12.3118 0.291621 12.1098C0.187394 11.9417 0.160874 11.7726 0.150561 11.6617C0.141308 11.5621 0.140981 11.4468 0.140694 11.3457C0.140674 11.3395 0.140661 11.3333 0.140641 11.3271L0.136061 9.88668C0.135994 9.86721 0.135928 9.84801 0.135861 9.82908C0.134561 9.46761 0.133581 9.19428 0.187828 8.92661C0.233748 8.70001 0.308934 8.48035 0.411501 8.27321C0.532674 8.02841 0.700921 7.81308 0.923468 7.52821C0.935134 7.51328 0.946954 7.49815 0.958928 7.48281L5.69409 1.41658C5.87403 1.18605 6.02929 0.987138 6.16903 0.831278C6.31616 0.667178 6.47749 0.514112 6.68216 0.398212ZM7.84563 1.49599C7.67523 1.44882 7.49309 1.47127 7.33923 1.5584C7.31309 1.5732 7.26349 1.60791 7.16183 1.72135C7.05609 1.83925 6.92876 2.00175 6.73203 2.2538L8.8341 3.89464C9.03089 3.6426 9.15756 3.47965 9.24629 3.34848C9.33169 3.22229 9.35329 3.16573 9.36129 3.13679C9.40849 2.96639 9.38603 2.78423 9.29889 2.63038C9.28409 2.60425 9.24936 2.55465 9.13596 2.45294C9.01803 2.34723 8.85556 2.21993 8.60349 2.02319C8.35143 1.82644 8.18849 1.69971 8.05736 1.61099C7.93116 1.52564 7.87456 1.50401 7.84563 1.49599ZM8.01369 4.94568L5.91163 3.30484L2.00997 8.30321C1.73679 8.65315 1.65976 8.75701 1.60643 8.86475C1.55515 8.96835 1.51755 9.07815 1.4946 9.19141C1.47073 9.30921 1.46797 9.43848 1.46939 9.88241L1.47344 11.1575L2.71129 10.8519C3.1423 10.7455 3.26702 10.7114 3.3755 10.6596C3.47983 10.6099 3.57725 10.5467 3.6653 10.4718C3.75685 10.3939 3.83887 10.294 4.11204 9.94408L8.01369 4.94568ZM5.89956 12.0003C5.89956 11.6321 6.19803 11.3337 6.56623 11.3337H11.2329C11.6011 11.3337 11.8996 11.6321 11.8996 12.0003C11.8996 12.3685 11.6011 12.667 11.2329 12.667H6.56623C6.19803 12.667 5.89956 12.3685 5.89956 12.0003Z" fill="#535862"/>
-</svg>
+<svg  viewBox="0 0 13 13" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M7.38078 0.398273C7.84232 0.136873 8.38885 0.0695327 8.90005 0.211059C9.12672 0.273813 9.32038 0.383133 9.50292 0.506606C9.67632 0.623873 9.87518 0.779126 10.1057 0.959066L10.1393 0.985319C10.3699 1.16526 10.5688 1.32051 10.7247 1.46025C10.8887 1.60738 11.0418 1.76873 11.1577 1.97337C11.4191 2.43492 11.4865 2.98141 11.3449 3.49261C11.2822 3.71927 11.1729 3.91296 11.0494 4.09552C10.9321 4.26891 10.7769 4.46782 10.5969 4.69834L5.86172 10.7645C5.84972 10.7799 5.83792 10.795 5.82625 10.81C5.60398 11.095 5.43592 11.3105 5.22785 11.4875C5.05176 11.6373 4.85692 11.7635 4.64826 11.8631C4.40175 11.9807 4.1364 12.0461 3.78541 12.1326C3.76701 12.1371 3.74837 12.1417 3.72949 12.1464L2.31294 12.4961C2.21484 12.5203 2.10286 12.5481 2.00408 12.5632C1.89396 12.5801 1.72344 12.5955 1.53511 12.5352C1.30871 12.4627 1.11554 12.3119 0.990245 12.1099C0.886018 11.9418 0.859498 11.7727 0.849185 11.6617C0.839931 11.5622 0.839605 11.4469 0.839318 11.3458C0.839298 11.3395 0.839285 11.3333 0.839265 11.3272L0.834685 9.88674C0.834618 9.86727 0.834551 9.84807 0.834485 9.82914C0.833185 9.46767 0.832205 9.19434 0.886451 8.92667C0.932371 8.70007 1.00756 8.48041 1.11012 8.27327C1.2313 8.02847 1.39954 7.81314 1.62209 7.52827C1.63376 7.51334 1.64558 7.49821 1.65755 7.48287L6.39272 1.41664C6.57265 1.18611 6.72792 0.987199 6.86765 0.831339C7.01478 0.667239 7.17612 0.514173 7.38078 0.398273ZM8.54425 1.49605C8.37385 1.44888 8.19172 1.47133 8.03785 1.55846C8.01172 1.57326 7.96212 1.60797 7.86045 1.72141C7.75472 1.83931 7.62738 2.00181 7.43065 2.25386L9.53272 3.89471C9.72952 3.64266 9.85618 3.47971 9.94492 3.34855C10.0303 3.22235 10.0519 3.16579 10.0599 3.13685C10.1071 2.96645 10.0847 2.78429 9.99752 2.63044C9.98272 2.60431 9.94799 2.55471 9.83459 2.45301C9.71665 2.34729 9.55418 2.21999 9.30212 2.02325C9.05005 1.8265 8.88712 1.69977 8.75598 1.61105C8.62979 1.5257 8.57318 1.50407 8.54425 1.49605ZM8.71232 4.94574L6.61025 3.3049L2.70859 8.30327C2.43542 8.65321 2.35838 8.75707 2.30506 8.86481C2.25378 8.96841 2.21618 9.07821 2.19322 9.19147C2.16935 9.30927 2.1666 9.43854 2.16801 9.88247L2.17206 11.1575L3.40992 10.8519C3.84092 10.7455 3.96564 10.7115 4.07412 10.6597C4.17846 10.6099 4.27587 10.5468 4.36392 10.4719C4.45547 10.394 4.5375 10.2941 4.81066 9.94414L8.71232 4.94574ZM6.59818 12.0004C6.59818 11.6322 6.89665 11.3337 7.26485 11.3337H11.9315C12.2997 11.3337 12.5982 11.6322 12.5982 12.0004C12.5982 12.3686 12.2997 12.6671 11.9315 12.6671H7.26485C6.89665 12.6671 6.59818 12.3686 6.59818 12.0004Z" fill="#535862"/>
+ </svg>
\ No newline at end of file
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 42e094f0514..e58f3f557f4 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
@@ -121,7 +121,7 @@ export const ExtraInfoLabel = ({
         className="whitespace-nowrap text-sm d-flex flex-col gap-2"
         data-testid={dataTestId}>
         {!isEmpty(label) && (
-          <span className="extra-info-label-heading">{`${label}: `}</span>
+          <span className="extra-info-label-heading">{label}</span>
         )}
         <span
           className={classNames('font-medium extra-info-value', {
@@ -152,7 +152,7 @@ export const ExtraInfoLink = ({
       'w-48': ellipsis,
     })}>
     {!isEmpty(label) && (
-      <span className="extra-info-label-heading  m-r-xss">{`${label}: `}</span>
+      <span className="extra-info-label-heading  m-r-xss">{label}</span>
     )}
     <div className="d-flex items-center gap-1">
       <Tooltip title={value}>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx
index 7cc0d218b0e..366f212cee3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx
@@ -99,24 +99,26 @@ const EntityHeaderTitle = ({
         <div
           className="d-flex gap-3 items-center"
           data-testid="entity-header-title">
-          <Typography.Text
-            className={classNames(
-              'entity-header-display-name',
-              displayNameClassName,
-              'm-b-0 subheading text-md font-medium'
-            )}
-            data-testid="entity-header-display-name"
-            ellipsis={{ tooltip: true }}
-            style={{ color: color ?? TEXT_COLOR }}>
-            {stringToHTML(displayName || name)}
-            {openEntityInNewPage && (
-              <IconExternalLink
-                className="anticon vertical-baseline m-l-xss"
-                height={14}
-                width={14}
-              />
-            )}
-          </Typography.Text>
+          <Tooltip placement="bottom" title={stringToHTML(displayName || name)}>
+            <Typography.Text
+              className={classNames(
+                'entity-header-display-name',
+                displayNameClassName,
+                'm-b-0 text-md font-medium'
+              )}
+              data-testid="entity-header-display-name"
+              ellipsis={{ tooltip: true }}
+              style={{ color: color ?? TEXT_COLOR }}>
+              {stringToHTML(displayName || name)}
+              {openEntityInNewPage && (
+                <IconExternalLink
+                  className="anticon vertical-baseline m-l-xss"
+                  height={14}
+                  width={14}
+                />
+              )}
+            </Typography.Text>
+          </Tooltip>
 
           <Tooltip
             placement="topRight"
@@ -127,7 +129,7 @@ const EntityHeaderTitle = ({
               onClick={handleShareButtonClick}
             />
           </Tooltip>
-          {!excludeEntityService && !isCustomizedView && handleFollowingClick && (
+          {!excludeEntityService && !deleted && !isCustomizedView && handleFollowingClick && (
             <Tooltip
               title={t('label.field-entity', {
                 field: t(`label.${isFollowing ? 'un-follow' : 'follow'}`),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/entity-header-title.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/entity-header-title.less
index 387d098f511..d0e37a125b6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/entity-header-title.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/entity-header-title.less
@@ -26,11 +26,6 @@
   }
 }
 
-.ant-typography.subheading {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
 .ant-btn.entity-follow-button {
   border-radius: 16px;
   background-color: @primary-button-background;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
index 81ba3095db3..52fb42a081b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
@@ -174,7 +174,7 @@ const TagsV1 = ({
         className="tag-chip tag-chip-add-button"
         icon={<PlusIcon height={16} name="plus" width={16} />}>
         <Typography.Paragraph
-          className="m-0 text-sm font-medium text-primary"
+          className="m-0 text-xs font-medium text-primary"
           data-testid="add-tag">
           {getTagDisplay(tagName)}
         </Typography.Paragraph>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/tagsV1.less b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/tagsV1.less
index 08f90ad879c..5c3084e3023 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/tagsV1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/tagsV1.less
@@ -16,7 +16,7 @@
 .ant-tag.tag-chip {
   max-width: 100%;
   display: flex;
-  gap: 8px;
+  gap: 4px;
   align-items: center;
   font-size: 12px;
   font-weight: 500;
@@ -67,9 +67,3 @@
   font-weight: 500;
   color: inherit;
 }
-.ant-tag.tag-chip.tag-chip-content {
-  background-color: @background-secondary;
-  border: 1px solid @border-secondary;
-  width: 100%;
-  height: 24px;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx
index dd888e54c8e..3c09d298f5c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx
@@ -205,7 +205,7 @@ export const DomainLabel = ({
       <div className="d-flex   flex-col gap-2 justify-center">
         {headerLayout && (
           <div
-            className="d-flex text-sm font-medium items-center "
+            className="d-flex text-sm gap-1 font-medium items-center "
             data-testid="header-domain-container">
             <Typography.Text className="domain-link right-panel-label m-r-xss">
               {t('label.domain')}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainSelectableList/DomainSelectableList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainSelectableList/DomainSelectableList.component.tsx
index 796ba82fbb9..22f3a693fc5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainSelectableList/DomainSelectableList.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainSelectableList/DomainSelectableList.component.tsx
@@ -103,7 +103,7 @@ const DomainSelectableList = ({
     // Used Button to stop click propagation event anywhere in the component to parent
     // TeamDetailV1 collapsible panel
     <Button
-      className="remove-button-default-styling"
+      className="remove-button-default-styling flex-center"
       onClick={(e) => e.stopPropagation()}>
       <Popover
         destroyTooltipOnHide
@@ -139,7 +139,6 @@ const DomainSelectableList = ({
               data-testid="add-domain"
               disabled={!hasPermission}
               icon={<EditIcon color={DE_ACTIVE_COLOR} width="14px" />}
-              size="small"
               type="text"
             />
           </Tooltip>