diff --git a/core/themes/bartik/css/base/elements.css b/core/themes/bartik/css/base/elements.css
index bc930d0..2625c9f 100644
--- a/core/themes/bartik/css/base/elements.css
+++ b/core/themes/bartik/css/base/elements.css
@@ -2,11 +2,12 @@
 
 body {
   line-height: 1.5;
-  font-size: 87.5%;
   word-wrap: break-word;
   margin: 0;
   padding: 0;
   border: 0;
+  font-family: Georgia, "Times New Roman", Times, serif;
+  font-size: 87.5%;
 }
 a {
   text-decoration: none;
@@ -21,6 +22,9 @@ a:focus,
   text-decoration: none;
   border-bottom-style: solid;
 }
+.link {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 .field-type-image a,
 h1 a,
 h2 a,
diff --git a/core/themes/bartik/css/base/typography.css b/core/themes/bartik/css/base/typography.css
deleted file mode 100644
index 906bd09..0000000
--- a/core/themes/bartik/css/base/typography.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ------------------ Fonts ------------------ */
-
-body,
-#site-slogan,
-.site-slogan,
-#page .ui-widget,
-.comment-form label,
-.node-form label,
-.node-form .description {
-  font-family: Georgia, "Times New Roman", Times, serif;
-}
-#header,
-#site-footer__wrapper,
-.skip-link,
-ul.contextual-links,
-ul.links,
-ul.primary,
-.pager__items,
-div.field-type-taxonomy-term-reference,
-div.messages,
-.node__meta,
-p.comment-time,
-table,
-.breadcrumb,
-.link {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-input,
-textarea,
-select,
-.form-button,
-a.button,
-button {
-  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
-}
diff --git a/core/themes/bartik/css/components/breadcrumb.css b/core/themes/bartik/css/components/breadcrumb.css
index 76f0695..a1f0dd2 100644
--- a/core/themes/bartik/css/components/breadcrumb.css
+++ b/core/themes/bartik/css/components/breadcrumb.css
@@ -4,5 +4,6 @@
  */
 
 .breadcrumb {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.929em;
 }
diff --git a/core/themes/bartik/css/components/buttons.css b/core/themes/bartik/css/components/buttons.css
index e2370e2..e4a5467 100644
--- a/core/themes/bartik/css/components/buttons.css
+++ b/core/themes/bartik/css/components/buttons.css
@@ -10,6 +10,7 @@
   border-right-color: #d2d2d2;
   color: #3a3a3a;
   cursor: pointer;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
   font-size: 0.929em;
   font-weight: normal;
   text-align: center;
diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 9d3edcf..031e06c 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -37,6 +37,7 @@
   line-height: 1.2;
 }
 .comment .submitted .comment-time {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.786em;
   color: #68696b;
 }
diff --git a/core/themes/bartik/css/components/content.css b/core/themes/bartik/css/components/content.css
index 1948af8..6c70680 100644
--- a/core/themes/bartik/css/components/content.css
+++ b/core/themes/bartik/css/components/content.css
@@ -42,6 +42,7 @@ h1#page-title {
   line-height: 1.6;
 }
 .node__meta {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.857em;
   color: #68696b;
   margin-bottom: -5px;
@@ -57,6 +58,7 @@ h1#page-title {
 }
 .field-type-taxonomy-term-reference {
   margin: 0 0 1.2em;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 .field-type-taxonomy-term-reference .field-label {
   font-weight: normal;
@@ -114,6 +116,7 @@ h1#page-title {
 }
 ul.links {
   color: #68696b;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.821em;
 }
 .node--unpublished,
@@ -195,3 +198,6 @@ ul.links {
 [dir="rtl"] .region-content ol {
   padding: 0 15px 0.25em 0;
 }
+#page .ui-widget {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
diff --git a/core/themes/bartik/css/components/contextual.css b/core/themes/bartik/css/components/contextual.css
index 2790352..f142862 100644
--- a/core/themes/bartik/css/components/contextual.css
+++ b/core/themes/bartik/css/components/contextual.css
@@ -6,3 +6,6 @@
   font-size: 0.923em;
   text-shadow: 0 0 0 !important;
 }
+.contextual-links {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
diff --git a/core/themes/bartik/css/components/footer.css b/core/themes/bartik/css/components/footer.css
index 59d3fe3..a1f9f76 100644
--- a/core/themes/bartik/css/components/footer.css
+++ b/core/themes/bartik/css/components/footer.css
@@ -1,5 +1,8 @@
 /* ------------------ Footer ------------------ */
 
+#footer-wrapper {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 #site-footer__wrapper .block .content {
   color: #c0c0c0;
   color: rgba(255, 255, 255, 0.65);
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 7eea1ec..69a0a72 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -55,6 +55,11 @@ label {
 label[for] {
   cursor: pointer;
 }
+input,
+textarea,
+select {
+  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
+}
 input {
   margin: 2px 0;
   padding: 4px;
@@ -136,7 +141,10 @@ input.form-submit:focus {
 #edit-body {
   margin-bottom: 2em;
 }
-
+.node-form label,
+.node-form .description {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 .node-form .form-wrapper {
   margin-bottom: 2em;
 }
@@ -188,6 +196,7 @@ input.form-submit:focus {
 /* Comment form */
 .comment-form label {
   float: left; /* LTR */
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.929em;
   width: 120px;
 }
diff --git a/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css
index b7c18e5..0d4cb58 100644
--- a/core/themes/bartik/css/components/header.css
+++ b/core/themes/bartik/css/components/header.css
@@ -1,4 +1,7 @@
 /* ------------------ Header ------------------ */
+#header {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 #logo,
 .site-logo {
   float: left; /* LTR */
@@ -77,6 +80,7 @@ h1.site-name {
 }
 #site-slogan,
 .site-slogan {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.929em;
   margin-top: 7px;
   word-spacing: 0.1em;
diff --git a/core/themes/bartik/css/components/messages.css b/core/themes/bartik/css/components/messages.css
index 880efa1..5c46ce5 100644
--- a/core/themes/bartik/css/components/messages.css
+++ b/core/themes/bartik/css/components/messages.css
@@ -3,6 +3,7 @@
 #messages {
   padding: 20px 0 5px;
   margin: 0 auto;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 .featured #messages {
   background: #f0f0f0;
diff --git a/core/themes/bartik/css/components/pager.css b/core/themes/bartik/css/components/pager.css
index 77eab8b..9a5d91d 100644
--- a/core/themes/bartik/css/components/pager.css
+++ b/core/themes/bartik/css/components/pager.css
@@ -2,6 +2,7 @@
 
 .pager .pager__items {
   padding: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 .pager__item {
   font-size: 0.929em;
diff --git a/core/themes/bartik/css/components/skip-link.css b/core/themes/bartik/css/components/skip-link.css
index bea3631..26c67bb 100644
--- a/core/themes/bartik/css/components/skip-link.css
+++ b/core/themes/bartik/css/components/skip-link.css
@@ -23,6 +23,7 @@
   background: rgba(0, 0, 0, 0.6);
   color: #fff;
   display: inline-block;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.94em;
   line-height: 1.7;
   padding: 1px 10px 2px 10px;
diff --git a/core/themes/bartik/css/components/table.css b/core/themes/bartik/css/components/table.css
index 313f915..964fd63 100644
--- a/core/themes/bartik/css/components/table.css
+++ b/core/themes/bartik/css/components/table.css
@@ -3,6 +3,7 @@
 table {
   border: 0;
   border-spacing: 0;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
   font-size: 0.857em;
   margin: 10px 0;
   width: 100%;
diff --git a/core/themes/bartik/css/components/tabs.css b/core/themes/bartik/css/components/tabs.css
index 00f8e70..22bce7d 100644
--- a/core/themes/bartik/css/components/tabs.css
+++ b/core/themes/bartik/css/components/tabs.css
@@ -4,6 +4,9 @@ div.tabs {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   margin-bottom: 20px;
 }
+.tabs ul.primary {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 .tabs ul.primary li a {
   color: #000;
   background-color: #ededed;