diff --git a/core/themes/seven/css/components/typography.css b/core/themes/seven/css/components/typography.css
index 08b2167..1871005 100644
--- a/core/themes/seven/css/components/typography.css
+++ b/core/themes/seven/css/components/typography.css
@@ -1,44 +1,4 @@
 /**
-* Header components.
-*/
-.header-a,
-.header-b,
-.header-c,
-.header-d,
-.header-e,
-.header-f {
-  font-weight: bold;
-}
-.header-a {
-  font-size: 20px;
-  font-size: 1.25rem;
-}
-.header-b {
-  font-size: 18px;
-  font-size: 1.125rem;
-}
-.header-c {
-  font-size: 16px;
-  font-size: 1rem;
-  text-transform: uppercase;
-}
-.header-d {
-  font-size: 15px;
-  font-size: 0.9375rem;
-  text-transform: uppercase;
-}
-.header-e {
-  font-size: 14px;
-  font-size: 0.875rem;
-  text-transform: uppercase;
-}
-.header-f {
-  font-size: 12px;
-  font-size: 0.75rem;
-  text-transform: uppercase;
-}
-
-/**
 * Vertical spacing.
 */
 .leader {
diff --git a/core/themes/seven/seven.base.css b/core/themes/seven/seven.base.css
index 98e4927..fc3b741 100644
--- a/core/themes/seven/seven.base.css
+++ b/core/themes/seven/seven.base.css
@@ -27,34 +27,53 @@ summary,
   font-weight: bold;
   text-transform: uppercase;
 }
+
 h1,
 h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.header-a,
+.header-b,
+.header-c,
+.header-d,
+.header-e,
+.header-f {
   font-weight: bold;
   margin: 10px 0;
 }
-h1 {
+h1,
+.header-a {
+  font-size: 20px;
   font-size: 1.25rem;
 }
-h2 {
+h2,
+.header-b {
+  font-size: 18px;
   font-size: 1.125rem;
 }
-h3 {
+h3,
+.header-c {
+  font-size: 16px;
   font-size: 1rem;
   text-transform: uppercase;
 }
-h4 {
+h4,
+.header-d {
+  font-size: 15px;
   font-size: 0.9375rem;
   text-transform: uppercase;
 }
-h5 {
+h5,
+.header-e {
+  font-size: 14px;
   font-size: 0.875rem;
   text-transform: uppercase;
 }
-h6 {
+h6,
+.header-f {
+  font-size: 12px;
   font-size: 0.75rem;
   text-transform: uppercase;
 }
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index eae4ac8..89c0e9d 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -113,10 +113,7 @@ ul.menu li.expanded {
 #branding .page-title {
   color: #333;
   display: inline-block;
-  margin: 0;
-  font-size: 1.625em;
   line-height: 1.875em;
-  font-weight: 600;
   -webkit-font-smoothing: antialiased;
 }
 [dir="rtl"] #branding h1.page-title {
@@ -950,10 +947,9 @@ div.admin-panel {
   border: 1px solid #ccc;
 }
 div.admin-panel h3 {
-  font-size: 0.923em;
+  font-size: 14px;
+  font-size: 0.875rem;
   text-transform: uppercase;
-  margin: 0;
-  padding-bottom: 9px;
 }
 
 /* admin/appearance */
@@ -961,12 +957,6 @@ div.admin-panel h3 {
   font-weight: normal;
   text-transform: uppercase;
 }
-.theme-selector h3 {
-  font-weight: normal;
-}
-.theme-default h3 {
-  font-weight: bold;
-}
 
 /* Update options. */
 div.admin-options {
@@ -1292,6 +1282,7 @@ details.fieldset-no-legend {
 
 .views-ui-display-tab-bucket h3 {
   font-size: 12px;
+  font-size: 0.75rem;
   text-transform: uppercase;
 }