diff -u b/core/themes/bartik/css/components/content.css b/core/themes/bartik/css/components/content.css
--- b/core/themes/bartik/css/components/content.css
+++ b/core/themes/bartik/css/components/content.css
@@ -25,111 +25,6 @@
   font-size: 1.429em;
   line-height: 1.4;
 }
-.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;
-  margin: 0;
-  padding-right: 5px; /* LTR */
-}
-[dir="rtl"] .field-type-taxonomy-term-reference .field-label {
-  padding-left: 5px;
-  padding-right: 0;
-}
-.field-type-taxonomy-term-reference .field-label,
-.field-type-taxonomy-term-reference ul.links {
-  font-size: 0.8em;
-}
-.node--view-mode-teaser .field-type-taxonomy-term-reference .field-label,
-.node--view-mode-teaser .field-type-taxonomy-term-reference ul.links {
-  font-size: 0.821em;
-}
-.field-type-taxonomy-term-reference ul.links {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-.field-type-taxonomy-term-reference ul.links li {
-  float: left; /* LTR */
-  padding: 0 1em 0 0; /* LTR */
-  white-space: nowrap;
-}
-[dir="rtl"] .field-type-taxonomy-term-reference ul.links li {
-  padding: 0 0 0 1em;
-  float: right;
-}
-.field-type-image img,
-.field-name-field-user-picture img {
-  margin: 0 0 1em;
-}
-ul.links {
-  color: #68696b;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 0.821em;
-}
-.node-preview-container {
-  background: #d1e8f5;
-  background-image: -webkit-linear-gradient(top, #d1e8f5, #d3e8f4);
-  background-image: linear-gradient(to bottom, #d1e8f5, #d3e8f4);
-  font-family: Arial, sans-serif;
-  box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3333);
-  position: fixed;
-  z-index: 499;
-  width: 100%;
-  padding: 10px;
-}
-.node-preview-backlink {
-  background-color: #419ff1;
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, -webkit-linear-gradient(top, #419ff1, #1076d5);
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, linear-gradient(to bottom, #419ff1, #1076d5); /* LTR */
-  border: 1px solid #0048c8;
-  border-radius: .4em;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, .4);
-  color: #fff;
-  font-size: 0.9em;
-  line-height: normal;
-  margin: 0;
-  padding: 4px 1em 4px 0.6em; /* LTR */
-  text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5);
-}
-[dir="rtl"] .node-preview-backlink {
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, -webkit-linear-gradient(top, #419ff1, #1076d5);
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, linear-gradient(to bottom, #419ff1, #1076d5);
-  padding: 4px 0.6em 4px 1em;
-  float: right;
-}
-.node-preview-backlink:focus,
-.node-preview-backlink:hover {
-  background-color: #419cf1;
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, -webkit-linear-gradient(top, #59abf3, #2a90ef);
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, linear-gradient(to bottom, #59abf3, #2a90ef); /* LTR */
-  border: 1px solid #0048c8;
-  text-decoration: none;
-  color: #fff;
-}
-[dir="rtl"] .node-preview-backlink:focus,
-[dir="rtl"] .node-preview-backlink:hover {
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, -webkit-linear-gradient(top, #59abf3, #2a90ef);
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, linear-gradient(to bottom, #59abf3, #2a90ef);
-}
-.node-preview-backlink:active {
-  background-color: #0e69be;
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, -webkit-linear-gradient(top, #0e69be, #2a93ef);
-  background: url(../../../../misc/icons/000000/chevron-left.svg) left no-repeat, linear-gradient(to bottom, #0e69be, #2a93ef); /* LTR */
-  border: 1px solid #0048c8;
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, .25);
-}
-.node-preview-backlink:active {
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, -webkit-linear-gradient(top, #0e69be, #2a93ef);
-  background: url(../../../../misc/icons/000000/chevron-right.svg) right no-repeat, linear-gradient(to bottom, #0e69be, #2a93ef);
-}
-.node-preview-backlink::before {
-  content: '';
-  width: 10px;
-  display: inline-block;
-}
 .region-content ul,
 .region-content ol {
   margin: 1em 0;
diff -u b/core/themes/bartik/css/components/node.css b/core/themes/bartik/css/components/node.css
--- b/core/themes/bartik/css/components/node.css
+++ b/core/themes/bartik/css/components/node.css
@@ -14,104 +13,0 @@
-.node--view-mode-teaser h2 {
-  margin-top: 0;
-  padding-top: 0.5em;
-}
-.node--view-mode-teaser h2 a {
-  color: #181818;
-}
-.node--view-mode-teaser {
-  border-bottom: 1px solid #d3d7d9;
-  margin-bottom: 30px;
-  padding-bottom: 15px;
-}
-.node--view-mode-teaser.node--sticky {
-  background: #f9f9f9;
-  background: rgba(0, 0, 0, 0.024);
-  border: 1px solid #d3d7d9;
-  padding: 0 15px 15px;
-}
-.node--view-mode-teaser .node__content {
-  clear: none;
-  line-height: 1.6;
-}
-.node__meta {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 0.857em;
-  color: #68696b;
-  margin-bottom: -5px;
-}
-.node__meta .field-name-field-user-picture img {
-  float: left; /* LTR */
-  margin: 1px 20px 0 0; /* LTR */
-}
-[dir="rtl"] .node__meta .field-name-field-user-picture img {
-  float: right;
-  margin-left: 20px;
-  margin-right: 0;
-}
-.node__metadata {
-  font-size: 0.857em;
-  color: #68696b;
-  margin-bottom: -5px;
-}
-.node__metadata .field-name-field-user-picture img {
-  float: left; /* LTR */
-  margin: 1px 20px 0 0; /* LTR */
-}
-[dir="rtl"] .node__metadata .field-name-field-user-picture img {
-  float: right;
-  margin-left: 20px;
-  margin-right: 0;
-}
-.node--view-mode-teaser .field-type-taxonomy-term-reference .field-label,
-.node--view-mode-teaser .field-type-taxonomy-term-reference ul.links {
-  font-size: 0.821em;
-}
-.node__links {
-  text-align: right;
-}
-[dir="rtl"] .node__links {
-  text-align: left;
-  margin-right: 236px;
-  margin-left: 0;
-}
-@media all and (min-width: 560px) {
-  .node .field-type-image {
-    float: left; /* LTR */
-    margin: 0 1em 0 0; /* LTR */
-  }
-  [dir="rtl"] .node .field-type-image {
-    float: right;
-    margin: 0 0 0 1em;
-  }
-  .node .field-type-image  .field-type-image {
-    clear: both;
-  }
-}
-.node--unpublished {
-  padding: 20px 15px 0;
-}
-.node--unpublished .comment-text .comment-arrow {
-  border-left: 1px solid #fff4f4;
-  border-right: 1px solid #fff4f4;
-}
-/* ----------------- Content ------------------ */
-
-.content,
-.node__content {
-  margin-top: 10px;
-}
-h1#page-title {
-  font-size: 2em;
-  line-height: 1;
-}
-#content h2 {
-  margin-bottom: 2px;
-  font-size: 1.429em;
-  line-height: 1.4;
-}
-.node__content {
-  font-size: 1.071em;
-}
-.node--view-mode-teaser .node__content {
-  font-size: 1em;
-}
@@ -152,78 +48,29 @@
   margin-left: 20px;
   margin-right: 0;
 }
-.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;
-  margin: 0;
-  padding-right: 5px; /* LTR */
-}
-[dir="rtl"] .field-type-taxonomy-term-reference .field-label {
-  padding-left: 5px;
-  padding-right: 0;
-}
-.field-type-taxonomy-term-reference .field-label,
-.field-type-taxonomy-term-reference ul.links {
-  font-size: 0.8em;
-}
-.node--view-mode-teaser .field-type-taxonomy-term-reference .field-label,
-.node--view-mode-teaser .field-type-taxonomy-term-reference ul.links {
-  font-size: 0.821em;
-}
-.field-type-taxonomy-term-reference ul.links {
-  padding: 0;
-  margin: 0;
-  list-style: none;
+.node__metadata {
+  font-size: 0.857em;
+  color: #68696b;
+  margin-bottom: -5px;
 }
-.field-type-taxonomy-term-reference ul.links li {
+.node__metadata .field-name-field-user-picture img {
   float: left; /* LTR */
-  padding: 0 1em 0 0; /* LTR */
-  white-space: nowrap;
+  margin: 1px 20px 0 0; /* LTR */
 }
-[dir="rtl"] .field-type-taxonomy-term-reference ul.links li {
-  padding: 0 0 0 1em;
+[dir="rtl"] .node__metadata .field-name-field-user-picture img {
   float: right;
+  margin-left: 20px;
+  margin-right: 0;
 }
-.node__links {
-  text-align: right; /* LTR */
-}
-[dir="rtl"] .node__links {
-  text-align: left;
-}
-@media all and (min-width: 560px) {
-  .node .field-type-image {
-    float: left; /* LTR */
-    margin: 0 1em 0 0; /* LTR */
-  }
-  [dir="rtl"] .node .field-type-image {
-    float: right;
-    margin: 0 0 0 1em;
-  }
-  .node .field-type-image + .field-type-image {
-    clear: both;
-  }
-}
-.field-type-image img,
-.field-name-field-user-picture img {
-  margin: 0 0 1em;
+.node--view-mode-teaser .field-type-taxonomy-term-reference .field-label,
+.node--view-mode-teaser .field-type-taxonomy-term-reference ul.links {
+  font-size: 0.821em;
 }
 ul.links {
   color: #68696b;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 0.821em;
 }
-.node--unpublished,
-.unpublished {
-  padding: 20px 15px 0;
-}
-.node--unpublished .comment-text .comment-arrow,
-.unpublished .comment-text .comment-arrow {
-  border-left: 1px solid #fff4f4;
-  border-right: 1px solid #fff4f4;
-}
 .node-preview-container {
   background: #d1e8f5;
   background-image: -webkit-linear-gradient(top, #d1e8f5, #d3e8f4);
@@ -287,13 +134,29 @@
 }
-.region-content ul,
-.region-content ol {
-  margin: 1em 0;
-  padding: 0 0 0.25em 15px; /* LTR */
-}
-[dir="rtl"] .region-content ul,
-[dir="rtl"] .region-content ol {
-  padding: 0 15px 0.25em 0;
+.node__links {
+  text-align: right;
 }
-#page .ui-widget {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+[dir="rtl"] .node__links {
+  text-align: left;
+  margin-right: 236px;
+  margin-left: 0;
+}
+@media all and (min-width: 560px) {
+  .node .field-type-image {
+    float: left; /* LTR */
+    margin: 0 1em 0 0; /* LTR */
+  }
+  [dir="rtl"] .node .field-type-image {
+    float: right;
+    margin: 0 0 0 1em;
+  }
+  .node .field-type-image  .field-type-image {
+    clear: both;
+  }
+}
+.node--unpublished {
+  padding: 20px 15px 0;
+}
+.node--unpublished .comment-text .comment-arrow {
+  border-left: 1px solid #fff4f4;
+  border-right: 1px solid #fff4f4;
 }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/themes/bartik/css/components/field.css
@@ -0,0 +1,40 @@
+/* ----------------- Field ------------------ */
+.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;
+  margin: 0;
+  padding-right: 5px; /* LTR */
+}
+[dir="rtl"] .field-type-taxonomy-term-reference .field-label {
+  padding-left: 5px;
+  padding-right: 0;
+}
+.field-type-taxonomy-term-reference .field-label,
+.field-type-taxonomy-term-reference ul.links {
+  font-size: 0.8em;
+}
+.node--view-mode-teaser .field-type-taxonomy-term-reference .field-label,
+.node--view-mode-teaser .field-type-taxonomy-term-reference ul.links {
+  font-size: 0.821em;
+}
+.field-type-taxonomy-term-reference ul.links {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+.field-type-taxonomy-term-reference ul.links li {
+  float: left; /* LTR */
+  padding: 0 1em 0 0; /* LTR */
+  white-space: nowrap;
+}
+[dir="rtl"] .field-type-taxonomy-term-reference ul.links li {
+  padding: 0 0 0 1em;
+  float: right;
+}
+.field-type-image img,
+.field-name-field-user-picture img {
+  margin: 0 0 1em;
+}
\ No newline at end of file