diff --git a/python/mozbuild/mozpack/test/test_unify.py b/python/mozbuild/mozpack/test/test_unify.py
index 85666c572439..40dea81aa524 100644
--- a/python/mozbuild/mozpack/test/test_unify.py
+++ b/python/mozbuild/mozpack/test/test_unify.py
@@ -97,10 +97,12 @@ class TestUnifiedBuildFinder(TestUnified):
             "\n".join(
                 [
                     "<html>",
-                    "<body>",
-                    "<h1>Build Configuration</h1>",
-                    "<div>foo</div>",
-                    "</body>",
+                    "  <body>",
+                    "    <div>",
+                    "      <h1>Build Configuration</h1>",
+                    "      <div>foo</div>",
+                    "    </div>",
+                    "  </body>",
                     "</html>",
                 ]
             ),
@@ -111,10 +113,12 @@ class TestUnifiedBuildFinder(TestUnified):
             "\n".join(
                 [
                     "<html>",
-                    "<body>",
-                    "<h1>Build Configuration</h1>",
-                    "<div>bar</div>",
-                    "</body>",
+                    "  <body>",
+                    "    <div>",
+                    "      <h1>Build Configuration</h1>",
+                    "      <div>bar</div>",
+                    "    </div>",
+                    "  </body>",
                     "</html>",
                 ]
             ),
@@ -132,12 +136,14 @@ class TestUnifiedBuildFinder(TestUnified):
                     "\n".join(
                         [
                             "<html>",
-                            "<body>",
-                            "<h1>Build Configuration</h1>",
-                            "<div>foo</div>",
-                            "<hr> </hr>",
-                            "<div>bar</div>",
-                            "</body>",
+                            "  <body>",
+                            "    <div>",
+                            "      <h1>Build Configuration</h1>",
+                            "      <div>foo</div>",
+                            "      <hr> </hr>",
+                            "      <div>bar</div>",
+                            "    </div>",
+                            "  </body>",
                             "</html>",
                         ]
                     ),
diff --git a/python/mozbuild/mozpack/unify.py b/python/mozbuild/mozpack/unify.py
index 4096ac764994..5b91184ee700 100644
--- a/python/mozbuild/mozpack/unify.py
+++ b/python/mozbuild/mozpack/unify.py
@@ -220,14 +220,16 @@ class UnifiedBuildFinder(UnifiedFinder):
         if file1 and file2 and basename == "buildconfig.html":
             content1 = file1.open().readlines()
             content2 = file2.open().readlines()
-            # Copy everything from the first file up to the end of its <body>,
+            # Copy everything from the first file up to the end of its <div>,
             # insert a <hr> between the two files and copy the second file's
             # content beginning after its leading <h1>.
             return GeneratedFile(
                 b"".join(
-                    content1[: content1.index(b"</body>\n")]
-                    + [b"<hr> </hr>\n"]
-                    + content2[content2.index(b"<h1>Build Configuration</h1>\n") + 1 :]
+                    content1[: content1.index(b"    </div>\n")]
+                    + [b"      <hr> </hr>\n"]
+                    + content2[
+                        content2.index(b"      <h1>Build Configuration</h1>\n") + 1 :
+                    ]
                 )
             )
         elif file1 and file2 and basename == "install.rdf":
diff --git a/toolkit/content/buildconfig.css b/toolkit/content/buildconfig.css
index 43064488e6e9..e4c9306c874a 100644
--- a/toolkit/content/buildconfig.css
+++ b/toolkit/content/buildconfig.css
@@ -2,6 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-th { text-align: start; }
-h2 { margin-top: 1.5em; }
-th, td { vertical-align: top; }
+h2 {
+  margin-top: 1.5em;
+}
+
+p {
+  font: message-box;
+}
+
+.build-platform-table {
+  width: auto;
+}
diff --git a/toolkit/content/buildconfig.html b/toolkit/content/buildconfig.html
index 5e7e77bc6167..e4263babf47d 100644
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -6,63 +6,65 @@
 #filter substitution
 #include @TOPOBJDIR@/source-repo.h
 <html>
-<head>
-  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src chrome:; object-src 'none'" />
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width; user-scalable=false;">
-  <title>Build Configuration</title>
-  <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css">
-  <link rel="stylesheet" href="chrome://global/content/buildconfig.css" type="text/css">
-</head>
-<body class="aboutPageWideContainer">
-<h1>Build Configuration</h1>
-#ifdef MOZ_SOURCE_URL
-<h2>Source</h2>
-<p>Built from <a href="@MOZ_SOURCE_URL@">@MOZ_SOURCE_URL@</a></p>
-#endif
-<h2>Build platform</h2>
-<table>
-  <tbody>
-    <tr>
-      <th>target</th>
-    </tr>
-    <tr>
-      <td>@target@</td>
-    </tr>
-  </tbody>
-</table>
-#if defined(CC) && defined(CXX) && defined(RUSTC)
-<h2>Build tools</h2>
-<table>
-  <tbody>
-    <tr>
-      <th>Compiler</th>
-      <th>Version</th>
-      <th>Compiler flags</th>
-    </tr>
-    <tr>
-      <td>@CC@</td>
-      <td>@CC_VERSION@</td>
-      <td>@CFLAGS@</td>
-    </tr>
-    <tr>
-      <td>@CXX@</td>
-      <td>@CC_VERSION@</td>
-      <td>@CXXFLAGS@</td>
-    </tr>
-    <tr>
-      <td>@RUSTC@</td>
-      <td>@RUSTC_VERSION@</td>
-      <td>@RUSTFLAGS@</td>
-    </tr>
-  </tbody>
-</table>
-#endif
-<h2>Configure options</h2>
-<p>@MOZ_CONFIGURE_OPTIONS@</p>
-#ifdef ANDROID
-<h2>Package name</h2>
-<p>@ANDROID_PACKAGE_NAME@</p>
-#endif
-</body>
+  <head>
+    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src chrome:; object-src 'none'" />
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width; user-scalable=false;">
+    <title>Build Configuration</title>
+    <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css">
+    <link rel="stylesheet" href="chrome://global/content/buildconfig.css" type="text/css">
+  </head>
+  <body>
+    <div class="container">
+      <h1>Build Configuration</h1>
+      #ifdef MOZ_SOURCE_URL
+      <h2>Source</h2>
+      <p>Built from <a href="@MOZ_SOURCE_URL@">@MOZ_SOURCE_URL@</a></p>
+      #endif
+      <h2>Build platform</h2>
+      <table class="build-platform-table">
+        <tbody>
+          <tr>
+            <th>target</th>
+          </tr>
+          <tr>
+            <td>@target@</td>
+          </tr>
+        </tbody>
+      </table>
+      #if defined(CC) && defined(CXX) && defined(RUSTC)
+      <h2>Build tools</h2>
+      <table>
+        <tbody>
+          <tr>
+            <th>Compiler</th>
+            <th>Version</th>
+            <th>Compiler flags</th>
+          </tr>
+          <tr>
+            <td>@CC@</td>
+            <td>@CC_VERSION@</td>
+            <td>@CFLAGS@</td>
+          </tr>
+          <tr>
+            <td>@CXX@</td>
+            <td>@CC_VERSION@</td>
+            <td>@CXXFLAGS@</td>
+          </tr>
+          <tr>
+            <td>@RUSTC@</td>
+            <td>@RUSTC_VERSION@</td>
+            <td>@RUSTFLAGS@</td>
+          </tr>
+        </tbody>
+      </table>
+      #endif
+      <h2>Configure options</h2>
+      <p>@MOZ_CONFIGURE_OPTIONS@</p>
+      #ifdef ANDROID
+      <h2>Package name</h2>
+      <p>@ANDROID_PACKAGE_NAME@</p>
+      #endif
+    </div>
+  </body>
 </html>

Compiler	Version	Compiler flags
@CC@	@CC_VERSION@	@CFLAGS@
@CXX@	@CC_VERSION@	@CXXFLAGS@
@RUSTC@	@RUSTC_VERSION@	@RUSTFLAGS@