diff --git a/assets/css/typography.css b/assets/css/typography.css
index a0c6511e59..008e7af704 100644
--- a/assets/css/typography.css
+++ b/assets/css/typography.css
@@ -73,10 +73,5 @@
       @apply text-lg;
       line-height: 1.75;
     }
-    table {
-      display: block;
-      overflow-x: auto;
-      max-width: 100%;
-    }
   }
 }
diff --git a/hugo_stats.json b/hugo_stats.json
index ff59b54840..6e834ec746 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -413,6 +413,7 @@
       "outline-none",
       "overflow-clip",
       "overflow-hidden",
+      "overflow-x-auto",
       "overflow-x-hidden",
       "overflow-y-auto",
       "p-1",
diff --git a/layouts/_default/_markup/render-table.html b/layouts/_default/_markup/render-table.html
new file mode 100644
index 0000000000..1a32125cc1
--- /dev/null
+++ b/layouts/_default/_markup/render-table.html
@@ -0,0 +1,39 @@
+<div class="overflow-x-auto">
+  <table
+    {{- range $k, $v := .Attributes }}
+      {{- if $v }}
+        {{- printf " %s=%q" $k $v | safeHTMLAttr }}
+      {{- end }}
+    {{- end }}>
+    <thead class="bg-gray-light-100 dark:bg-gray-dark-200">
+      {{- range .THead }}
+        <tr>
+          {{- range . }}
+            <th class="p-2"
+              {{- with .Alignment }}
+                {{- printf " style=%q" (printf "text-align: %s" .) | safeHTMLAttr }}
+              {{- end -}}
+            >
+              {{- .Text -}}
+            </th>
+          {{- end }}
+        </tr>
+      {{- end }}
+    </thead>
+    <tbody>
+      {{- range .TBody }}
+        <tr>
+          {{- range . }}
+            <td class="p-2"
+              {{- with .Alignment }}
+                {{- printf " style=%q" (printf "text-align: %s" .) | safeHTMLAttr }}
+              {{- end -}}
+            >
+              {{- .Text -}}
+            </td>
+          {{- end }}
+        </tr>
+      {{- end }}
+    </tbody>
+  </table>
+</div>
diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index 347cce4099..58c99c2c2c 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -11,38 +11,40 @@
     <article class="prose min-w-0 flex-[2_2_0%] max-w-4xl dark:prose-invert">
     {{ partial "breadcrumbs.html" . }}
     <h1 class="scroll-mt-36">{{ .Title }}</h1>
-    <table>
-      <tbody>
-        {{ with $data.short }}
-        <tr>
-          <th class="text-left w-32">Description</th>
-          <td>{{ . }}</th>
-        </tr>
-        {{ end }}
-        {{ with $data.usage }}
-        <tr>
-          <th class="text-left w-32">Usage</th>
-          <td><code>{{ . }}</code></td>
-        </tr>
-        {{ end }}
-        {{ with $data.aliases }}
-        {{ $aliases := strings.Replace . (fmt.Printf "%s, " page.Title) "" }}
-        <tr>
-          <th class="text-left w-32 flex items-center gap-2">
-            <span>Aliases</span>
-            {{ partialCached "tooltip.html" "An alias is a short or memorable alternative for a longer command." "cli-alias" }}
-          </th>
-          <td>
-            <div class="flex gap-3">
-            {{ range (strings.Split $aliases ", ") }}
-              <code>{{ . }}</code>
-            {{ end }}
-            </div>
-          </td>
-        </tr>
-        {{ end }}
-      </tbody>
-    </table>
+    <div class="overflow-x-auto">
+      <table>
+        <tbody>
+          {{ with $data.short }}
+          <tr>
+            <th class="text-left w-32">Description</th>
+            <td>{{ . }}</th>
+          </tr>
+          {{ end }}
+          {{ with $data.usage }}
+          <tr>
+            <th class="text-left w-32">Usage</th>
+            <td><code>{{ . }}</code></td>
+          </tr>
+          {{ end }}
+          {{ with $data.aliases }}
+          {{ $aliases := strings.Replace . (fmt.Printf "%s, " page.Title) "" }}
+          <tr>
+            <th class="text-left w-32 flex items-center gap-2">
+              <span>Aliases</span>
+              {{ partialCached "tooltip.html" "An alias is a short or memorable alternative for a longer command." "cli-alias" }}
+            </th>
+            <td>
+              <div class="flex gap-3">
+              {{ range (strings.Split $aliases ", ") }}
+                <code>{{ . }}</code>
+              {{ end }}
+              </div>
+            </td>
+          </tr>
+          {{ end }}
+        </tbody>
+      </table>
+    </div>
     {{ .Content }}
     {{ if $data.deprecated }}
       {{ markdownify `
@@ -96,62 +98,64 @@ can be removed entirely in a future release.
         {{ $heading := dict "level" 2 "text" "Options" }}
         {{ partialCached "heading.html" $heading "cli-options" }}
         {{ $.Scratch.Add "headings" $heading }}
-        <table>
-          <thead>
-            <tr>
-              <th>Option</th>
-              <th>Default</th>
-              <th>Description</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{ range . }}
+        <div class="overflow-x-auto">
+          <table>
+            <thead class="bg-gray-light-100 dark:bg-gray-dark-200">
               <tr>
-                {{ $short := .shorthand }}
-                {{ $long := .option }}
-                <td>
-                  {{ with .details_url }}
-                  <a class="link" href="{{ . }}">
-                    <code>{{ with $short }}-{{ . }}, {{end}}--{{ $long }}</code>
-                  </a>
-                  {{ else }}
-                  <code>{{ with $short }}-{{ . }}, {{end}}--{{ $long }}</code>
-                  {{ end }}
-                </td>
-                {{ $skipDefault := `[],map[],false,0,0s,default,'',""` }}
-                <td>
-                  {{ with .default_value }}
-                    {{ cond (in $skipDefault .) "" (printf "<code>%s</code>" . | safeHTML) }}
-                  {{ end }}
-                </td>
-                <td>
-                  {{ with .min_api_version }}
-                    {{ partialCached "components/badge.html" (dict "color" "blue" "content" (printf "API %s+" .)) "api" . }}
-                  {{ end }}
-                  {{ with .deprecated }}
-                    {{ partialCached "components/badge.html" (dict "color" "red" "content" "Deprecated") "deprecated" }}
-                  {{ end }}
-                  {{ with .experimental }}
-                    {{ partialCached "components/badge.html" (dict "color" "amber" "content" "experimental (daemon)") "exp" }}
-                  {{ end }}
-                  {{ with .experimentalcli }}
-                    {{ partialCached "components/badge.html" (dict "color" "amber" "content" "experimental (CLI)") "exp-cli" }}
-                  {{ end }}
-                  {{ with .kubernetes }}
-                    {{ partialCached "components/badge.html" (dict "color" "blue" "content" "Kubernetes") "k8s" }}
-                  {{ end }}
-                  {{ with .swarm }}
-                    {{ partialCached "components/badge.html" (dict "color" "blue" "content" "Swarm") "swarm" }}
-                  {{ end }}
-                  {{ if .description }}
-                    {{/* replace newlines in long desc with break tags */}}
-                    {{ markdownify (strings.Replace .description "\n" "<br>") }}
-                  {{ end }}
-                </td>
+                <th class="p-2">Option</th>
+                <th class="p-2">Default</th>
+                <th class="p-2">Description</th>
               </tr>
-            {{ end }}
-          </tbody>
-        </table>
+            </thead>
+            <tbody>
+              {{ range . }}
+                <tr class="p-2">
+                  {{ $short := .shorthand }}
+                  {{ $long := .option }}
+                  <td>
+                    {{ with .details_url }}
+                    <a class="link" href="{{ . }}">
+                      <code>{{ with $short }}-{{ . }}, {{end}}--{{ $long }}</code>
+                    </a>
+                    {{ else }}
+                    <code>{{ with $short }}-{{ . }}, {{end}}--{{ $long }}</code>
+                    {{ end }}
+                  </td>
+                  {{ $skipDefault := `[],map[],false,0,0s,default,'',""` }}
+                  <td>
+                    {{ with .default_value }}
+                      {{ cond (in $skipDefault .) "" (printf "<code>%s</code>" . | safeHTML) }}
+                    {{ end }}
+                  </td>
+                  <td>
+                    {{ with .min_api_version }}
+                      {{ partialCached "components/badge.html" (dict "color" "blue" "content" (printf "API %s+" .)) "api" . }}
+                    {{ end }}
+                    {{ with .deprecated }}
+                      {{ partialCached "components/badge.html" (dict "color" "red" "content" "Deprecated") "deprecated" }}
+                    {{ end }}
+                    {{ with .experimental }}
+                      {{ partialCached "components/badge.html" (dict "color" "amber" "content" "experimental (daemon)") "exp" }}
+                    {{ end }}
+                    {{ with .experimentalcli }}
+                      {{ partialCached "components/badge.html" (dict "color" "amber" "content" "experimental (CLI)") "exp-cli" }}
+                    {{ end }}
+                    {{ with .kubernetes }}
+                      {{ partialCached "components/badge.html" (dict "color" "blue" "content" "Kubernetes") "k8s" }}
+                    {{ end }}
+                    {{ with .swarm }}
+                      {{ partialCached "components/badge.html" (dict "color" "blue" "content" "Swarm") "swarm" }}
+                    {{ end }}
+                    {{ if .description }}
+                      {{/* replace newlines in long desc with break tags */}}
+                      {{ markdownify (strings.Replace .description "\n" "<br>") }}
+                    {{ end }}
+                  </td>
+                </tr>
+              {{ end }}
+            </tbody>
+          </table>
+        </div>
       {{ end }}
     {{ end }}
     {{ with $data.examples }}
diff --git a/tailwind.config.js b/tailwind.config.js
index 9a9a847271..b02e5903a2 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -39,7 +39,7 @@ module.exports = {
             "--tw-prose-invert-hr": theme("colors.divider.dark"),
             "--tw-prose-invert-captions": theme("colors.gray.dark.600"),
             "--tw-prose-invert-th-borders": theme("colors.gray.dark.200"),
-            "--tw-prose-invert-td-borders": theme("colors.gray.dark.200"),
+            "--tw-prose-invert-td-borders": theme("colors.gray.dark.300"),
           },
         },
       }),