diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index 3334d947acf862275893311dfa9eec53651ce67b..5a1387d47c7f7b73d473b37f3b57144b91bfd665 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -15,6 +15,7 @@ global-styling:
       # @see https://www.drupal.org/node/2389735
       css/components/dropbutton.component.css: {}
       css/components/featured-top.css: {}
+      css/components/feed-icon.css: {}
       css/components/form.css: {}
       css/components/forum.css: {}
       css/components/header.css: {}
@@ -35,6 +36,7 @@ global-styling:
       css/components/table.css: {}
       css/components/tabs.css: {}
       css/components/tips.css: {}
+      css/components/toolbar.css: {}
       css/components/featured-bottom.css: {}
       css/components/user.css: {}
       # @see https://www.drupal.org/node/2389735
diff --git a/core/themes/bartik/css/base/elements.css b/core/themes/bartik/css/base/elements.css
index 5565dd845fc2f31b92515828651a10076301c9dc..3b8489694350c75dc72c65109c2a26b9dad67169 100644
--- a/core/themes/bartik/css/base/elements.css
+++ b/core/themes/bartik/css/base/elements.css
@@ -1,4 +1,8 @@
-/* ---------- Overall Specifications ---------- */
+/**
+ * @file
+ * Overall specifications for Bartik.
+ */
+
 html {
   height: 100%;
 }
@@ -6,13 +10,11 @@ body {
   min-height: 100%;
   line-height: 1.5;
   word-wrap: break-word;
-  margin: 0;
-  padding: 0;
-  border: 0;
   font-family: Georgia, "Times New Roman", Times, serif;
   font-size: 87.5%;
 }
-a {
+a,
+a.link {
   text-decoration: none;
   border-bottom: 1px dotted;
 }
@@ -28,19 +30,14 @@ a:focus,
 .link {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-.field-type-image a,
 h1 a,
-h2 a,
-[role*=banner] a,
-.feed-icon,
-.contextual-links a,
-.toolbar a {
-  border-bottom: none !important;
+h2 a {
+  border-bottom: none;
 }
 
 /**
  * Reusable heading classes are included to help modules change the styling of
- * headings on a page without affecting accessibility
+ * headings on a page without affecting accessibility.
  */
 h1,
 .heading-a {
@@ -90,8 +87,6 @@ del {
   text-decoration: line-through;
 }
 
-/* ------------------ Reset Styles ------------------ */
-
 blockquote {
   background: #f7f7f7;
   border-left: 1px solid #bbb; /* LTR */
@@ -109,7 +104,7 @@ blockquote:before {
   font-size: 3em;
   line-height: 0.1em;
   margin-right: 0.2em; /* LTR */
-  vertical-align: -.4em;
+  vertical-align: -0.4em;
 }
 [dir="rtl"] blockquote:before {
   content: "\201D";
@@ -121,7 +116,7 @@ blockquote:after {
   content: "\201D";
   font-size: 3em;
   line-height: 0.1em;
-  vertical-align: -.45em;
+  vertical-align: -0.45em;
 }
 [dir="rtl"] blockquote:after {
   content: "\201C";
@@ -129,12 +124,7 @@ blockquote:after {
 blockquote > p:first-child {
   display: inline;
 }
-a.feed-icon {
-  display: inline-block;
-  padding: 15px 0 0 0;
-}
 img {
   max-width: 100%;
   height: auto;
-  border: 0;
 }
diff --git a/core/themes/bartik/css/components/content.css b/core/themes/bartik/css/components/content.css
index 5f899f9dfa5d35dc57e95a3d0102169a103fb0ee..cf436e857791e6e10f0ed87539e2358f35d8b00b 100644
--- a/core/themes/bartik/css/components/content.css
+++ b/core/themes/bartik/css/components/content.css
@@ -154,6 +154,9 @@ h1#page-title {
 .field-name-field-user-picture img {
   margin: 0 0 1em;
 }
+.field-type-image a {
+  border-bottom: none;
+}
 ul.links {
   color: #68696b;
   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 dadf61e45aa02319289a5040adda856211705d48..1e4d2a9b4139c8211c5fc15e3e3689ab25fe3d78 100644
--- a/core/themes/bartik/css/components/contextual.css
+++ b/core/themes/bartik/css/components/contextual.css
@@ -1,10 +1,16 @@
+/**
+ * @file
+ * Contextual links styles for Bartik.
+ */
+
 #header .contextual .trigger,
 .site-footer .contextual .trigger {
   border: none;
 }
 .contextual-region .contextual .contextual-links a {
+  border-bottom: none;
   font-size: 0.923em;
-  text-shadow: 0 0 0 !important;
+  text-shadow: 0 0 0;
 }
 .contextual-links {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/core/themes/bartik/css/components/feed-icon.css b/core/themes/bartik/css/components/feed-icon.css
new file mode 100644
index 0000000000000000000000000000000000000000..0189eeb08ce497b51649d73445de989fdec732ee
--- /dev/null
+++ b/core/themes/bartik/css/components/feed-icon.css
@@ -0,0 +1,10 @@
+/**
+ * @file
+ * Feed icon styles for Bartik.
+ */
+
+.feed-icon {
+  border-bottom: none;
+  display: inline-block;
+  padding: 15px 0 0 0;
+}
diff --git a/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css
index 8d1bd19343a164c982f2a110e60a674c4522d686..84ab4e5491f95b3a2e4caf94d3a565eb54a07906 100644
--- a/core/themes/bartik/css/components/header.css
+++ b/core/themes/bartik/css/components/header.css
@@ -248,6 +248,9 @@ h1.site-name {
   display: inline;
   padding: 0 0.5em;
 }
+[role*=banner] a {
+  border-bottom: none;
+}
 
 [dir="rtl"] #logo,
 [dir="rtl"] .site-logo,
diff --git a/core/themes/bartik/css/components/toolbar.css b/core/themes/bartik/css/components/toolbar.css
new file mode 100644
index 0000000000000000000000000000000000000000..35a5762cb8613ad5ccc700a718691309844ef03f
--- /dev/null
+++ b/core/themes/bartik/css/components/toolbar.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Toolbar module overrides for Bartik.
+ */
+
+.toolbar a {
+  border-bottom: none;
+}