diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index 67216781a713cc36b55e4a74d1a1b45ca0f2ab64..f2ef534545ca3216058a04023cd2513380b93e91 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -17,7 +17,7 @@ body {
 }
 .tabs ul.primary li.active a {
   background-color: #ffffff;
-  border-bottom: 1px solid #ffffff;
+  border-bottom-color: #ffffff;
 }
 #header {
   background-color: #1d84c3;
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 829deb94f39c9571baf62db230ae4ecc17f0f3fb..be6ebfe6ab178f68646f6a66291d5d230026dc0d 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -1256,31 +1256,6 @@ div.tabs {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   margin-bottom: 20px;
 }
-.tabs ul.primary {
-  border-collapse: collapse;
-  height: auto;
-  line-height: normal;
-  padding: 0 3px;
-  margin: 0;
-  overflow: hidden;
-  border: none;
-  background: transparent url(../images/tabs-border.png) repeat-x left bottom;
-  white-space: nowrap;
-}
-.tabs ul.primary li {
-  display: block;
-  float: left; /* LTR */
-  vertical-align: bottom;
-  margin: 0 5px 0 0; /* LTR */
-}
-[dir="rtl"] .tabs ul.primary li {
-  margin: 0 0 0 5px;
-  float: right;
-  zoom: 1;
-}
-.tabs ul.primary li.active a {
-  border-bottom: 1px solid #ffffff;
-}
 .tabs ul.primary li a {
   color: #000;
   background-color: #ededed;
@@ -1291,17 +1266,60 @@ div.tabs {
   line-height: 1.9;
   display: block;
   font-size: 0.929em;
-  float: left; /* not LTR */
   padding: 0 10px 3px;
   margin: 0;
   text-shadow: 0 1px 0 #fff;
-  border-top-left-radius: 6px;
-  border-top-right-radius: 6px;
 }
 .tabs ul.primary li.active a {
   background-color: #ffffff;
   border: 1px solid #bbb;
-  border-bottom: 1px solid #fff;
+}
+@media screen and (max-width: 37.5em) { /* 600px */
+  .tabs ul.primary {
+    border-bottom: 1px solid #bbb;
+  }
+  .tabs ul.primary li {
+    display: block;
+    margin: 0;
+  }
+  .tabs ul.primary li a {
+    padding: 5px 10px;
+  }
+  .tabs ul.primary li.active a {
+    border-bottom: none;
+  }
+}
+@media screen and (min-width: 37.5em) { /* 600px */
+  .tabs ul.primary {
+    border-collapse: collapse;
+    height: auto;
+    line-height: normal;
+    padding: 0 3px;
+    margin: 0;
+    overflow: hidden;
+    border: none;
+    background: transparent url(../images/tabs-border.png) repeat-x left bottom;
+    white-space: nowrap;
+  }
+  .tabs ul.primary li {
+    display: block;
+    float: left; /* LTR */
+    vertical-align: bottom;
+    margin: 0 5px 0 0; /* LTR */
+  }
+  [dir="rtl"] .tabs ul.primary li {
+    margin: 0 0 0 5px;
+    float: right;
+    zoom: 1;
+  }
+  .tabs ul.primary li a {
+    float: left; /* not LTR */
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+  }
+  .tabs ul.primary li.active a {
+    border-bottom: 1px solid #fff;
+  }
 }
 .tabs ul.secondary {
   border-bottom: none;
@@ -2040,6 +2058,14 @@ div.admin-panel .description {
   }
 }
 
+/* ---------- Input fields ---------- */
+@media screen and (max-width: 60em) { /* 920px */
+  input,
+  textarea {
+    font-size: 1.142857143em;
+  }
+}
+
 /* ---------- Views styling ---------- */
 
 /* @group Lists */