diff --git a/make/data/docs-resources/resources/jdk-default.css b/make/data/docs-resources/resources/jdk-default.css
index 371f3ba00b9..29f4f43764f 100644
--- a/make/data/docs-resources/resources/jdk-default.css
+++ b/make/data/docs-resources/resources/jdk-default.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,56 +23,62 @@
  * questions.
  */
 
+@import url('../api/resource-files/fonts/dejavu.css');
+
 body {
-  margin: 2em 2em;
   font-family: DejaVu Sans, Bitstream Vera Sans, Luxi Sans, Verdana, Arial, Helvetica, sans-serif;
   font-size: 10pt;
+  margin: 0;
+  padding: 0;
+  height: 100%;
+  width: 100%;
+  min-width: 100%;
   line-height: 1.4;
 }
 
 pre, code, tt {
-  font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono,
-    Courier New, monospace;
+    font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono, Courier New, monospace;
+}
+
+main, footer {
+  margin: 16px 27px;
+}
+
+/* Adjust horizontal margin for content elements outside of main element */
+:is(body, header) > :is(nav, h1, h2, h3, h4, h5, h6, p, .sub-title) {
+    margin-left: 27px;
+    margin-right: 27px;
 }
 
 blockquote {
-  margin: 1.5ex 0em 1.5ex 2em;
+  margin: 1.5ex 0 1.5ex 2em;
 }
 
 p {
-  padding: 0pt;
-  margin: 1ex 0em;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
 }
 
-p:first-child, pre:first-child { margin-top: 0pt; }
-
-h1 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 2ex .5ex 1ex 0pt;
+dd > p:first-child, pre:first-child {
+  margin-top: 0;
 }
 
 h1:first-child, h2:first-child {
-  margin-top: 0ex;
+  margin-top: 0;
 }
 
-h2 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 2ex 0pt 1ex 0pt;
+h1, h2 {
+  margin-top: 2ex;
+  margin-bottom: 1ex;
 }
 
-h3 {
-  font-weight: bold;
-  padding: 0pt;
-  margin: 1.5ex 0pt 1ex 0pt;
+h3, h4, h5 {
+  margin-top: 1.5ex;
+  margin-bottom: 1ex;
 }
 
 h4, h5 {
   font-size: 100%;
-  font-weight: bold;
-  padding: 0pt;
-  margin: 1.5ex 0pt 1ex 0pt;
 }
 
 .subtitle {
@@ -100,7 +106,7 @@ a[href]:hover {
 }
 
 a img {
-  border-width: 0px;
+  border-width: 0;
 }
 
 img {
@@ -154,9 +160,9 @@ table.centered td {
 
 .draft-header {
   text-align: center;
-  font-size: 80%;
+  font-size: 11.2px;
   padding: 6px;
-  margin: -2.5em -2.5em 2.5em -2.5em;
+  line-height: initial;
 }
 
 .legal-footer {
@@ -183,29 +189,31 @@ nav#TOC ul ul li::before {
     content: " \2022  "
 }
 
-header#title-block-header {
-    margin-top:-2em;
+/* Rules below replicate sizing of navigation bar in API docs */
+header#title-block-header div.navbar {
+    padding: 0 20px 0 26px;
+    margin-bottom: 30px;
+    background-color: #4D7A97;
+    color: #FFFFFF;
+    height: 44px;
+    overflow: hidden;
+    font-size: 0.857em;
+    line-height: initial;
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: center;
 }
 
-header#title-block-header div.navbar {
-    margin: 0 -2.5em 2.5em -2.5em;
-    padding: 0 2.5em;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    width:100%;
-    clear:right;
-    min-height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px;
+header#title-block-header div.navbar nav {
+    flex: 1 1 auto;
+    font-size: 12px;
+    white-space: nowrap;
 }
 
 header#title-block-header div.navbar div {
-    float:right;
-    font-size:11px;
-    height:2.9em;
-    margin: auto 0;
+    flex: 0 0 auto;
+    font-size: 10.978px;
+    white-space: nowrap;
 }
 
 header#title-block-header ul {