diff --git a/core/themes/bartik/css/base/elements.css b/core/themes/bartik/css/base/elements.css
index 8cd377f..f677e68 100644
--- a/core/themes/bartik/css/base/elements.css
+++ b/core/themes/bartik/css/base/elements.css
@@ -68,13 +68,7 @@ p {
 del {
   text-decoration: line-through;
 }
-input,
-textarea,
-select,
-button,
-table {
-  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
-}
+
 
 /* ------------------ Reset Styles ------------------ */
 
diff --git a/core/themes/bartik/css/components/buttons.css b/core/themes/bartik/css/components/buttons.css
index e2370e2..8fb7d2d 100644
--- a/core/themes/bartik/css/components/buttons.css
+++ b/core/themes/bartik/css/components/buttons.css
@@ -1,5 +1,7 @@
 /* ---------------- Buttons    ---------------- */
-
+button {
+  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
+}
 .button {
   background-color: #fff;
   background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 82377ad..ffd6f6c 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -10,6 +10,11 @@ form {
   margin: 0;
   padding: 0;
 }
+input,
+textarea,
+select {
+  font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
+}
 fieldset {
   margin: 1em 0;
 }
diff --git a/core/themes/bartik/css/components/skip-link.css b/core/themes/bartik/css/components/skip-link.css
index 7f20d6f..32cf130 100644
--- a/core/themes/bartik/css/components/skip-link.css
+++ b/core/themes/bartik/css/components/skip-link.css
@@ -16,7 +16,7 @@
   background: rgba(0, 0, 0, 0.6);
   color: #fff;
   display: inline-block;
-  font: 0.94em font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font: 0.94em "Helvetica Neue", Helvetica, Arial, sans-serif;
   line-height: 1.7;
   padding: 1px 10px 2px 10px;
   text-decoration: none;
diff --git a/core/themes/bartik/css/components/table.css b/core/themes/bartik/css/components/table.css
index 0173e34..07bae36 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%;