diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 0b0dbebeaa1..e76cd38ac12 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -26,8 +26,8 @@
 /**
  * Defines the foundational APIs of the Java SE Platform.
  *
- * <dl>
- * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Providers:</dt>
+ * <dl class="notes">
+ * <dt>Providers:</dt>
  * <dd> The JDK implementation of this module provides an implementation of
  *      the {@index jrt jrt} {@linkplain java.nio.file.spi.FileSystemProvider
  *      file system provider} to enumerate and read the class and resource
diff --git a/src/java.management.rmi/share/classes/module-info.java b/src/java.management.rmi/share/classes/module-info.java
index 7a471066957..f6d652a22c4 100644
--- a/src/java.management.rmi/share/classes/module-info.java
+++ b/src/java.management.rmi/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, 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
@@ -27,8 +27,8 @@
  * Defines the {@linkplain javax.management.remote.rmi RMI connector}
  * for the Java Management Extensions (JMX) Remote API.
  *
- * <dl>
- * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Providers:</dt>
+ * <dl class="notes">
+ * <dt>Providers:</dt>
  * <dd>This module provides the
  * {@link javax.management.remote.JMXConnectorProvider} service,
  * which creates JMX connector clients using the RMI protocol.
diff --git a/src/java.se/share/classes/module-info.java b/src/java.se/share/classes/module-info.java
index ead253c550c..81b1bd3cb8a 100644
--- a/src/java.se/share/classes/module-info.java
+++ b/src/java.se/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -26,8 +26,8 @@
 /**
  * Defines the API of the Java SE Platform.
  *
- * <dl>
- * <dt class="simpleTagLabel" style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">Optional for the Java SE Platform:</dt>
+ * <dl class="notes">
+ * <dt>Optional for the Java SE Platform:</dt>
  * <dd>
  *   <a href="{@docRoot}/../specs/jni/index.html">Java Native Interface (JNI)</a><br>
  *   <a href="{@docRoot}/../specs/jvmti.html">Java Virtual Machine Tool Interface (JVM TI)</a><br>
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
index 629ef12fdab..df122cfc54b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css
@@ -282,6 +282,7 @@ main {
     position:relative;
 }
 dl.notes > dt {
+    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
     font-size:12px;
     font-weight:bold;
     margin:10px 0 0 0;
diff --git a/src/jdk.jconsole/share/classes/module-info.java b/src/jdk.jconsole/share/classes/module-info.java
index bac908afa41..d12d7391c7b 100644
--- a/src/jdk.jconsole/share/classes/module-info.java
+++ b/src/jdk.jconsole/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -27,8 +27,8 @@
  * Defines the JMX graphical tool, <em>{@index jconsole jconsole}</em>,
  * for monitoring and managing a running application.
  *
- * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
- * <dt class="simpleTagLabel">See Also:
+ * <dl class="notes">
+ * <dt>See Also:
  * <dd>{@extLink using_jconsole Using JConsole}
  * </dl>
  *