diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less
index 76f67b8e5..ecd2b87d7 100755
--- a/src/definitions/elements/button.less
+++ b/src/definitions/elements/button.less
@@ -37,7 +37,6 @@
   margin: 0em @horizontalMargin @verticalMargin 0em;
   padding: @verticalPadding @horizontalPadding (@verticalPadding + @shadowOffset);
 
-  font-family: @pageFont;
   text-transform: @textTransform;
   text-shadow: @textShadow;
   font-weight: @fontWeight;
diff --git a/src/definitions/elements/header.less b/src/definitions/elements/header.less
index d9c492de0..0ab1f4dc8 100755
--- a/src/definitions/elements/header.less
+++ b/src/definitions/elements/header.less
@@ -25,7 +25,6 @@
 /* Standard */
 .ui.header {
   border: none;
-  font-family: @headerFont;
   margin: @margin;
   padding: @verticalPadding @horizontalPadding;
   font-weight: @fontWeight;
@@ -86,27 +85,6 @@
 }
 
 
-/*--------------
-  Page Heading
----------------*/
-
-h1.ui.header {
-  min-height: 1rem;
-  font-size: @h1;
-}
-h2.ui.header {
-  font-size: @h2;
-}
-h3.ui.header {
-  font-size: @h3;
-}
-h4.ui.header {
-  font-size: @h4;
-}
-h5.ui.header {
-  font-size: @h5;
-}
-
 /*--------------
  Content Heading
 ---------------*/
@@ -542,7 +520,7 @@ a.ui.inverted.yellow.header:hover {
         Sizing
 --------------------*/
 
-.ui.header {
+.ui.header:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6) {
   font-size: @medium;
 }