diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css
index 48f217d..a078ef2 100644
--- a/core/modules/overlay/overlay-child.css
+++ b/core/modules/overlay/overlay-child.css
@@ -39,21 +39,23 @@
   padding: .5em 1em;
   position: relative;
 }
-
 #overlay-title-wrapper {
   overflow: hidden;
+  padding: 10px;
 }
-#overlay-title {
+h1#overlay-title {
   color: #fff;
-  float: left; /* LTR */
-  font-size: 20px;
+  display: inline-block;
   margin: 0;
-  padding: 0.3em 0;
+  padding: 0;
 }
 #overlay-title:active,
 #overlay-title:focus {
   outline: 0;
 }
+#overlay .add-or-remove-shortcuts .text {
+  color: #fff;
+}
 
 .overlay #skip-link {
   margin-top: -20px;
@@ -128,13 +130,6 @@
 }
 
 /**
- * Add to shortcuts link
- */
-#overlay-titlebar .add-or-remove-shortcuts {
-  padding-top: 0.9em;
-}
-
-/**
  * Disable message.
  */
 #overlay-disable-message {
diff --git a/core/modules/shortcut/shortcut.base.css b/core/modules/shortcut/shortcut.base.css
index aca7807..9a4b727 100644
--- a/core/modules/shortcut/shortcut.base.css
+++ b/core/modules/shortcut/shortcut.base.css
@@ -16,5 +16,5 @@
 }
 .add-or-remove-shortcuts a:focus .text,
 .add-or-remove-shortcuts a:hover .text {
-  display: block;
+  display: inline-block;
 }
diff --git a/core/modules/shortcut/shortcut.theme-rtl.css b/core/modules/shortcut/shortcut.theme-rtl.css
index 8a687d9..c3d8986 100644
--- a/core/modules/shortcut/shortcut.theme-rtl.css
+++ b/core/modules/shortcut/shortcut.theme-rtl.css
@@ -20,7 +20,7 @@
   background-position: -12px -24px;
 }
 .add-or-remove-shortcuts .text {
-  padding: 0 10px 0 6px;
+  margin-right: 6px;
 }
 .add-or-remove-shortcuts a:focus .text,
 .add-or-remove-shortcuts a:hover .text {
@@ -39,3 +39,10 @@
   padding-left: 0.3333em;
   padding-right: 0.6667em;
 }
+
+
+@media all and (min-width: 851px) {
+  .add-or-remove-shortcuts {
+    margin-right: 18px;
+  }
+}
\ No newline at end of file
diff --git a/core/modules/shortcut/shortcut.theme.css b/core/modules/shortcut/shortcut.theme.css
index 727289b..19eddcc 100644
--- a/core/modules/shortcut/shortcut.theme.css
+++ b/core/modules/shortcut/shortcut.theme.css
@@ -30,10 +30,13 @@
 /**
  * Add/remove links.
  */
+.add-or-remove-shortcuts {
+  float: left;
+  margin-top: 6px;
+}
 .add-or-remove-shortcuts .icon {
-  background: transparent url(shortcut.png) no-repeat;
+  background: transparent url("shortcut.png") no-repeat;
   height: 12px;
-  margin-left: 8px; /* LTR */
   overflow: hidden;
   text-indent: 12px;
   width: 12px;
@@ -49,3 +52,19 @@
 .remove-shortcut a:hover .icon {
   background-position: -12px -12px; /* LTR */
 }
+.add-or-remove-shortcuts .text {
+  font-size: 0.846em;
+  margin-left: 6px;
+  line-height: normal;
+}
+.add-or-remove-shortcuts .text:hover {
+  text-decoration: underline;
+}
+
+@media all and (min-width: 851px) {
+  .add-or-remove-shortcuts {
+    margin-left: 18px; /* LTR */
+    float: none;
+    display: inline-block;
+  }
+}
\ No newline at end of file
diff --git a/core/themes/seven/style-rtl.css b/core/themes/seven/style-rtl.css
index f31d1d3..3415549 100644
--- a/core/themes/seven/style-rtl.css
+++ b/core/themes/seven/style-rtl.css
@@ -28,13 +28,6 @@ ol {
 }
 
 /**
- * Branding.
- */
-#branding {
-  padding: 20px 20px 0 20px;
-}
-
-/**
  * Help.
  */
 #help div.more-help-link {
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index f29245b..fc1c61e 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -178,13 +178,12 @@ pre {
  */
 #branding {
   overflow: hidden;
-  padding: 20px 20px 0 20px; /* LTR */
+  padding: 20px;
   position: relative;
   background-color: #e0e0d8;
 }
 #branding .breadcrumb {
   font-size: 0.846em;
-  padding-bottom: 5px;
 }
 
 /**
@@ -210,7 +209,6 @@ pre {
 #branding h1.page-title {
   color: #000;
   margin: 0;
-  padding-bottom: 10px;
   font-size: 1.385em;
   font-weight: normal;
   float: left; /* LTR */
@@ -1011,13 +1009,6 @@ h1#overlay-title {
   font-weight: normal;
 }
 
-/* Shortcut theming */
-div.add-or-remove-shortcuts {
-  float: left; /* LTR */
-  padding-top: 6px;
-  padding-left: 6px; /* LTR */
-}
-
 /* Field UI */
 
 #field-display-overview input.field-formatter-settings-edit {