diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/activity-feed-drawer.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/activity-feed-drawer.less
index 7a681a0e41b..0e97a34bc36 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/activity-feed-drawer.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/activity-feed-drawer.less
@@ -21,7 +21,7 @@
   .entity-link {
     font-weight: 600;
     line-height: 20px;
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 }
 .activity-feed-drawer {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less
index 128c766381b..e815d55a948 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less
@@ -66,7 +66,7 @@
 .task-feed-card-v1-new {
   .header-link {
     word-wrap: break-word;
-    color: @blue-9;
+    color: @primary-heading-color;
     font-weight: 600;
     display: inline;
   }
@@ -80,13 +80,13 @@
   }
 }
 .feed-card-header-v2-timestamp.ant-typography {
-  color: @grey-8;
+  color: @grey-500;
 }
 .seperator.ant-typography {
   vertical-align: middle;
   font-size: 18px;
   font-weight: 800;
-  color: @grey-8;
+  color: @grey-500;
   padding-bottom: 2px;
 }
 
@@ -125,7 +125,7 @@
   font-size: 12px;
   line-height: 14.52px;
   &::placeholder {
-    color: @grey-14;
+    color: @grey-400;
     font-size: 12px;
     font-style: normal;
     font-weight: 400;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less
index 8bd0459a71c..42d2a509965 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less
@@ -19,9 +19,8 @@
 .activity-feed-tab {
   display: flex;
   width: 100%;
-  width: 100%;
   overflow-x: hidden;
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   border-radius: @border-radius-sm;
 
   .custom-menu.ant-menu-root.ant-menu-inline {
@@ -90,7 +89,7 @@
       line-height: 14.52px;
 
       &::placeholder {
-        color: @grey-14;
+        color: @grey-400;
         font-size: 12px;
         font-style: normal;
         font-weight: 400;
@@ -222,23 +221,23 @@
     &.ant-typography a,
     & a.ant-typography,
     & .ant-typography a {
-      color: @blue-9;
+      color: @primary-heading-color;
 
       &:hover {
-        color: @blue-9;
+        color: @primary-heading-color;
       }
     }
   }
 
   .feed-card-header-v2-timestamp {
-    color: @grey-8;
+    color: @grey-500;
   }
 
   .seperator {
     vertical-align: middle;
     font-size: 18px;
     font-weight: 800;
-    color: @grey-8;
+    color: @grey-500;
     padding-bottom: 2px;
   }
 }
@@ -253,27 +252,27 @@
 
 .activity-feed-editor-container-new {
   background-color: @grey-9;
-  border: 0.5px solid @blue-15;
+  border: 0.5px solid @grey-15;
   border-radius: 10px;
   width: 100%;
 
   .ql-container {
     background-color: @grey-9;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     width: 100%;
 
     &:focus-within {
-      border: 0.5px solid @blue-15;
+      border: 0.5px solid @grey-15;
     }
   }
 
   .ql-toolbar {
     background-color: @grey-9;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     flex-wrap: wrap;
 
     &:focus-within {
-      border: 0.5px solid @blue-15;
+      border: 0.5px solid @grey-15;
     }
   }
 
@@ -397,15 +396,15 @@
 
     &-selected {
       background: @blue-23;
-      color: @blue-9;
+      color: @primary-heading-color;
       text-align: center;
       border-radius: @size-xs;
       .ant-segmented-item-label {
-        color: @blue-9;
+        color: @primary-heading-color;
       }
 
       svg path {
-        fill: @blue-9;
+        fill: @primary-heading-color;
       }
     }
   }
@@ -537,7 +536,7 @@
 }
 
 .view-more-less-button {
-  color: @blue-9;
+  color: @primary-heading-color;
   font-size: 14px;
   font-style: normal;
   font-family: 'Inter', sans-serif;
@@ -549,7 +548,7 @@
   box-shadow: none;
 
   &.ant-btn {
-    color: @blue-9;
+    color: @primary-heading-color;
     border: none;
     background: none;
     box-shadow: none;
@@ -557,7 +556,7 @@
     &:hover,
     &:focus,
     &:active {
-      color: @blue-9;
+      color: @primary-heading-color;
       border: none;
       background: none;
       box-shadow: none;
@@ -614,9 +613,9 @@
     justify-content: center;
     &.disabled {
       cursor: not-allowed;
-      stroke: @grey-300;
+      stroke: border-color-2;
       border-radius: @size-xs;
-      border: 1px solid @grey-10;
+      border: 1px solid @grey-100;
       background: @white;
     }
     &:not(.disabled):hover {
@@ -631,7 +630,7 @@
     &.ant-dropdown-open,
     &.ant-popover-open {
       border: 1px solid @blue-12;
-      background: @blue-11;
+      background: @primary-button-background;
       svg {
         stroke: @blue-12;
         stroke-width: 0.2px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less
index 2a644a6bb46..1c52d78ec64 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less
@@ -48,14 +48,14 @@
     background: #eff8ff;
   }
   .task-created-by-text {
-    color: @blue-9;
+    color: @primary-heading-color;
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
     line-height: 20px;
   }
   .task-timestamp-text {
-    color: @grey-8;
+    color: @grey-500;
     font-size: 12px;
     font-style: normal;
     font-weight: 400;
@@ -81,7 +81,7 @@
 
     .task-card-approve-btn {
       background-color: transparent;
-      color: @blue-9;
+      color: @primary-heading-color;
       border-radius: 8px;
       font-size: 12px;
       font-style: normal;
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 d353057bd0f..30a41f223d3 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
@@ -46,8 +46,8 @@
     background: white;
     padding: @padding-md;
     border-radius: @border-radius-sm;
-    border: 1px solid @blue-15;
-    box-shadow: 0px 0px 0px 4px @grey-10;
+    border: 1px solid @grey-15;
+    box-shadow: 0px 0px 0px 4px @grey-100;
     box-shadow: 0px 1px 2px 0px #0a0d120d;
   }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericWidget/generic-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericWidget/generic-widget.less
index 88124eeefa5..ca48d48ff84 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericWidget/generic-widget.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Customization/GenericWidget/generic-widget.less
@@ -17,7 +17,7 @@
   height: 100%;
 
   .ant-card-head {
-    background-color: @grey-10;
+    background-color: @grey-100;
     border: none;
     border-radius: @border-radius-sm;
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less
index 92eddf79e9c..88379b18e92 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less
@@ -15,7 +15,7 @@
 .data-assets-header-container {
   .data-asset-header-metadata {
     border-radius: 12px;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     padding: 16px 20px;
     gap: 16px;
     display: flex;
@@ -91,11 +91,11 @@
     }
   }
   .ant-btn.ant-btn-default.source-url-button {
-    background-color: @blue-11;
-    color: @blue-9;
+    background-color: @primary-button-background;
+    color: @primary-heading-color;
     span.anticon {
       border-radius: 50%;
-      background-color: @blue-19;
+      background-color: @alert-info-icon-bg-1;
       padding: 4px;
       height: 32px;
       width: 32px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/incident-manager.less b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/incident-manager.less
index c9cf3a6da48..17f17e8e193 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/incident-manager.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/incident-manager.less
@@ -16,7 +16,7 @@
 .incident-manager-header {
   display: flex;
   border-radius: 12px;
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   padding: 16px 20px;
   gap: 16px;
   background-color: @background-color;
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 a44ed1646c0..d61ba901614 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
@@ -75,7 +75,7 @@
 }
 
 .custom-node-column-lineage {
-  background: @body-bg-color;
+  background: @background-primary;
   border: 1px solid;
   border-radius: 4px;
 
@@ -150,7 +150,7 @@
 .custom-control-edit-button {
   display: block !important;
   border: 1px solid @border-color;
-  background-color: @body-bg-color;
+  background-color: @background-primary;
 
   &.active {
     background-color: @primary-color;
@@ -284,7 +284,7 @@
 }
 
 .custom-edge-pipeline-button {
-  background-color: @body-bg-color;
+  background-color: @background-primary;
   color: @primary-color;
 
   &.green {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab-new.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab-new.less
index 8e04c31ac6a..b2f4d219de8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab-new.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab-new.less
@@ -96,7 +96,7 @@
   &.ant-typography a,
   & a.ant-typography,
   & .ant-typography a {
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 }
 .task-details-entity-link {
@@ -178,19 +178,19 @@
 .entity-type {
   font-size: 14px;
   font-weight: 600;
-  color: @blue-9;
+  color: @primary-heading-color;
   line-height: 20px;
   &.ant-typography {
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 }
 .entity-type.ant-typography {
-  color: @blue-9;
+  color: @primary-heading-color;
 }
 .entity-link {
   font-weight: 600;
   line-height: 20px;
-  color: @blue-9;
+  color: @primary-heading-color;
 }
 .task-details {
   font-size: 14px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less
index 931aa78a431..e4c51926779 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/explore-search-card.less
@@ -64,6 +64,6 @@
   border-radius: 6px;
 
   .score {
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchBar/global-search-bar.less b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchBar/global-search-bar.less
index 7a7658b7ba1..d2b0c0b50da 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchBar/global-search-bar.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchBar/global-search-bar.less
@@ -32,7 +32,7 @@
     border-radius: @border-radius-xs;
     padding: 0 4px;
     transition: none;
-    background-color: @blue-11 !important;
+    background-color: @primary-button-background !important;
 
     svg {
       width: 14px;
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 54a7cfdd07e..f9963220093 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
@@ -97,7 +97,7 @@
 
 .ant-btn.domain-nav-btn {
   background-color: @white;
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   color: @text-color;
   height: 40px;
 
@@ -108,14 +108,14 @@
 
   &:hover,
   &:focus {
-    background-color: @blue-11;
-    border: 1px solid @blue-19;
+    background-color: @primary-button-background;
+    border: 1px solid @alert-info-icon-bg-1;
     color: @text-color;
   }
 
   &.domain-active {
     color: @primary-color;
     border: 1px solid @primary-color;
-    background-color: @blue-11;
+    background-color: @primary-button-background;
   }
 }
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 ee671557fa7..cbfaacb8a54 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
@@ -33,10 +33,10 @@
   border: 1px solid @blue-14;
   border-radius: 8px;
   padding: 18px 16px;
-  color: @blue-9;
+  color: @primary-heading-color;
   &:hover {
     background-color: @blue-14;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
   }
 }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/filter-configuration.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/filter-configuration.less
index 658a99c21b7..4c2ca2663d5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/filter-configuration.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/filter-configuration.less
@@ -31,14 +31,14 @@
     min-height: auto;
 
     .add-filters-btn {
-      color: @blue-9;
+      color: @primary-heading-color;
       border: 1px solid @border-color-2;
       background-color: @blue-13;
       border-radius: 8px;
 
       &:hover,
       &:focus {
-        color: @blue-9;
+        color: @primary-heading-color;
         background-color: @blue-13;
         border-color: @border-color-2;
       }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/GlobalSettingsItem/global-settings-item.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/GlobalSettingsItem/global-settings-item.less
index 65602202eab..bafb70da950 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/GlobalSettingsItem/global-settings-item.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/GlobalSettingsItem/global-settings-item.less
@@ -13,9 +13,9 @@
 @import url('../../../styles/variables.less');
 
 .global-settings-item {
-  border: 1px solid @grey-10;
+  border: 1px solid @grey-100;
   border-radius: 12px;
-  background-color: @grey-17;
+  background-color: @grey-50;
   font-size: 14px;
   font-weight: 500;
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/SearchPreview/search-preview.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/SearchPreview/search-preview.less
index 2700ad45e2b..82eaaaccc71 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/SearchPreview/search-preview.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/SearchPreview/search-preview.less
@@ -65,24 +65,24 @@
 
 .restore-defaults-btn {
   background-color: @blue-14;
-  border: 1px solid @blue-15;
-  color: @blue-9;
+  border: 1px solid @grey-15;
+  color: @primary-heading-color;
   border-radius: 8px;
   &:hover {
     background-color: @blue-14;
-    border-color: @blue-15;
-    color: @blue-9;
+    border-color: @grey-15;
+    color: @primary-heading-color;
   }
 }
 
 .save-btn {
-  background-color: @blue-9;
-  border: 1px solid @blue-9;
+  background-color: @primary-heading-color;
+  border: 1px solid @primary-heading-color;
   color: @white;
   border-radius: 8px;
   &:hover {
-    background-color: @blue-9;
-    border-color: @blue-9;
+    background-color: @primary-heading-color;
+    border-color: @primary-heading-color;
     color: @white;
   }
   &:disabled {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/TermBoost/term-boost.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/TermBoost/term-boost.less
index 922085226c0..77acb58fc3e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/TermBoost/term-boost.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/TermBoost/term-boost.less
@@ -14,7 +14,7 @@
 
 .term-boost {
   background-color: @white;
-  border: 1px solid @grey-10;
+  border: 1px solid @grey-100;
   border-radius: 12px;
 }
 
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 7824ddba494..b689b7dd58c 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
@@ -87,7 +87,7 @@
     height: 100%;
     background-color: @white;
     border-radius: @border-radius-sm;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     padding: 20px;
   }
 
@@ -99,8 +99,8 @@
   }
 
   .ant-card.widget-info-card {
-    background-color: @grey-11;
-    border-color: @blue-15;
+    background-color: @grey-25;
+    border-color: @grey-15;
     border-radius: @border-radius-sm;
   }
   .distribution-widget.ant-card {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/application-card.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/application-card.less
index fe271a5c752..cad6fdf78df 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/application-card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/application-card.less
@@ -13,7 +13,7 @@
 @import (reference) url('../../../../styles/variables.less');
 
 .application-card {
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   height: 100%;
   display: flex;
   align-items: center;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less
index 06dfbdb55c7..668e4a7746c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less
@@ -46,9 +46,9 @@
   }
 
   &.running {
-    background-color: @blue-11;
-    border-color: @blue-9;
-    color: @blue-9;
+    background-color: @primary-button-background;
+    border-color: @primary-heading-color;
+    color: @primary-heading-color;
   }
 
   &.partialSuccess {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/MetadataAgentsWidget/metadata-agents-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/MetadataAgentsWidget/metadata-agents-widget.less
index f036a0cd9e3..b0c934815fe 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/MetadataAgentsWidget/metadata-agents-widget.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/MetadataAgentsWidget/metadata-agents-widget.less
@@ -15,7 +15,7 @@
 .metadata-agents-widget.ant-card {
   height: 100%;
   background-color: @white;
-  border-color: @blue-15;
+  border-color: @grey-15;
   border-radius: @border-radius-sm;
   padding: 0px;
 
@@ -36,7 +36,7 @@
     align-items: center;
     justify-content: center;
     padding: 10px;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     border-radius: 18px;
     height: fit-content;
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.less
index 787122e0dde..de67fce74ef 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.less
@@ -15,7 +15,7 @@
 .agents-tab {
   background-color: @white;
   border-radius: @border-radius-sm;
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   padding: 20px;
   display: flex;
   flex-direction: column;
@@ -25,7 +25,7 @@
     height: 100%;
     background-color: @white;
     border-radius: @border-radius-sm;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     padding: 20px;
   }
 
@@ -34,7 +34,7 @@
   }
 
   .reload-button {
-    border-color: @blue-15;
+    border-color: @grey-15;
     .anticon.reload-button-icon {
       font-size: 14px;
     }
@@ -46,7 +46,7 @@
     justify-content: center;
     gap: 8px;
     border-radius: @border-radius-xs;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
     padding: 19px;
     font-size: 14px;
     font-weight: 500;
@@ -60,14 +60,14 @@
       font-weight: 500;
     }
     .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before {
-      background-color: @blue-15;
+      background-color: @grey-15;
     }
     .ant-radio-button-wrapper:first-child {
-      border-color: @blue-15;
+      border-color: @grey-15;
       border-radius: 8px 0 0 8px;
     }
     .ant-radio-button-wrapper:last-child {
-      border-color: @blue-15;
+      border-color: @grey-15;
       border-radius: 0 8px 8px 0;
     }
     .ant-radio-button-wrapper:hover {
@@ -79,7 +79,7 @@
       }
     }
     .ant-radio-button-wrapper-checked {
-      background-color: @blue-11;
+      background-color: @primary-button-background;
       .tab-label {
         color: @primary-color;
         .ant-typography {
@@ -99,7 +99,7 @@
       }
     }
     .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):hover {
-      background-color: @blue-11;
+      background-color: @primary-button-background;
     }
   }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/service-connection-details.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/service-connection-details.less
index edc1eca21ae..e26657326b2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/service-connection-details.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/service-connection-details.less
@@ -14,7 +14,7 @@
 @import (reference) '../../../../styles/variables.less';
 
 .service-connection-details {
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   border-radius: @border-radius-xs;
   padding: 16px;
   background-color: @white;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/setting-item-card.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/setting-item-card.style.less
index 4c9eb18e512..d96bac81014 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/setting-item-card.style.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/setting-item-card.style.less
@@ -13,7 +13,7 @@
 @import (reference) url('../../../styles/variables.less');
 
 .setting-card-item {
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
   background-color: @white;
   border-radius: 12px;
   width: 100%;
@@ -49,7 +49,7 @@
         font-size: 10px;
         height: auto;
         font-weight: 500;
-        background: @grey-12;
+        background: @grey-200;
         color: @text-color-tertiary;
         box-shadow: none;
         border: none;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-info.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-info.less
index 91d93d711c5..021976a0f40 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-info.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-info.less
@@ -21,7 +21,7 @@
   background-color: @white;
 
   .ant-typography.teams-info-heading {
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 
   .ant-typography.teams-info-value {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-subscription.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-subscription.less
index 4471b449f01..577fecc593e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-subscription.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/teams-subscription.less
@@ -23,6 +23,6 @@
     display: flex;
   }
   .subscription-label {
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 }
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 7b279ea8884..b85e3dd1f1d 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
@@ -53,7 +53,7 @@
       tr {
         td {
           border-right: none;
-          background: @body-bg-color;
+          background: @background-primary;
         }
         .ant-table-cell-row-hover {
           background: @body-dark-bg-color;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
index 05c7bd509f9..1dd9b3724c8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less
@@ -121,7 +121,7 @@
     }
 
     .profile-details-email {
-      color: @blue-9;
+      color: @primary-heading-color;
       text-align: center;
       font-size: 14px;
       line-height: 20px;
@@ -166,7 +166,7 @@
   text-decoration: none;
 
   &:hover {
-    color: @blue-9;
+    color: @primary-heading-color;
   }
 }
 
@@ -214,7 +214,7 @@
 }
 
 .chip-text {
-  color: @blue-9;
+  color: @primary-heading-color;
   border: none;
   font-size: 12px;
   background-color: white;
@@ -222,7 +222,7 @@
 
 .default-persona-text {
   padding-left: 26px;
-  color: @blue-9;
+  color: @primary-heading-color;
   font-size: 14px;
 }
 
@@ -356,7 +356,7 @@
   font-style: normal;
   font-weight: 400;
   line-height: 22px;
-  color: @blue-9;
+  color: @primary-heading-color;
 }
 
 .ant-select-selection-item:has(.max-tag-text) {
@@ -429,7 +429,7 @@
     font-weight: 400;
 
     &:hover {
-      color: @blue-9;
+      color: @primary-heading-color;
     }
   }
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/tags-viewer.less b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/tags-viewer.less
index 0fb221639eb..5d01cc905fc 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/tags-viewer.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsViewer/tags-viewer.less
@@ -38,7 +38,7 @@
   &.ant-btn-link {
     span {
       line-height: 22px;
-      color: @blue-9;
+      color: @primary-heading-color;
       font-weight: 400;
       font-size: 12px;
     }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Chip/chip.less b/openmetadata-ui/src/main/resources/ui/src/components/common/Chip/chip.less
index ead02c0a216..78114d91aba 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/Chip/chip.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Chip/chip.less
@@ -20,7 +20,7 @@
     line-height: 20px;
     color: @text-color;
     &:hover {
-      color: @blue-9;
+      color: @primary-heading-color;
       text-decoration: none;
     }
     overflow: hidden;
@@ -28,9 +28,9 @@
   }
 
   .chip-text {
-    color: @blue-9;
+    color: @primary-heading-color;
     &:hover {
-      color: @blue-9;
+      color: @primary-heading-color;
     }
     &::after {
       animation: none !important;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/collapse-header.less b/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/collapse-header.less
index 080cf7ee389..88c6eb60817 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/collapse-header.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CollapseHeader/collapse-header.less
@@ -14,8 +14,8 @@
 
 .add-field-btn {
   border-radius: 8px;
-  background-color: @blue-9;
-  border: 1px solid @blue-9;
+  background-color: @primary-heading-color;
+  border: 1px solid @primary-heading-color;
   color: @white;
   font-size: 14px;
   font-weight: 500;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/domain-label.less b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/domain-label.less
index 9a8ee8b0342..b38b1def877 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/domain-label.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/domain-label.less
@@ -38,7 +38,7 @@
 }
 
 .domain-count-button {
-  background-color: @blue-11;
+  background-color: @primary-button-background;
   height: 32px;
   width: 32px;
   border-radius: 200px;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerAvtar/owner-avtar.less b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerAvtar/owner-avtar.less
index c264682dc4e..e0480fbc542 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerAvtar/owner-avtar.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerAvtar/owner-avtar.less
@@ -55,14 +55,14 @@
     width: 12px;
     height: 12px;
     z-index: 5;
-    border: 1px solid @blue-9;
+    border: 1px solid @primary-heading-color;
     display: flex;
     align-items: center;
     justify-content: center;
     padding: 2px;
 
     svg {
-      color: @blue-9;
+      color: @primary-heading-color;
       width: 8px;
       height: 8px;
     }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/owner-label.less b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/owner-label.less
index ef0eea70045..a69ad0a467f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/owner-label.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerLabel/owner-label.less
@@ -34,7 +34,7 @@
 }
 
 .ant-btn.more-owners-button {
-  background-color: @blue-11 !important;
+  background-color: @primary-button-background !important;
   border-radius: 200px;
   text-align: center;
   text-decoration: none;
@@ -85,7 +85,7 @@
 }
 
 .ant-typography.no-owner-heading {
-  color: @blue-9;
+  color: @primary-heading-color;
 }
 
 .owner-count-avatar {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor-previewerV1.less b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor-previewerV1.less
index f6006d040ae..e71e7b28b08 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor-previewerV1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor-previewerV1.less
@@ -23,12 +23,12 @@
     margin: 0px;
     line-height: 0px;
     height: 16px;
-    color: @blue-9 !important;
+    color: @primary-heading-color !important;
   }
 
   .ant-btn:focus,
   .ant-btn:hover {
-    color: @blue-9 !important;
+    color: @primary-heading-color !important;
   }
 
   &.text-grey-muted {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/search-bar.less b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/search-bar.less
index 53b66bc979d..2f45efd0738 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/search-bar.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/search-bar.less
@@ -17,11 +17,11 @@
   .ant-input-affix-wrapper {
     border-radius: 10px;
     border: 1px solid @border-color-6;
-    background: @grey-17;
+    background: @grey-50;
     height: 40px;
 
     .ant-input {
-      background: @grey-17;
+      background: @grey-50;
 
       &::placeholder {
         color: @grey-21;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/StatusBadge/status-badge.less b/openmetadata-ui/src/main/resources/ui/src/components/common/StatusBadge/status-badge.less
index 10f3d845159..b249ec846fa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/StatusBadge/status-badge.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/StatusBadge/status-badge.less
@@ -44,9 +44,9 @@
   }
 
   &.running {
-    color: @blue-9;
-    background-color: @blue-11;
-    border-color: @blue-9;
+    color: @primary-heading-color;
+    background-color: @primary-button-background;
+    border-color: @primary-heading-color;
   }
 
   &.started,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PageNotFound/page-not-found.less b/openmetadata-ui/src/main/resources/ui/src/pages/PageNotFound/page-not-found.less
index 37e51e30f9a..94e25a2b797 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PageNotFound/page-not-found.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/PageNotFound/page-not-found.less
@@ -29,6 +29,6 @@
   }
 
   .image-column {
-    background-color: @body-bg-color;
+    background-color: @background-primary;
   }
 }
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 63f795d304b..584474df108 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
@@ -33,9 +33,9 @@
 
   .global-setting-card {
     padding: 32px 20px;
-    border: 1px solid @grey-10;
+    border: 1px solid @grey-100;
     border-radius: 12px;
-    background-color: @grey-17;
+    background-color: @grey-50;
     flex: 0 0 calc(25% - 15px);
     min-width: 250px;
     overflow: hidden;
@@ -61,7 +61,7 @@
   .ant-collapse {
     .ant-collapse-item {
       margin-bottom: 16px;
-      border: 1px solid @grey-10;
+      border: 1px solid @grey-100;
       border-radius: 10px;
       overflow: hidden;
 
@@ -75,25 +75,25 @@
       }
 
       .ant-collapse-content {
-        border-top: 1px solid @grey-10;
+        border-top: 1px solid @grey-100;
       }
     }
   }
   .ant-collapse-borderless > .ant-collapse-item > .ant-collapse-content {
-    background-color: @grey-10;
+    background-color: @grey-100;
   }
 }
 
 .field-value-boost-add-btn,
 .term-boost-add-btn,
 .term-boost-save-btn {
-  background-color: @blue-9;
-  border: 1px solid @blue-9;
+  background-color: @primary-heading-color;
+  border: 1px solid @primary-heading-color;
   color: @white;
   border-radius: 8px;
   &:hover {
-    background-color: @blue-9;
-    border-color: @blue-9;
+    background-color: @primary-heading-color;
+    border-color: @primary-heading-color;
     color: @white;
   }
   &:disabled {
@@ -111,14 +111,14 @@
 
     &.term-boost-panel {
       border: 1px solid @border-color-1;
-      background-color: @grey-17;
+      background-color: @grey-50;
       border-radius: 8px;
       overflow: hidden;
     }
 
     &.field-value-boost-panel {
       border: 1px solid @border-color-1;
-      background-color: @grey-17;
+      background-color: @grey-50;
       border-radius: 8px;
       overflow: hidden;
     }
@@ -127,9 +127,9 @@
 
 .count-label {
   padding: 2px 8px;
-  background-color: @blue-11;
+  background-color: @primary-button-background;
   border-radius: 16px;
-  color: @blue-9;
+  color: @primary-heading-color;
   font-size: 14px;
   font-weight: 500;
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/service-details-page.less b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/service-details-page.less
index d5026f2c2f3..55ed042a3ef 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/service-details-page.less
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/service-details-page.less
@@ -38,7 +38,7 @@
     padding: 4px 20px 8px 20px;
     background-color: @white;
     border-radius: @border-radius-sm;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
   }
 
   .ant-tabs.tabs-new .ant-tabs-tabpane {
@@ -48,7 +48,7 @@
   .connection-tab-content {
     background-color: @white;
     border-radius: @border-radius-sm;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
   }
 
   .connection-tab-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 9740228bd00..7288a58159b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less
@@ -18,7 +18,7 @@
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  background: @body-bg-color;
+  background: @background-primary;
   font-feature-settings: normal !important;
 }
 
@@ -302,7 +302,7 @@ a[href].link-text-grey,
 }
 
 .bg-body-main {
-  background: @body-bg-color;
+  background: @background-primary;
 }
 
 .bg-primary-lite {
@@ -849,7 +849,7 @@ a[href].link-text-grey,
 
 .notification-dropdown-list-btn:hover,
 .notification-dropdown-list-btn:focus {
-  background-color: @body-bg-color;
+  background-color: @background-primary;
 }
 
 /* ToastUI Editor style */
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/border.less b/openmetadata-ui/src/main/resources/ui/src/styles/border.less
index 7b0a9b3e4d3..70de76a9e88 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/border.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/border.less
@@ -17,7 +17,7 @@
   border: 1px solid @border-color;
 }
 .border-default {
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
 }
 .border-2-primary {
   border: 2px solid @primary-color;
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/button.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/button.less
index 00809b40896..20a5623a261 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/button.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/button.less
@@ -26,7 +26,7 @@ button {
 }
 
 .ant-btn.ant-btn-default:not(:hover) {
-  border-color: @blue-15;
+  border-color: @grey-15;
 }
 
 .ant-btn-background-ghost.ant-btn-primary.hover-button:hover {
@@ -126,7 +126,7 @@ button {
   }
 
   .ant-btn-default:not(.ant-btn-primary):not([disabled]) {
-    border-left-color: @blue-15;
+    border-left-color: @grey-15;
 
     &:hover {
       border-left-color: @primary-color;
@@ -137,7 +137,7 @@ button {
     background-color: @background-color;
 
     &:hover {
-      background-color: @blue-11;
+      background-color: @primary-button-background;
       border-color: @primary-color;
     }
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less
index ef13a0af11a..6a21a8fa81d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/card.less
@@ -88,7 +88,7 @@
     .scrollable-card-body();
   }
 
-  border: 1px solid @blue-15;
+  border: 1px solid @grey-15;
 }
 
 .ant-card.scrollable-body-card {
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 6c741302506..d05c9e80eae 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
@@ -31,11 +31,11 @@
 
       .ant-select-selection-item {
         font-weight: 600;
-        color: @grey-8;
+        color: @grey-500;
       }
     }
     .ant-select-arrow {
-      color: @grey-8;
+      color: @grey-500;
       font-weight: 600;
     }
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/radio.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/radio.less
index 3e24760c727..a45fbe67f20 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/radio.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/radio.less
@@ -49,15 +49,15 @@
 
     &-selected {
       background: @blue-23;
-      color: @blue-9;
+      color: @primary-heading-color;
       text-align: center;
       border-radius: @size-xs;
       .ant-segmented-item-label {
-        color: @blue-9;
+        color: @primary-heading-color;
       }
 
       svg path {
-        fill: @blue-9;
+        fill: @primary-heading-color;
       }
     }
   }
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/tabs.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/tabs.less
index d73869477bc..2fd314a8d4f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/tabs.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/tabs.less
@@ -59,7 +59,7 @@
     height: 48px;
     background: @white;
     border-radius: 12px;
-    border: 1px solid @blue-15;
+    border: 1px solid @grey-15;
 
     &::before {
       border-bottom: none;
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less b/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less
index 9046e470962..9c20d0e96ad 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less
@@ -80,7 +80,7 @@ pre {
   color: @white;
 }
 .text-blue {
-  color: @blue-9;
+  color: @primary-heading-color;
 }
 .text-black {
   color: @black;
@@ -92,7 +92,7 @@ pre {
   color: @grey-3;
 }
 .text-grey-14 {
-  color: @grey-14;
+  color: @grey-400;
 }
 .text-grey-body {
   color: @text-color;
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
index 9e5d5bb7ea8..f7381b4bbba 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less
@@ -84,17 +84,13 @@
 @blue-6: #eff5ff;
 @blue-7: #3062d4;
 @blue-8: #f5f8ff;
-@blue-9: #175cd3;
 @blue-10: #005bc4;
-@blue-11: #eff8ff;
 @blue-12: #1570ef;
 @blue-13: #e0f2fe;
 @blue-14: #f5faff;
-@blue-15: #eaecf5;
 @blue-16: #84caff;
 @blue-17: #0968da;
 @blue-18: #e3e3e3;
-@blue-19: #d1e9ff;
 @blue-20: #d5d9eb;
 @blue-21: #026aa2;
 @blue-22: #f0f9ff;
@@ -105,8 +101,8 @@
 @partial-success-2: #bdeeee;
 @black: #000000;
 @aborted-color: #efae2f;
-@text-color: #181d27;
-@text-color-tertiary: #414651;
+@text-color: @grey-900;
+@text-color-tertiary: @grey-700;
 
 @grey-1: #f8f8f8;
 @grey-2: #f2f2f2;
@@ -115,16 +111,10 @@
 @grey-5: #fbfbfb;
 @grey-6: #f9f9f9;
 @grey-7: #9ca3af;
-@grey-8: #717680;
 @grey-9: #f8f9fc;
-@grey-10: #f5f5f5;
-@grey-11: #fdfdfd;
-@grey-12: #e9eaeb;
 @grey-13: #71717a;
-@grey-14: #a4a7ae;
 @grey-15: #eaecf5;
 @grey-16: #f4f5f7;
-@grey-17: #fafafa;
 @grey-18: #afb5d9;
 @grey-19: #363f72;
 @grey-20: #dce3ec;
@@ -153,11 +143,10 @@
 @size-3xl: 64px;
 
 @margin-xlg: 48px;
-@body-bg-color: #f8f9fa;
 @body-dark-bg-color: #f1f1f3;
-@border-color: @blue-15;
-@border-color-1: #e9eaeb;
-@border-color-2: #d5d7da;
+@border-color: @grey-15;
+@border-color-1: @grey-200;
+@border-color-2: @grey-300;
 @border-color-3: #d4d4d8;
 @border-color-4: #e4e4e7;
 @border-color-5: #dde3ea;
@@ -198,7 +187,7 @@
 @alert-info: @blue-16;
 @alert-info-icon: @blue-12;
 @alert-info-icon-bg-1: #d1e9ff;
-@alert-info-icon-bg-2: @blue-11;
+@alert-info-icon-bg-2: @primary-button-background;
 @alert-success-icon: @green-13;
 @alert-success-icon-bg-1: @green-12;
 @alert-success-icon-bg-2: @green-9;