diff --git a/components/lib/theme/aura/datatable/index.js b/components/lib/theme/aura/datatable/index.js
index b0ad7420b..5f015441d 100644
--- a/components/lib/theme/aura/datatable/index.js
+++ b/components/lib/theme/aura/datatable/index.js
@@ -22,7 +22,8 @@ export default {
                     textColorHover: '{surface.800}'
                 },
                 bodyCell: {
-                    borderColor: '{surface.200}'
+                    borderColor: '{surface.200}',
+                    borderColorSelected: '{highlight.backgroundFocus}'
                 },
                 footerCell: {
                     background: '{surface.0}',
@@ -68,7 +69,8 @@ export default {
                     textColorHover: '{surface.0}'
                 },
                 bodyCell: {
-                    borderColor: '{surface.800}'
+                    borderColor: '{surface.800}',
+                    borderColorSelected: '{highlight.backgroundFocus}'
                 },
                 footerCell: {
                     background: '{surface.900}',
@@ -458,11 +460,11 @@ export default {
 }
 
 .p-datatable-tbody > tr:has(+ .p-highlight) > td {
-    border-bottom-color: var(--p-highlight-background);
+    border-bottom-color: var(--p-datatable-body-cell-border-color-selected);
 }
 
 .p-datatable-tbody > tr.p-highlight > td {
-    border-bottom-color: var(--p-highlight-background);
+    border-bottom-color: var(--p-datatable-body-cell-border-color-selected);
 }
 
 .p-datatable-tbody > tr:focus-visible {
diff --git a/components/lib/theme/aura/treetable/index.js b/components/lib/theme/aura/treetable/index.js
index 58cf9b122..f95b3f988 100644
--- a/components/lib/theme/aura/treetable/index.js
+++ b/components/lib/theme/aura/treetable/index.js
@@ -22,7 +22,8 @@ export default {
                     textColorHover: '{surface.800}'
                 },
                 bodyCell: {
-                    borderColor: '{surface.200}'
+                    borderColor: '{surface.200}',
+                    borderColorSelected: '{highlight.backgroundFocus}'
                 },
                 footerCell: {
                     background: '{surface.0}',
@@ -70,7 +71,8 @@ export default {
                     textColorHover: '{surface.0}'
                 },
                 bodyCell: {
-                    borderColor: '{surface.800}'
+                    borderColor: '{surface.800}',
+                    borderColorSelected: '{highlight.backgroundFocus}'
                 },
                 footerCell: {
                     background: '{surface.900}',
@@ -371,11 +373,11 @@ export default {
 }
 
 .p-treetable-tbody > tr:has(+ .p-highlight) > td {
-    border-bottom-color: var(--p-highlight-background);
+    border-bottom-color: var(--p-treetable-body-cell-border-color-selected);
 }
 
 .p-treetable-tbody > tr.p-highlight > td {
-    border-bottom-color: var(--p-highlight-background);
+    border-bottom-color: var(--p-treetable-body-cell-border-color-selected);
 }
 
 .p-treetable-tbody > tr:focus-visible {