diff --git a/packages/main/src/components/AnalyticalTable/AnalyticalTable.module.css b/packages/main/src/components/AnalyticalTable/AnalyticalTable.module.css
index ad719fb8b97..51ee70ec20d 100644
--- a/packages/main/src/components/AnalyticalTable/AnalyticalTable.module.css
+++ b/packages/main/src/components/AnalyticalTable/AnalyticalTable.module.css
@@ -59,10 +59,6 @@
 
 .tableHeaderRow {
   height: var(--_ui5wcr-AnalyticalTableHeaderRowHeight);
-
-  div:first-child .th {
-    border-inline-start: 1px solid var(--sapList_BorderColor);
-  }
 }
 
 .hasNavigationIndicator {
diff --git a/packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeader.module.css b/packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeader.module.css
index b50371f05f8..d9915f1abfc 100644
--- a/packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeader.module.css
+++ b/packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeader.module.css
@@ -1,5 +1,5 @@
 .thContainer {
-  &:first-child > [role='columnheader'] {
+  & > [role='columnheader'][data-column-index='0'] {
     border-inline-start: var(--_ui5wcr-AnalyticalTable-OuterCellBorder);
   }
 
diff --git a/packages/main/src/themes/sap_belize.css b/packages/main/src/themes/sap_belize.css
index 92ba3787962..046f19cd3c4 100644
--- a/packages/main/src/themes/sap_belize.css
+++ b/packages/main/src/themes/sap_belize.css
@@ -1,8 +1,10 @@
-
-[data-sap-theme="sap_belize"] {
+[data-sap-theme='sap_belize'] {
   --_ui5wcr_ActionSheet_BoxShadow: var(--sapContent_HeaderShadow);
   --_ui5wcr_Scrollbar_BorderRadius: 0;
-  --_ui5wcr_Splitter_BarBorderFocus: .0625rem dotted var(--sapContent_FocusColor);
+  --_ui5wcr_Splitter_BarBorderFocus: 0.0625rem dotted var(--sapContent_FocusColor);
   --_ui5wcr_ActionSheet_TopBorderRadius: var(--sapElement_BorderCornerRadius);
-  --_ui5wcr_Splitter_BarBorderHighContrastFix: .0625rem dotted var(--sapContent_FocusColor);
-}
\ No newline at end of file
+  --_ui5wcr_Splitter_BarBorderHighContrastFix: 0.0625rem dotted var(--sapContent_FocusColor);
+  --_ui5wcr-AnalyticalTable-OuterCellBorder: 1px solid transparent;
+  --_ui5wcr-AnalyticalTable-OuterBorderBlock: none;
+  --_ui5wcr-AnalyticalTable-OuterBorderInline: none;
+}
diff --git a/packages/main/src/themes/sap_belize_hcb.css b/packages/main/src/themes/sap_belize_hcb.css
index 00680da0873..48e78a19a3f 100644
--- a/packages/main/src/themes/sap_belize_hcb.css
+++ b/packages/main/src/themes/sap_belize_hcb.css
@@ -3,4 +3,7 @@
   --_ui5wcr_ActionSheet_BoxShadow: var(--sapContent_HeaderShadow);
   --_ui5wcr_Scrollbar_BorderRadius: 0;
   --_ui5wcr_ActionSheet_TopBorderRadius: var(--sapElement_BorderCornerRadius);
+  --_ui5wcr-AnalyticalTable-OuterCellBorder: 1px solid transparent;
+  --_ui5wcr-AnalyticalTable-OuterBorderBlock: none;
+  --_ui5wcr-AnalyticalTable-OuterBorderInline: none;
 }
\ No newline at end of file
diff --git a/packages/main/src/themes/sap_belize_hcw.css b/packages/main/src/themes/sap_belize_hcw.css
index b4904e993aa..aba4d4e2ffc 100644
--- a/packages/main/src/themes/sap_belize_hcw.css
+++ b/packages/main/src/themes/sap_belize_hcw.css
@@ -1,6 +1,9 @@
-[data-sap-theme="sap_belize_hcw"] {
+[data-sap-theme='sap_belize_hcw'] {
   --_ui5wcr_Scrollbar_Border: 0.0625rem solid #585858;
   --_ui5wcr_ActionSheet_BoxShadow: var(--sapContent_HeaderShadow);
   --_ui5wcr_Scrollbar_BorderRadius: 0;
   --_ui5wcr_ActionSheet_TopBorderRadius: var(--sapElement_BorderCornerRadius);
-}
\ No newline at end of file
+  --_ui5wcr-AnalyticalTable-OuterCellBorder: 1px solid transparent;
+  --_ui5wcr-AnalyticalTable-OuterBorderBlock: none;
+  --_ui5wcr-AnalyticalTable-OuterBorderInline: none;
+}