diff --git a/src/assets/scss/_tables.scss b/src/assets/scss/_tables.scss
index 7ef572ae2..be157282c 100644
--- a/src/assets/scss/_tables.scss
+++ b/src/assets/scss/_tables.scss
@@ -20,6 +20,11 @@ table.confluenceTable th.confluenceTh {
   z-index: 2;
   box-shadow: 0 3px 2px -1px rgba(0, 0, 0, 0.4);
   font-size: var(--main-font-size);
+  font-weight: bold;
+
+  p {
+    font-weight: initial;
+  }
 }
 
 .confluenceTh,
@@ -29,6 +34,10 @@ table.confluenceTable th.confluenceTh {
   vertical-align: top;
   min-width: 8px; /* CONF-39943: set table cell min-width to which cursor can be focused */
   word-wrap: break-word;
+
+  h1, h2, h3 {
+    font-weight: 600;
+  }
 }
 
 /* Lists in tables */
@@ -340,11 +349,6 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] {
 }
 /* ADG3 colors end */
 
-table.confluenceTable th.confluenceTh,
-table.confluenceTable th.confluenceTh > p {
-  font-weight: bold;
-}
-
 table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */
 table.confluenceTable th.confluenceTh.nohighlight > p {
   /* deprecated */
diff --git a/src/assets/scss/iadc/_tables.scss b/src/assets/scss/iadc/_tables.scss
index fe2465582..be157282c 100644
--- a/src/assets/scss/iadc/_tables.scss
+++ b/src/assets/scss/iadc/_tables.scss
@@ -20,6 +20,11 @@ table.confluenceTable th.confluenceTh {
   z-index: 2;
   box-shadow: 0 3px 2px -1px rgba(0, 0, 0, 0.4);
   font-size: var(--main-font-size);
+  font-weight: bold;
+
+  p {
+    font-weight: initial;
+  }
 }
 
 .confluenceTh,
@@ -29,6 +34,10 @@ table.confluenceTable th.confluenceTh {
   vertical-align: top;
   min-width: 8px; /* CONF-39943: set table cell min-width to which cursor can be focused */
   word-wrap: break-word;
+
+  h1, h2, h3 {
+    font-weight: 600;
+  }
 }
 
 /* Lists in tables */
@@ -43,7 +52,6 @@ table.confluenceTable th.confluenceTh {
 .table-wrap {
   margin: auto;
   margin-top: 20px;
-  // overflow-x: auto;
 }
 
 /* an exception to above rule for tables that are first child */
@@ -341,11 +349,6 @@ table.confluenceTable td.confluenceTd[data-highlight-colour='\#000000'] {
 }
 /* ADG3 colors end */
 
-table.confluenceTable th.confluenceTh,
-table.confluenceTable th.confluenceTh > p {
-  font-weight: bold;
-}
-
 table.confluenceTable th.confluenceTh.nohighlight, /* deprecated */
 table.confluenceTable th.confluenceTh.nohighlight > p {
   /* deprecated */