diff --git a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
index 558cc78cf0..2a8e180e0d 100644
--- a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
+++ b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
@@ -41,6 +41,10 @@
   // @see https://github.com/w3c/preload/issues/32 regarding crossorigin
   <link rel="preload" href="{$staticResourcePath}/fonts/RobotoMono-Regular.woff2" as="font" type="font/woff2" crossorigin>{\n}
   <link rel="preload" href="{$staticResourcePath}/fonts/RobotoMono-Regular.woff" as="font" type="font/woff" crossorigin>{\n}
+  <link rel="preload" href="{$staticResourcePath}/fonts/Roboto.woff2" as="font" type="font/woff2" crossorigin>{\n}
+  <link rel="preload" href="{$staticResourcePath}/fonts/Roboto.woff" as="font" type="font/woff" crossorigin>{\n}
+  <link rel="preload" href="{$staticResourcePath}/fonts/Roboto-Medium.woff2" as="font" type="font/woff2" crossorigin>{\n}
+  <link rel="preload" href="{$staticResourcePath}/fonts/Roboto-Medium.woff" as="font" type="font/woff" crossorigin>{\n}
   <link rel="stylesheet" href="{$staticResourcePath}/styles/fonts.css">{\n}
   <link rel="stylesheet" href="{$staticResourcePath}/styles/main.css">{\n}
   <script src="{$staticResourcePath}/bower_components/webcomponentsjs/webcomponents-lite.js"></script>{\n}
diff --git a/lib/fonts/BUILD b/lib/fonts/BUILD
index 57429f3064..d4bb8307b8 100644
--- a/lib/fonts/BUILD
+++ b/lib/fonts/BUILD
@@ -3,8 +3,12 @@ load("//tools/bzl:genrule2.bzl", "genrule2")
 # Roboto Mono. Version 2.136
 # https://github.com/google/roboto/releases/tag/v2.136
 filegroup(
-    name = "robotomono",
+    name = "robotofonts",
     srcs = [
+        "Roboto.woff",
+        "Roboto.woff2",
+        "Roboto-Medium.woff",
+        "Roboto-Medium.woff2",
         "RobotoMono-Regular.woff",
         "RobotoMono-Regular.woff2",
     ],
diff --git a/lib/fonts/Roboto-Medium.woff b/lib/fonts/Roboto-Medium.woff
new file mode 100644
index 0000000000..720bd3e78e
Binary files /dev/null and b/lib/fonts/Roboto-Medium.woff differ
diff --git a/lib/fonts/Roboto-Medium.woff2 b/lib/fonts/Roboto-Medium.woff2
new file mode 100644
index 0000000000..c003fba4ff
Binary files /dev/null and b/lib/fonts/Roboto-Medium.woff2 differ
diff --git a/lib/fonts/Roboto.woff b/lib/fonts/Roboto.woff
new file mode 100644
index 0000000000..03e84eb50c
Binary files /dev/null and b/lib/fonts/Roboto.woff differ
diff --git a/lib/fonts/Roboto.woff2 b/lib/fonts/Roboto.woff2
new file mode 100644
index 0000000000..6fa4939186
Binary files /dev/null and b/lib/fonts/Roboto.woff2 differ
diff --git a/polygerrit-ui/BUILD b/polygerrit-ui/BUILD
index d4d2322672..31ab6aaef2 100644
--- a/polygerrit-ui/BUILD
+++ b/polygerrit-ui/BUILD
@@ -29,7 +29,7 @@ bower_component_bundle(
 genrule2(
     name = "fonts",
     srcs = [
-        "//lib/fonts:robotomono",
+        "//lib/fonts:robotofonts",
     ],
     outs = ["fonts.zip"],
     cmd = " && ".join([
diff --git a/polygerrit-ui/app/index.html b/polygerrit-ui/app/index.html
index 46fc46b90b..2a55898968 100644
--- a/polygerrit-ui/app/index.html
+++ b/polygerrit-ui/app/index.html
@@ -26,6 +26,10 @@ RobotoMono fonts are used in styles/fonts.css
 -->
 <link rel="preload" href="/fonts/RobotoMono-Regular.woff2" as="font" type="font/woff2" crossorigin>
 <link rel="preload" href="/fonts/RobotoMono-Regular.woff" as="font" type="font/woff" crossorigin>
+<link rel="preload" href="/fonts/Roboto.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/fonts/Roboto.woff" as="font" type="font/woff" crossorigin>
+<link rel="preload" href="/fonts/Roboto-Medium.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/fonts/Roboto-Medium.woff" as="font" type="font/woff" crossorigin>
 <link rel="stylesheet" href="/styles/fonts.css">
 <link rel="stylesheet" href="/styles/main.css">
 <script src="/bower_components/webcomponentsjs/webcomponents-lite.js"></script>
diff --git a/polygerrit-ui/app/rules.bzl b/polygerrit-ui/app/rules.bzl
index be80c13faf..a77ad50f74 100644
--- a/polygerrit-ui/app/rules.bzl
+++ b/polygerrit-ui/app/rules.bzl
@@ -72,7 +72,7 @@ def polygerrit_bundle(name, srcs, outs, app):
       name + "_app_sources",
       name + "_css_sources",
       name + "_top_sources",
-      "//lib/fonts:robotomono",
+      "//lib/fonts:robotofonts",
       "//lib/js:highlightjs_files",
       # we extract from the zip, but depend on the component for license checking.
       "@webcomponentsjs//:zipfile",
@@ -82,7 +82,7 @@ def polygerrit_bundle(name, srcs, outs, app):
     cmd = " && ".join([
       "mkdir -p $$TMP/polygerrit_ui/{styles,fonts,bower_components/{highlightjs,webcomponentsjs},elements}",
       "for f in $(locations " + name + "_app_sources); do ext=$${f##*.}; cp -p $$f $$TMP/polygerrit_ui/elements/"  + appName + ".$$ext; done",
-      "cp $(locations //lib/fonts:robotomono) $$TMP/polygerrit_ui/fonts/",
+      "cp $(locations //lib/fonts:robotofonts) $$TMP/polygerrit_ui/fonts/",
       "for f in $(locations " + name + "_top_sources); do cp $$f $$TMP/polygerrit_ui/; done",
       "for f in $(locations "+ name + "_css_sources); do cp $$f $$TMP/polygerrit_ui/styles; done",
       "for f in $(locations //lib/js:highlightjs_files); do cp $$f $$TMP/polygerrit_ui/bower_components/highlightjs/ ; done",