diff --git a/war/src/main/less/base/typography.less b/war/src/main/less/base/typography.less
index c6cea98695d73..b62b0c2713e81 100644
--- a/war/src/main/less/base/typography.less
+++ b/war/src/main/less/base/typography.less
@@ -57,32 +57,32 @@ h6,
 
 h1,
 .h1 {
-  font-size: 1.7rem;
+  font-size: 1.6rem;
 }
 
 h2,
 .h2 {
-  font-size: 1.5rem;
+  font-size: 1.4rem;
 }
 
 h3,
 .h3 {
-  font-size: 1.3rem;
+  font-size: 1.2rem;
 }
 
 h4,
 .h4 {
-  font-size: 1.1rem;
+  font-size: 1rem;
 }
 
 h5,
 .h5 {
-  font-size: 0.9rem;
+  font-size: 0.8rem;
 }
 
 h6,
 .h6 {
-  font-size: 0.7rem;
+  font-size: 0.6rem;
 }
 
 .jenkins-description {
diff --git a/war/src/main/less/form/checkbox.less b/war/src/main/less/form/checkbox.less
index 226067380b733..d7ae98b74634b 100644
--- a/war/src/main/less/form/checkbox.less
+++ b/war/src/main/less/form/checkbox.less
@@ -81,7 +81,7 @@
   margin: 0;
   cursor: pointer;
   line-height: 22px;
-  font-weight: 600;
+  font-weight: var(--form-label-font-weight);
 
   &::before {
     content: "";
diff --git a/war/src/main/less/form/radio.less b/war/src/main/less/form/radio.less
index ee668b3d45f9a..25602daa1bec5 100644
--- a/war/src/main/less/form/radio.less
+++ b/war/src/main/less/form/radio.less
@@ -58,7 +58,7 @@
     margin-bottom: 0;
     padding: 0 0 5px 32px;
     cursor: pointer;
-    font-weight: 600;
+    font-weight: var(--form-label-font-weight);
     // remove 300ms pause on mobile
     touch-action: manipulation;
 
diff --git a/war/src/main/less/modules/app-bar.less b/war/src/main/less/modules/app-bar.less
index dba61ad8aab5f..401585c0a2cd7 100644
--- a/war/src/main/less/modules/app-bar.less
+++ b/war/src/main/less/modules/app-bar.less
@@ -32,6 +32,6 @@
 
   h1 {
     margin: 0;
-    font-size: 1.7rem;
+    font-size: 1.6rem;
   }
 }