diff --git a/core/modules/overlay/overlay-child-rtl.css b/core/modules/overlay/overlay-child-rtl.css
index 4195530..e910e25 100644
--- a/core/modules/overlay/overlay-child-rtl.css
+++ b/core/modules/overlay/overlay-child-rtl.css
@@ -12,27 +12,10 @@ html {
   float: right;
   left: auto;
 }
-#overlay {
-  padding: 0.2em;
-  padding-left: 26px;
-}
 #overlay-close-wrapper {
-  left: 0;
+  left: 46px;
   right: auto;
 }
-#overlay-close,
-#overlay-close:hover {
-  background: transparent url(images/close.png) no-repeat;
-  border-top-right-radius: 0;
-
-  -webkit-border-top-left-radius: 12px;
-  -webkit-border-bottom-left-radius: 12px;
-  -moz-border-radius-topleft: 12px;
-  -moz-border-radius-bottomleft: 12px;
-  border-top-left-radius: 12px;
-  border-bottom-left-radius: 12px;
-  background-color: #ffffff;
-}
 
 /**
  * Tabs on the overlay.
diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css
index ecfa4cb..efef0ff 100644
--- a/core/modules/overlay/overlay-child.css
+++ b/core/modules/overlay/overlay-child.css
@@ -4,6 +4,9 @@
  * Basic styling for the Overlay child pages.
  */
 
+/* Import working version from https://drupal.org/node/1945542 */
+@import 'overlay-tabs.css';
+
 .js {
   background: transparent !important;
   overflow-y: scroll;
@@ -21,13 +24,13 @@
   min-height: 100px;
   min-width: 700px;
   position: relative;
-  padding: .2em;
   padding-bottom: 2em;
-  padding-right: 26px; /* LTR */
   width: 88%;
 }
 #overlay-titlebar {
-  padding: 0 20px;
+  background: hsla(0, 0%, 42%, 0.65);
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
   position: relative;
   white-space: nowrap;
   z-index: 100;
@@ -36,12 +39,17 @@
   background: #fff;
   clear: both;
   color: #000;
-  padding: .5em 1em;
   position: relative;
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+#overlay #page {
+  background: transparent;
 }
 
 #overlay-title-wrapper {
   overflow: hidden;
+  padding: 15px;
 }
 #overlay-title {
   color: #fff;
@@ -64,75 +72,18 @@
 
 #overlay-close-wrapper {
   position: absolute;
-  right: 0; /* LTR */
+  right: 46px; /* LTR */
+  top: 18px;
 }
 #overlay-close,
 #overlay-close:hover {
-  background: transparent url(images/close.png) no-repeat; /* LTR */
-  border-top-left-radius: 0; /* LTR */
+  background: transparent url(images/close.png) no-repeat;
   display: block;
   height: 26px;
   margin: 0;
   padding: 0;
-  /* Replace with position:fixed to get a scrolling close button. */
   position: absolute;
   width: 26px;
-
-  -webkit-border-top-right-radius: 12px;
-  -webkit-border-bottom-right-radius: 12px;
-  -moz-border-radius-topright: 12px;
-  -moz-border-radius-bottomright: 12px;
-  border-top-right-radius: 12px;
-  border-bottom-right-radius: 12px;
-  background-color: #ffffff;
-}
-
-/**
- * Tabs on the overlay.
- */
-#overlay-tabs {
-  line-height: 26px;
-  margin: -28px 0 0 0;
-  position: absolute;
-  right: 20px; /* LTR */
-  text-transform: uppercase;
-}
-#overlay-tabs li {
-  display: inline-block;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-#overlay-tabs li a,
-#overlay-tabs li a:active,
-#overlay-tabs li a:visited,
-#overlay-tabs li a:hover {
-  background-color: #a6a7a2;
-  border-radius: 8px 8px 0 0;
-  color: #000;
-  display: inline-block;
-  font-size: 11px;
-  font-weight: bold;
-  margin: 0 1px;
-  outline: 0;
-  padding: 0 14px;
-  text-decoration: none;
-}
-#overlay-tabs li.active a,
-#overlay-tabs li.active a.active,
-#overlay-tabs li.active a:active,
-#overlay-tabs li.active a:visited {
-  background-color: #fff;
-  margin-bottom: 0;
-  padding-bottom: 2px;
-}
-#overlay-tabs li a:focus,
-#overlay-tabs li a:hover {
-  color: #fff;
-}
-#overlay-tabs li.active a:focus,
-#overlay-tabs li.active a:hover {
-  color: #000;
 }
 
 /**
diff --git a/core/modules/overlay/overlay-tabs.css b/core/modules/overlay/overlay-tabs.css
new file mode 100644
index 0000000..a118389
--- /dev/null
+++ b/core/modules/overlay/overlay-tabs.css
@@ -0,0 +1,83 @@
+#overlay-tabs {
+  background: #b3b3b3;
+  display: block;
+  list-style: none;
+  list-style-image: none;
+  padding: 0;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+}
+#overlay-tabs li {
+  float: left;
+  position: relative;
+  z-index: 5;
+}
+#overlay-tabs li {
+  margin-left: -5px; /* The value of the border-radius below */
+}
+#overlay-tabs li:first-child {
+  margin-left: 0;
+}
+#overlay-tabs li:last-child {
+  z-index: 4;
+}
+#overlay-tabs li.active{
+  z-index: 6;
+}
+#overlay-tabs li a {
+  background-color: #f2f2f0;
+  border: 1px solid #b3b3b3;
+  border-radius: 5px 5px 0 0;
+  color: #0074bd;
+  display: block;
+  font-size: 0.813rem;
+  font-size: 13px;
+  font-weight: 600;
+  letter-spacing: 1px;
+  line-height: 1.125rem;
+  line-height: 18px;
+  padding: 0.375em 0.938em;
+  padding: 6px 15px;
+  text-decoration: none;
+  text-transform: uppercase;
+}
+#overlay-tabs li a:hover {
+  background-color: #fff;
+  color: #007ac7;
+  text-decoration: none; }
+#overlay-tabs li a:active {
+  color: #004f80;
+}
+#overlay-tabs li.active a {
+  background-color: #fff;
+  border-bottom-color: transparent;
+  color: #004f80;
+}
+.secondary-tabs {
+  border-bottom: 1px solid #d9d8d4;
+  display: block;
+}
+.secondary-tabs__item {
+  float: left;
+  position: relative;
+  top: 1px;
+  z-index: 5;
+}
+.secondary-tabs__item__link {
+  border-bottom: 1px solid transparent;
+  color: #0074bd;
+  display: block;
+  margin-left: 15px;
+  padding: 15px 0 5px 0;
+  text-decoration: none;
+  transition: all 0.3s;
+}
+.secondary-tabs__item__link:hover {
+  border-bottom-color: #2b8dca;
+  text-decoration: none;
+}
+.secondary-tabs__item__link:active,
+.secondary-tabs__item.is-active .secondary-tabs__item__link {
+  border-bottom-color: #004f80;
+  color: #004f80;
+}
diff --git a/core/modules/overlay/templates/overlay.tpl.php b/core/modules/overlay/templates/overlay.tpl.php
index 38e6664..fd918dc 100644
--- a/core/modules/overlay/templates/overlay.tpl.php
+++ b/core/modules/overlay/templates/overlay.tpl.php
@@ -24,13 +24,13 @@
 <?php print render($disable_overlay); ?>
 <div id="overlay" <?php print $attributes; ?>>
   <div id="overlay-titlebar" class="clearfix">
-    <div id="overlay-title-wrapper" class="clearfix">
-      <h1 id="overlay-title"<?php print $title_attributes; ?>><?php print $title; ?></h1>
-    </div>
     <div id="overlay-close-wrapper">
       <a id="overlay-close" href="#" class="overlay-close"><span class="element-invisible"><?php print t('Close overlay'); ?></span></a>
     </div>
-    <?php if ($tabs): ?><h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2><ul id="overlay-tabs"><?php print render($tabs); ?></ul><?php endif; ?>
+    <div id="overlay-title-wrapper" class="clearfix">
+      <h1 id="overlay-title"<?php print $title_attributes; ?>><?php print $title; ?></h1>
+    </div>
+    <?php if ($tabs): ?><h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2><ul id="overlay-tabs" class="clearfix"><?php print render($tabs); ?></ul><?php endif; ?>
   </div>
   <div id="overlay-content"<?php print $content_attributes; ?>>
     <?php print $page; ?>
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 72ce5e6..0d7e916 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -985,8 +985,7 @@ body.in-maintenance #branding .step-indicator {
 /* Overlay theming */
 .overlay #branding {
   background-color: #fff;
-  padding-top: 15px;
-  padding-bottom: 15px;
+  padding: 15px;
 }
 .overlay #branding h1.page-title,
 .overlay #left,
@@ -995,7 +994,7 @@ body.in-maintenance #branding .step-indicator {
 }
 .overlay #page {
   margin: 0;
-  padding: 0 20px;
+  padding: 0 15px;
 }
 .overlay #branding .breadcrumb {
   float: left; /* LTR */