diff --git a/source/_static/scss/includes/_misc.scss b/source/_static/scss/includes/_misc.scss
index e0ff5821..4e7f2b19 100644
--- a/source/_static/scss/includes/_misc.scss
+++ b/source/_static/scss/includes/_misc.scss
@@ -371,16 +371,6 @@ figcaption {
    }
 }
 
-
-// ---------------------------------------
-// Fixing table issues from asciidoc -> md
-// ---------------------------------------
-
-table thead tr.header {
-   background-color: lightgray;
-   box-shadow: none;
-}
-
 // --------------------------------------
 // Improving readability of ordered lists
 // --------------------------------------
diff --git a/source/_static/scss/includes/_reset.scss b/source/_static/scss/includes/_reset.scss
index 4dbbe423..0bea0098 100644
--- a/source/_static/scss/includes/_reset.scss
+++ b/source/_static/scss/includes/_reset.scss
@@ -221,24 +221,36 @@ table {
 // ----------------------
 // Table
 // ----------------------
+table,
 table.docutils {
+    all: revert;
     box-shadow: none;
     margin: 1rem 0 2rem;
     width: 100%;
+    border-collapse: collapse;
+
+    & > thead {
+        tr.header {
+            background: transparent;
+            box-shadow: none;
+        }
+    }
 
     td,
     th {
-        border-color: var(--table-border-color);
+        border: 1px solid var(--table-border-color);
         padding: 0.75rem 1rem;
         line-height: 1.5;
         vertical-align: top;
         text-align: left;
+        background: transparent;
     }
 
     th {
         font-weight: $font-weight-medium;
         color: var(--headings-color);
         font-size: $font-size-sm;
+        background-color: var(--table-th-bg);
     }
 
     caption {
@@ -266,24 +278,26 @@ table.docutils {
 
         tr {
             &:first-child {
-                th {
-                    border-top-color: transparent;
+                th,
+                th.stub ~ td {
+                    border-top-width: 0;
                 }
             }
 
             &:last-child {
+                th,
                 td {
-                    border-bottom-color: transparent;
+                    border-bottom-width: 0;
                 }
             }
 
             td, th {
                 &:first-child {
-                    border-left-color: transparent;
+                    border-left-width: 0;
                 }
 
                 &:last-child {
-                    border-right-color: transparent;
+                    border-right-width: 0;
                 }
             }
         }
diff --git a/source/_static/scss/includes/_theme.scss b/source/_static/scss/includes/_theme.scss
index 28533de7..3697bb56 100644
--- a/source/_static/scss/includes/_theme.scss
+++ b/source/_static/scss/includes/_theme.scss
@@ -60,6 +60,7 @@ $theme-properties: (
 
     // Table
     --table-border-color: $light-300 $dark-200,
+    --table-th-bg: $light-100 darken($dark-200, 5%),
 
     // Code
     --code-bg: $light-200 lighten($dark-500, 17.5%),