diff --git a/core/modules/overlay/css/overlay-child-rtl.css b/core/modules/overlay/css/overlay-child-rtl.css
index 0751b56..4d88052 100644
--- a/core/modules/overlay/css/overlay-child-rtl.css
+++ b/core/modules/overlay/css/overlay-child-rtl.css
@@ -12,13 +12,9 @@ html {
   left: auto;
 }
 #overlay-close-wrapper {
-  left: 0;
+  left: 31px;
   right: auto;
 }
-#overlay-close,
-#overlay-close:hover {
-  border-radius: 12px 0 0 12px;
-}
 
 /**
  * Tabs on the overlay.
diff --git a/core/modules/overlay/css/overlay-child.css b/core/modules/overlay/css/overlay-child.css
index 4610749..57b0c1a 100644
--- a/core/modules/overlay/css/overlay-child.css
+++ b/core/modules/overlay/css/overlay-child.css
@@ -26,7 +26,9 @@
   width: 100%;
 }
 #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;
@@ -35,12 +37,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;
@@ -59,74 +66,25 @@
 
 #overlay-close-wrapper {
   position: absolute;
-  right: 0; /* LTR */
+  right: 31px; /* LTR */
+  top: 23px;
 }
 #overlay-close,
 #overlay-close:hover {
-  background: #ffffff url(../images/close.png) no-repeat;
-  border-radius: 0 12px 12px 0; /* LTR */
+  background: transparent url(../images/close.png) no-repeat;
   display: block;
-  height: 26px;
+  height: 16px;
   margin: 0;
   padding: 0;
-  /* Replace with position:fixed to get a scrolling close button. */
-  position: absolute;
-  width: 26px;
-}
-
-/**
- * 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;
+  width: 16px;
 }
 
 /**
  * Add to shortcuts link
  */
 #overlay-titlebar .add-or-remove-shortcuts {
-  padding-top: 0.6em;
+  padding-top: 0.4em;
 }
 #overlay-titlebar .add-or-remove-shortcuts .icon {
   margin-top: 4px;
@@ -153,3 +111,111 @@
 .overlay-disable-message-focused #overlay-dismiss-message {
   float: right;
 }
+
+/**
+ * Primary and secondary tabs.
+ */
+#overlay-tabs {
+  background-color: transparent;
+  border-radius: 5px 5px 0 0 ;
+  font-size: 13px;
+  font-size: 0.8125rem;
+  line-height: 1;
+}
+#overlay-tabs ul.primary,
+#overlay-tabs ul.secondary {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  position: relative;
+  display: block;
+  float: none;
+}
+#overlay-tabs ul.secondary {
+  background-color: #ffffff;
+}
+#overlay-tabs ul.primary:after,
+#overlay-tabs ul.secondary:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+#overlay-tabs ul.primary li,
+#overlay-tabs ul.secondary li {
+  float: left;
+  position: relative;
+}
+#overlay-tabs a {
+  display: block;
+}
+#overlay-tabs ul.primary {
+  font-size: 12px;
+  font-size: 0.75rem;
+}
+#overlay-tabs ul.primary:before,
+#overlay-tabs ul.secondary:before {
+  content: ' ';
+  bottom: 0;
+  display: block;
+  height: 0;
+  position: absolute;
+  width: 100%;
+}
+#overlay-tabs ul.primary:before {
+  border-bottom: 1px solid #b3b3b3;
+}
+#overlay-tabs ul.secondary:before {
+  border-bottom: 1px solid #d9d8d4;
+}
+#overlay-tabs ul.primary li {
+  margin-bottom: -1px;
+  top: -1px;
+}
+#overlay-tabs ul.primary .active{
+  z-index: 1;
+}
+#overlay-tabs ul.primary a {
+  border-top-left-radius: 5px;
+  color: #8dd2ff;
+  font-weight: bold;
+  padding: 0.6667em 1.25em;
+  text-decoration: none;
+  text-transform: uppercase;
+}
+#overlay-tabs ul.primary a:hover {
+  background: transparent;
+  color: #8dd2ff;
+  text-decoration: none;
+  color: #ffffff;
+  -webkit-transition: all 1s;
+}
+#overlay-tabs ul.primary a:active {
+  color: #004f80;
+}
+#overlay-tabs ul.primary .active a {
+  background-color: #ffffff;
+  border-top-right-radius: 5px;
+  color: #004f80;
+}
+
+#overlay-tabs ul.secondary a {
+  border-bottom: 2px solid transparent;
+  background: transparent;
+  color: #0074bd;
+  margin-left: 1.1538em;
+  padding: 0.75em 0 0.333em;
+}
+#overlay-tabs ul.secondary .active a {
+  border-bottom-color: #004f80;
+  color: #004f80;
+  background-color: #ffffff;
+}
+#overlay-tabs ul.secondary a:focus,
+#overlay-tabs ul.secondary a:hover {
+  color: #008ee6 !important;
+  background-color: #ffffff;
+  border-bottom-color: #008ee6 !important;
+}
+#overlay-tabs ul.secondary a:hover {
+  text-decoration: none;
+}
diff --git a/core/modules/overlay/images/close.png b/core/modules/overlay/images/close.png
index 44d2b6b..d39edae 100644
--- a/core/modules/overlay/images/close.png
+++ b/core/modules/overlay/images/close.png
@@ -1,14 +1,27 @@
 ‰PNG
 
-   IHDR         ©JLÎ   	pHYs     šœ  
-OiCCPPhotoshop ICC profile  xÚSgTSé=÷ÞôBKˆ€”KoR RB‹€‘&*!	Jˆ!¡ÙQÁEEÈ ˆŽŽ€ŒQ,Š
-Øä!¢Žƒ£ˆŠÊûá{£kÖ¼÷æÍþµ×>ç¬ó³ÏÀ–H3Q5€©BàƒÇÄÆáä.@
-$p ³d!sý# ø~<<+"À¾ xÓ ÀM›À0‡ÿêB™\€„Àt‘8K€ @zŽB¦ @F€˜&S   `Ëcbã P- `'æÓ €ø™{ [”! ‘  eˆD h; ¬ÏVŠE X0 fKÄ9 Ø- 0IWfH °· ÀÎ²  0Qˆ…) { `È##x „™ FòW<ñ+®ç*  x™²<¹$9E[-qWW.(ÎI+6aaš@.Ây™24àóÌ   ‘àƒóýxÎ®ÎÎ6Ž¶_-ê¿ÿ"bbãþåÏ«p@  át~Ñþ,/³€;€mþ¢%îh^ u÷‹f²@µ  éÚWópø~<<E¡¹ÙÙåääØJÄB[aÊW}þgÂ_ÀWýlù~<ü÷õà¾â$2]GøàÂÌôL¥Ï’	„bÜæGü·ÿüÓ"ÄIb¹X*ãQqŽDšŒó2¥"‰B’)Å%Òÿdâß,û>ß5 °j>{‘-¨]cöK'XtÀâ÷  ò»oÁÔ(€hƒáÏwÿï?ýG % €fI’q  ^D$.TÊ³?Ç  D *°AôÁ,ÀÁÜÁü`6„B$ÄÂBB
-d€r`)¬‚B(†Í°*`/Ô@4ÀQh†“p.ÂU¸=púažÁ(¼	AÈa!ÚˆbŠX#Ž™…ø!ÁH‹$ ÉˆQ"K‘5H1RŠT UHò=r9‡\Fº‘;È 2‚ü†¼G1”²Q=ÔµC¹¨7„F¢Ðdt1š ›Ðr´=Œ6¡çÐ«hÚ>CÇ0Àè3Äl0.ÆÃB±8,	“cË±"¬«Æ°V¬»‰õcÏ±wEÀ	6wB aAHXLXNØH¨ $4Ú	7	„QÂ'"“¨K´&ºùÄb21‡XH,#Ö/{ˆCÄ7$‰C2'¹I±¤TÒÒFÒnR#é,©›4H#“ÉÚdk²9”, +È…ääÃä3ää!ò[
-b@q¤øSâ(RÊjJåå4åe˜2AU£šRÝ¨¡T5ZB­¡¶R¯Q‡¨4uš9ÍƒIK¥­¢•Óhh÷i¯ètºÝ•N—ÐWÒËéGè—èôw†ƒÇˆg(›gw¯˜L¦Ó‹ÇT071ë˜ç™™oUX*¶*|‘Ê
-•J•&•*/T©ª¦ªÞªUóUËT©^S}®FU3Sã©	Ô–«UªPëSSg©;¨‡ªg¨oT?¤~Yý‰YÃLÃOC¤Q ±_ã¼Æ c³x,!k«†u5Ä&±ÍÙ|v*»˜ý»‹=ª©¡9C3J3W³Ró”f?ã˜qøœtN	ç(§—ó~ŠÞï)â)¦4L¹1e\kª–—–X«H«Q«Gë½6®í§¦½E»YûAÇJ'\'GgÎçSÙSÝ§
-§M=:õ®.ªk¥¡»Dw¿n§î˜ž¾^€žLo§Þy½çú}/ýTýmú§õGX³$ÛÎ<Å5qo</ÇÛñQC]Ã@C¥a•a—á„‘¹Ñ<£ÕFFŒiÆ\ã$ãmÆmÆ£&&!&KMêMîšRM¹¦)¦;L;LÇÍÌÍ¢ÍÖ™5›=1×2ç›ç›×›ß·`ZxZ,¶¨¶¸eI²äZ¦Yî¶¼n…Z9Y¥XUZ]³F­­%Ö»­»§§¹N“N«žÖgÃ°ñ¶É¶©·°åØÛ®¶m¶}agbg·Å®Ãî“½“}º}ý=‡Ù«Z~s´r:V:ÞšÎœî?}Åô–é/gXÏÏØ3ã¶Ë)ÄiS›ÓGgg¹sƒóˆ‹‰K‚Ë.—>.›ÆÝÈ½äJtõq]ázÒõ›³›Âí¨Û¯î6îiî‡ÜŸÌ4Ÿ)žY3sÐÃÈCàQåÑ?Ÿ•0kß¬~OCOgµç#/c/‘W­×°·¥wª÷aï>ö>rŸã>ã<7Þ2ÞY_Ì7À·È·ËOÃož_…ßC#ÿdÿzÿÑ §€%g‰A[ûøz|!¿Ž?:Ûeö²ÙíAŒ ¹AA‚­‚åÁ­!hÈì­!÷ç˜Î‘Îi…P~èÖÐaæa‹Ã~'…‡…W†?ŽpˆXÑ1—5wÑÜCsßDúD–DÞ›g1O9¯-J5*>ª.j<Ú7º4º?Æ.fYÌÕXXIlK9.*®6nl¾ßüíó‡ââã{˜/È]py¡ÎÂô…§©.,:–@LˆN8”ðA*¨Œ%òw%Ž
-yÂÂg"/Ñ6ÑˆØC\*NòH*Mz’ì‘¼5y$Å3¥,å¹„'©¼LLÝ›:žšv m2=:½1ƒ’‘qBª!M“¶gêgæfvË¬e…²þÅn‹·/•Ék³¬Y-
-¶B¦èTZ(×*²geWf¿Í‰Ê9–«ž+ÍíÌ³ÊÛ7œïŸÿíÂá’¶¥†KW-Xæ½¬j9²<qyÛ
-ã+†V¬<¸Š¶*mÕO«íW—®~½&zMk^ÁÊ‚ÁµkëU
-å…}ëÜ×í]OX/Yßµaú†>‰Š®Û—Ø(Üxå‡oÊ¿™Ü”´©«Ä¹dÏfÒféæÞ-ž[–ª—æ—nÙÚ´ßV´íõöEÛ/—Í(Û»ƒ¶C¹£¿<¸¼e§ÉÎÍ;?T¤TôTúT6îÒÝµa×ønÑî{¼ö4ìÕÛ[¼÷ý>É¾ÛUUMÕfÕeûIû³÷?®‰ªéø–ûm]­NmqíÇÒý#¶×¹ÔÕÒ=TRÖ+ëGÇ¾þïw-6UœÆâ#pDyäé÷	ß÷:ÚvŒ{¬áÓvg/jBšòšF›Sšû[b[ºOÌ>ÑÖêÞzüGÛœ4<YyJóTÉiÚé‚Ó“gòÏŒ•}~.ùÜ`Û¢¶{çcÎßjoïºtáÒEÿ‹ç;¼;Î\ò¸tò²ÛåW¸Wš¯:_mêtê<þ“ÓOÇ»œ»š®¹\k¹îz½µ{f÷éž7ÎÝô½yñÿÖÕž9=Ý½ózo÷Å÷õßÝ~r'ýÎË»Ùw'î­¼O¼_ô@íAÙCÝ‡Õ?[þÜØïÜjÀw óÑÜG÷…ƒÏþ‘õC™Ë††ëž8>99â?rýéü§CÏdÏ&žþ¢þË®/~øÕë×ÎÑ˜Ñ¡—ò—“¿m|¥ýêÀë¯ÛÆÂÆ¾Éx31^ôVûíÁwÜwï£ßOä| (ÿhù±õSÐ§û“““ÿ˜óüc3-Û    cHRM  z%  €ƒ  ùÿ  €é  u0  ê`  :˜  o’_ÅF   ÆIDATxÚì•Ñ	Ã0D5’FòÒN;Hƒ8\¿bb¥IZL(ù806èq:Û" 4Bô€þäî03ˆDf†ˆÀÝñˆ,Å3‰¾­|3ãHU—"Ó4¥€õ™ªâÈÝ›BµV˜Ùbf¨µ6°,³.¨”²) õöˆ¥”ã ^6f†yžafÍúhVý~&y¼]ôœ¬u?Ð°Ö»qùzGî÷`‡~A=g™öœœUÝŒ	UM3y&ìJõ hÛ»¶¹g    IEND®B`‚
\ No newline at end of file
+   IHDR         óÿa   	pHYs     šœ  ëiTXtXML:com.adobe.xmp     <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.1.2">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+         <xmp:CreatorTool>Pixelmator  1.6.7</xmp:CreatorTool>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
+         <tiff:Orientation>1</tiff:Orientation>
+         <tiff:YResolution>72</tiff:YResolution>
+         <tiff:ResolutionUnit>1</tiff:ResolutionUnit>
+         <tiff:Compression>5</tiff:Compression>
+         <tiff:XResolution>72</tiff:XResolution>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:exif="http://ns.adobe.com/exif/1.0/">
+         <exif:PixelXDimension>16</exif:PixelXDimension>
+         <exif:ColorSpace>65535</exif:ColorSpace>
+         <exif:PixelYDimension>16</exif:PixelYDimension>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+6ÚÏ   ÚIDAT8¥“M
+Â@…§"n…®z Öx÷.<àVðî…1_HlFA&0óòóÞ£i‡Zké‰MmË`’þøÅ˜>ó%x…°&Éï²®²ÆÐ‡CMŸ9<ÕEñÎ†ÑÄÅ>Ã~‰ä³319ÈcÀS­n^f“WTJþÃoÐË&î±ÿ2à®2¤ÎÛ|‚|`Ñ'¬>½nÂpD|‹
+ÉÏ©^™¸äZ²x–30&Ík<–‹1È&ð´¿]¾IÍNV?/–;x½—†óÊ€SO´~¦¿üÞ¬Ú*Ðfá®    IEND®B`‚
\ No newline at end of file
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index 180ea97..89da4d9 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -427,7 +427,7 @@ function overlay_preprocess_maintenance_page(&$variables) {
  * @see overlay.tpl.php
  */
 function template_preprocess_overlay(&$variables) {
-  $variables['tabs'] = menu_primary_local_tasks();
+  $variables['tabs'] = menu_local_tabs();
   $variables['title'] = drupal_get_title();
   $variables['disable_overlay'] = overlay_disable_message();
 
@@ -450,7 +450,7 @@ function template_preprocess_overlay(&$variables) {
  */
 function overlay_preprocess_page(&$variables) {
   if (overlay_get_mode() == 'child') {
-    unset($variables['tabs']['#primary']);
+    unset($variables['tabs']);
   }
 }
 
diff --git a/core/modules/overlay/templates/overlay.html.twig b/core/modules/overlay/templates/overlay.html.twig
index 732bc33..a12fee5 100644
--- a/core/modules/overlay/templates/overlay.html.twig
+++ b/core/modules/overlay/templates/overlay.html.twig
@@ -21,15 +21,13 @@
 {{ disable_overlay }}
 <div{{ attributes }}>
   <div id="overlay-titlebar" class="clearfix">
-    <div id="overlay-title-wrapper" class="clearfix">
-      <h1{{ title_attributes }}>{{ title }}</h1>
-    </div>
     <div id="overlay-close-wrapper">
       <a id="overlay-close" href="#" class="overlay-close" role="button" aria-controls="overlay-content"><span class="visually-hidden">{{ 'Close overlay'|t }}</span></a>
     </div>
-    {% if tabs %}
-      <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2><ul id="overlay-tabs">{{ tabs }}</ul>
-    {% endif %}
+    <div id="overlay-title-wrapper" class="clearfix">
+      <h1{{ title_attributes }}>{{ title }}</h1>
+    </div>
+    {% if tabs %}<div id="overlay-tabs">{{ tabs }}</div>{% endif %}
   </div>
   <div{{ content_attributes }}>
     {{ page }}
diff --git a/core/modules/shortcut/css/shortcut.module.css b/core/modules/shortcut/css/shortcut.module.css
index 8575904..4dd7767 100644
--- a/core/modules/shortcut/css/shortcut.module.css
+++ b/core/modules/shortcut/css/shortcut.module.css
@@ -9,7 +9,6 @@
 .add-or-remove-shortcuts .icon {
   display: block;
   float: left; /* LTR */
-  margin-top: 5px;
 }
 .add-or-remove-shortcuts .text {
   display: none;
diff --git a/core/modules/shortcut/css/shortcut.theme-rtl.css b/core/modules/shortcut/css/shortcut.theme-rtl.css
index 8a687d9..4cb350c 100644
--- a/core/modules/shortcut/css/shortcut.theme-rtl.css
+++ b/core/modules/shortcut/css/shortcut.theme-rtl.css
@@ -11,21 +11,9 @@
   margin-left: 0;
   margin-right: 8px;
 }
-.add-shortcut a:focus .icon,
-.add-shortcut a:hover .icon {
-  background-position: 0 -24px;
-}
-.remove-shortcut a:focus .icon,
-.remove-shortcut a:hover .icon {
-  background-position: -12px -24px;
-}
 .add-or-remove-shortcuts .text {
   padding: 0 10px 0 6px;
 }
-.add-or-remove-shortcuts a:focus .text,
-.add-or-remove-shortcuts a:hover .text {
-  border-radius: 5px 0 0 5px;
-}
 
 /**
  * Toolbar.
diff --git a/core/modules/shortcut/css/shortcut.theme.css b/core/modules/shortcut/css/shortcut.theme.css
index a9525a7..55f99c2 100644
--- a/core/modules/shortcut/css/shortcut.theme.css
+++ b/core/modules/shortcut/css/shortcut.theme.css
@@ -32,21 +32,21 @@
  */
 .add-or-remove-shortcuts .icon {
   background: transparent url(../images/shortcut-add.png) no-repeat;
-  height: 12px;
+  height: 16px;
   margin-left: 8px; /* LTR */
   overflow: hidden;
-  text-indent: 12px;
-  width: 12px;
+  text-indent: 16px;
+  width: 16px;
 }
 .add-shortcut a:focus .icon,
 .add-shortcut a:hover .icon {
-  background-position: 0 -12px; /* LTR */
+  background-position: -16px 0;
 }
 .remove-shortcut .icon {
   margin-top: 4px;
-  background-position: -12px 0;
+  background-position: -16px 0;
 }
 .remove-shortcut a:focus .icon,
 .remove-shortcut a:hover .icon {
-  background-position: -12px -12px; /* LTR */
+  background-position: 0 0;
 }
diff --git a/core/modules/shortcut/images/shortcut-add.png b/core/modules/shortcut/images/shortcut-add.png
index 2924557..67bc0cb 100644
--- a/core/modules/shortcut/images/shortcut-add.png
+++ b/core/modules/shortcut/images/shortcut-add.png
@@ -1,5 +1,46 @@
 ‰PNG
 
-   IHDR      $   ¤
-   gAMA  ±Ž|ûQ“   “PLTE   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¥¥£ÙÚØááà×ØÖ÷ø÷ÛÛÚÙÙØ¥¥¢~~~‡‡‡NNNlllHHH½½½EEExxx´´´ÉÉÉ¥¥¥££ pql···---±±±ûûûããâcd_KKK_`[ÿÿÿ   |À®   tRNS ÒloÀùÃÏÆùó6e£…  -IDAT(Ï]’YŽƒ0DÛØB&Ù÷…vÈýO7vg,—§>Ðƒ–ZÕO‘ÑdIAäs8~œ/Í±‡>‹`ÿálL²Ð0ú‘KfN.)~ÛA3sÚ˜Fþlòi&È8øA¦Ä­J·*!u³ƒ“bæœ”®{eì¶¦®c}T·ÏÃî„>ëU4±ÿÙø)ËEV÷½ÏÖÏüÕ{ìüT52ºÊÀU†®fàj†JJd,‘ÑU
-®RtµWkpeê:v~*s ðŸŸÕô«Äqß×Ù¢,ù_B¦þ5/ŽÍåüÐÿ2ÕÕæ[ddÊr[·ÌœBÒ¬µƒwÌÌyÇT6VC7B¦%¼ SêV%©[•Ðúd7ÅÌ¹)]wÛ1_M]Çú¨ê¾;<Û<=6¦«aˆ”ðù8ÕmÙÚ´[‘    IEND®B`‚
\ No newline at end of file
+   IHDR          w }Y  
+AiCCPICC Profile  H–wTSÙ‡Ï½7½Ð" %ôz	 Ò;HQ‰I€P†„&vDF)VdTÀG‡"cEƒ‚b×	òPÆÁQDEåÝŒk	ï­5óÞšýÇYßÙç·×Ùgï}×º Pü‚ÂtX€4¡XîëÁ\ËÄ÷XÀáffGøDÔü½=™™¨HÆ³öî.€d»Û,¿P&sÖÿ‘"7C$ 
+EÕ6<~&å”S³Å2ÿÊô•)2†12¡	¢¬"ãÄ¯lö§æ+»É˜—&ä¡YÎ¼4žŒ»PÞš%á£Œ¡\˜%àg£|e½TIš å÷(ÓÓøœL 0™_Ìç&¡l‰2Eî‰ò ”Ä9¼r‹ù9hž x¦gäŠ‰Ib¦×˜iåèÈfúñ³Sùb1+”ÃMáˆxLÏô´Ž0€¯o–E%Ym™h‘í­ííYÖæhù¿Ùß~Sý=ÈzûUñ&ìÏžAŒžYßlì¬/½ ö$Z›³¾•U ´m@åá¬Oï  ò ´Þœó†l^’Äâ'‹ììlsŸk.+è7ûŸ‚oÊ¿†9÷™ËîûV;¦?#I3eEå¦§¦KDÌÌ—Ïdý÷ÿãÀ9iÍÉÃ,œŸÀñ…èUQè”	„‰h»…<X.d
+„Õá6'~khu_ }…9P¸IÈo= C#$n?z}ë[1
+È¾¼h­‘¯s2zþçú\ŠnáLA"Sæödr%¢,£ß„lÁt 
+4.0,`€3pÞ  „€H–.Hi@²A>Ø 
+A1Øvƒjp ÔzÐN‚6p\WÀp€G@
+†ÁK0Þi‚ð¢Aª¤™BÖZyCAP8ÅC‰’@ùÐ&¨*ƒª¡CP=ô#tº]ƒú Ð 4ý}„˜ÓaØ ¶€Ù°;GÂËàDxœÀÛáJ¸>·Âáð ,…_Â“@ÈÑFXñDBX$!k‘"¤©Eš¤¹H‘qä‡¡a˜Æã‡YŒábVaÖbJ0Õ˜c˜VLæ6f3ù‚¥bÕ±¦X'¬?v	6›-ÄV``[°—±Øaì;ÇÀâp~¸\2n5®·×Œ»€ëÃá&ñx¼*Þï‚Ásðb|!¾
+ßÆ¿'	Zk‚!– $l$Tçý„Â4Q¨Ot"†yÄ\b)±ŽØA¼I&N“I†$R$)™´TIj"]&=&½!“É:dGrY@^O®$Ÿ _%’?P”(&OJEBÙN9J¹@y@yC¥R¨nÔXª˜ºZO½D}J}/G“3—ó—ãÉ­“«‘k•ë—{%O”×—w—_.Ÿ'_!Jþ¦ü¸QÁ@ÁS£°V¡Fá´Â=…IEš¢•bˆbšb‰bƒâ5ÅQ%¼’’·O©@é°Ò%¥!BÓ¥yÒ¸´M´:ÚeÚ0G7¤ûÓ“éÅôè½ô	e%e[å(ååå³ÊRÂ0`ø3R¥Œ“Œ»Œó4æ¹ÏãÏÛ6¯i^ÿ¼)•ù*n*|•"•f••ªLUoÕÕªmªOÔ0j&jajÙjûÕ.«Ï§ÏwžÏ_4ÿäü‡ê°º‰z¸újõÃê=ê“š¾U—4Æ5šnšÉšåšç4Ç´hZµZåZçµ^0•™îÌTf%³‹9¡­®í§-Ñ>¤Ý«=­c¨³Xg£N³Î]’.[7A·\·SwBOK/X/_¯Qï¡>QŸ­Ÿ¤¿G¿[ÊÀÐ Ú`‹A›Á¨¡Š¡¿aža£ác#ª‘«Ñ*£Z£;Æ8c¶qŠñ>ã[&°‰I’IÉMSØÔÞT`ºÏ´Ïkæh&4«5»Ç¢°ÜYY¬FÖ 9Ã<È|£y›ù+=‹X‹Ý_,í,S-ë,Y)YXm´ê°úÃÚÄšk]c}Ç†jãc³Î¦Ýæµ­©-ßv¿í};š]°Ý»N»Ïöö"û&û1=‡x‡½÷Øtv(»„}Õëèá¸ÎñŒã'{'±ÓI§ßYÎ)ÎÎ£ðÔ-rÑqá¸r‘.d.Œ_xp¡ÔUÛ•ãZëúÌM×çvÄmÄÝØ=Ùý¸û+K‘G‹Ç”§“çÏ^ˆ—¯W‘W¯·’÷bïjï§>:>‰>>¾v¾«}/øaýývúÝó×ðçú×ûO8¬	è
+¤FV>2	uÃÁÁ»‚/Ò_$\ÔBüCv…<	5]ús.,4¬&ìy¸Ux~xw-bEDCÄ»HÈÒÈG‹KwFÉGÅEÕGME{E—EK—X,Y³äFŒZŒ ¦={$vr©÷ÒÝK‡ãìâ
+ãî.3\–³ìÚrµå©ËÏ®_ÁYq*ßÿ‰Â©åL®ô_¹wå×“»‡û’çÆ+çñ]øeü‘—„²„ÑD—Ä]‰cI®IIãOAµàu²_òä©””£)3©Ñ©Íi„´ø´ÓB%aŠ°+]3='½/Ã4£0CºÊiÕîU¢@Ñ‘L(sYf»˜ŽþLõHŒ$›%ƒY³j²ÞgGeŸÊQÌæôäšänËÉóÉû~5f5wug¾vþ†üÁ5îk­…Ö®\Û¹Nw]Áºáõ¾ëm mHÙðËFËeßnŠÞÔQ Q°¾`h³ïæÆB¹BQá½-Î[lÅllíÝf³­jÛ—"^ÑõbËâŠâO%Ü’ëßY}WùÝÌö„í½¥ö¥ûwàvwÜÝéºóX™bY^ÙÐ®à]­åÌò¢ò·»Wì¾Va[q`id´2¨²½J¯jGÕ§ê¤êšæ½ê{·íÚÇÛ×¿ßmÓÅ>¼È÷Pk­AmÅaÜá¬ÃÏë¢êº¿g_DíHñ‘ÏG…G¥ÇÂuÕ;Ô×7¨7”6Â’Æ±ãqÇoýàõC{«éP3£¹ø8!9ñâÇøïž<ÙyŠ}ªé'ýŸö¶ÐZŠZ¡ÖÜÖ‰¶¤6i{L{ßé€ÓÎ-?›ÿ|ôŒö™š³ÊgKÏ‘Îœ›9Ÿw~òBÆ…ñ‹‰‡:Wt>º´äÒ®°®ÞË—¯^ñ¹r©Û½ûüU—«g®9];}}½í†ýÖ»ž–_ì~iéµïm½ép³ý–ã­Ž¾}çú]û/Þöº}åŽÿ‹úî.¾{ÿ^Ü=é}ÞýÑ©^?Ìz8ýhýcìã¢'
+O*žª?­ýÕø×f©½ôì ×`Ï³ˆg†¸C/ÿ•ù¯OÃÏ©Ï+F´FêG­GÏŒùŒÝz±ôÅðËŒ—Óã…¿)þ¶÷•Ñ«Ÿ~wû½gbÉÄðkÑë™?JÞ¨¾9úÖömçdèäÓwiï¦§ŠÞ«¾?öý¡ûcôÇ‘éìOøO•Ÿ?w|	üòx&mfæß÷„óû2:Y~   	pHYs     šœ  ¡iTXtXML:com.adobe.xmp     <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.1.2">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
+         <tiff:ResolutionUnit>1</tiff:ResolutionUnit>
+         <tiff:Compression>5</tiff:Compression>
+         <tiff:XResolution>72</tiff:XResolution>
+         <tiff:Orientation>1</tiff:Orientation>
+         <tiff:YResolution>72</tiff:YResolution>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:exif="http://ns.adobe.com/exif/1.0/">
+         <exif:PixelXDimension>32</exif:PixelXDimension>
+         <exif:ColorSpace>1</exif:ColorSpace>
+         <exif:PixelYDimension>16</exif:PixelYDimension>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/">
+         <dc:subject>
+            <rdf:Bag/>
+         </dc:subject>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/">
+         <xmp:CreatorTool>Pixelmator  1.6.7</xmp:CreatorTool>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+»sQl  ¸IDATH…UmLSg~î½½½mo{[è2EXP‚ÓÍ1"Kˆ.!ûøÁ²ÍlÇ~™l1KöËaBâH–i£Îé´[lû¡²	è`&S„¡Í\µ”R…~Üwç½Z‚Ä²“œ¶ïyÏsÞó>çœ·c™äÒ¥K«L&SvmmíL>+Ùÿ<¹m•¨#»üÝžŒxÓJ³©
+Éç¥•ü2í™ÀÚ bE¼˜	ÜÝÝU£iÎ&¯×[ÓÝýkS&¿LöÁcÏ×¨Þò&çš—koËˆj~¿_Ä_N(@[WW—=ÓaËíþ7‰IbGÖºzd­©%YÛàŸŠ–öÀåËÕŒ™rE°yùù{]Y.0¦#Áý`ð4Cª]H`öÅººáå‡òõàÑÍ…¥b&Šo¸Ÿ}}¯7—*¬'‰Èˆ}wZg¬]JŠÓe»{i¼ÐÙÙY,›¤_…ªj‡l–átº ÚlXˆÏSf³óóqŒ‡ÃÐõb±·‡t&¼¦Ýù0(~
+¸EV}’Ù‘Gþf8³â`3¿,ÁVèœS#)ŸŸ¹jý¿uâöíÛwFF;JJKPPP «UÁüBÌH’'À4™$¬]·eÊ¡i‡ÏòéØ´«'x{$ê·¸K¤¢úƒx¦ò¸ì!°h/Q'èÓýÐLCXý\#Öí8ÕW›“ç*Þë%A:qì«£UÕÕÍnÉd¢(‘R1(T*I¶¤ÁÄÃ©‡¸10ðcSÓ;¯ÒžÎ³äøZKV¾°µ¹`6w‚™ÚHâ% —xŒnÎ ¨EpóÊÃ§Coq¼1†ô#ÕÒÒòÃé*RÌJÅfAœèÞ£<1 cvf#££Wûú®5¦ç	p<%±§ë \¤8vÔyìV°Ùõ1%¡3°d‚5ã“
+î]ÿíê‰ï‡ÞNã§àÈ‘#‰‰É©Ý¡±ÝÉdÊ¸y"‘4ecc!LNN7¶··?ª?ý±ð€áyöþÄ­~º½,‘"MJ K&ný`Rh<7À¨6ä‰‡ÈçvÛ¨¹H’hPN†MUU¸\®õ´¸g–}äiJ±%;L§{É.Àê!zhˆcãä©ÀìÈ†7:]°¿È e¶*åvJ@Q¬°Ùì˜!Ê§Fi­Âb±Asj¼A·pß§‰¬•VÏZˆZ9Y;šráA„¦ÉUÑY›w5‹¹j)Ö`€êGi/\Ø ÚíDõÂc¡ÀüÜÂ!šÝÙpx¼5''§Œ7¨,›·¦ý‰vã$½¾öå–
+«»ÿÜî§‘ëÄRìK±ØÔÝ¾VOIm©%{=©gcÚŸãMÔ- §[ß4<ü×h$9|àÀ'Ç@ºVç¿ýæë]nŸo¿$Õä«&	KÅ5ä^BåH×çÃáhòpÃÇ×OÒŽ±_œó%vûò~êiÎÀx^zK ž9uª™¾sIÝ¤©T%u’zHòÎž=³Þ*°áØEüO+÷Ð:#¾fCVáÏŸUí#—Ÿ)rê—+™…Ï9?`¹pê7àñÆÒK}ÿÿ€§Þ'ÔÇ¬=    IEND®B`‚
\ No newline at end of file
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index a7a36a8..f67c1ee 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -1519,6 +1519,11 @@ div.admin-panel .description {
 .overlay #messages {
   width: auto;
 }
+.overlay-open #page {
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 10+, Firefox on Android */
+  filter: gray; /* IE6-9 */
+  -webkit-filter: grayscale(100%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */
+}
 
 /* ---------- book ----------- */
 .book-navigation .menu {
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 3b11032..07fa209 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -28,12 +28,14 @@ function seven_preprocess_html(&$vars) {
  * Implements hook_preprocess_HOOK() for page.tpl.php.
  */
 function seven_preprocess_page(&$vars) {
-  $vars['primary_local_tasks'] = $vars['tabs'];
-  unset($vars['primary_local_tasks']['#secondary']);
-  $vars['secondary_local_tasks'] = array(
-    '#theme' => 'menu_local_tasks',
-    '#secondary' => isset($vars['tabs']['#secondary']) ? $vars['tabs']['#secondary'] : '',
-  );
+  if (isset($vars['tabs'])) {
+    $vars['primary_local_tasks'] = $vars['tabs'];
+    unset($vars['primary_local_tasks']['#secondary']);
+    $vars['secondary_local_tasks'] = array(
+      '#theme' => 'menu_local_tasks',
+      '#secondary' => isset($vars['tabs']['#secondary']) ? $vars['tabs']['#secondary'] : '',
+    );
+  }
 }
 
 /**
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 86ac064..68df877 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -229,7 +229,7 @@ pre {
 /**
  * Tabs.
  */
-ul.primary {
+div[role=tab] ul.primary {
   float: right; /* LTR */
   border-bottom: none;
   text-transform: uppercase;
@@ -237,18 +237,18 @@ ul.primary {
   margin: 0;
   padding-top: 0;
 }
-ul.primary li {
+div[role=tab] ul.primary li {
   float: left; /* LTR */
   list-style: none;
   height: 2.60em;
   margin: 0 2px;
 }
-ul.primary li a:link,
-ul.primary li a.active,
-ul.primary li a:active,
-ul.primary li a:visited,
-ul.primary li a:hover,
-ul.primary li.active a {
+div[role=tab] ul.primary li a:link,
+div[role=tab] ul.primary li a.active,
+div[role=tab] ul.primary li a:active,
+div[role=tab] ul.primary li a:visited,
+div[role=tab] ul.primary li a:hover,
+div[role=tab] ul.primary li.active a {
   display: block;
   float: left; /* LTR */
   padding: 0.615em 18px;
@@ -260,23 +260,23 @@ ul.primary li.active a {
   border-color: #a6a7a2;
   border-radius: 8px 8px 0 0;
 }
-ul.primary li.active a,
-ul.primary li.active a.active,
-ul.primary li.active a:active,
-ul.primary li.active a:visited {
+div[role=tab] ul.primary li.active a,
+div[role=tab] ul.primary li.active a.active,
+div[role=tab] ul.primary li.active a:active,
+div[role=tab] ul.primary li.active a:visited {
   background-color: #fff;
   border-color: #c9cac4;
 }
-ul.primary li a:hover {
+div[role=tab] ul.primary li a:hover {
   color: #fff;
 }
-ul.primary li.active a:hover {
+div[role=tab] ul.primary li.active a:hover {
   color: #000;
 }
 .tabs-secondary {
   clear: both;
 }
-ul.secondary {
+.tabs-secondary ul.secondary {
   float: right; /* LTR */
   font-size: 0.923em;
   padding: 0 3px 5px;
@@ -284,25 +284,25 @@ ul.secondary {
   overflow: hidden;
   background-color: #fff;
 }
-ul.secondary li {
+.tabs-secondary ul.secondary li {
   margin: 0 5px;
   float: none; /* LTR */
 }
-ul.secondary li a {
+.tabs-secondary ul.secondary li a {
   background-color: #ddd;
   color: #000;
   display: inline-block;
 }
-ul.secondary li a,
-ul.secondary li a:hover,
-ul.secondary li.active a,
-ul.secondary li.active a.active {
+.tabs-secondary ul.secondary li a,
+.tabs-secondary ul.secondary li a:hover,
+.tabs-secondary ul.secondary li.active a,
+.tabs-secondary ul.secondary li.active a.active {
   padding: 2px 10px;
   border-radius: 7px;
 }
-ul.secondary li a:hover,
-ul.secondary li.active a,
-ul.secondary li.active a.active {
+.tabs-secondary ul.secondary li a:hover,
+.tabs-secondary ul.secondary li.active a,
+.tabs-secondary ul.secondary li.active a.active {
   color: #fff;
   background: #666;
 }
@@ -990,35 +990,14 @@ body.in-maintenance #branding .step-indicator {
 }
 
 /* Overlay theming */
-.overlay #branding {
-  background-color: #fff;
-  padding-top: 15px;
-  padding-bottom: 15px;
-}
-.overlay #branding h1.page-title,
+.overlay #branding,
 .overlay #left,
 .overlay #footer {
   display: none;
 }
 .overlay #page {
   margin: 0;
-  padding: 0 20px;
-}
-.overlay #branding .breadcrumb {
-  float: left; /* LTR */
-  position: relative;
-  z-index: 10;
-}
-#overlay-tabs {
-  bottom: -1px;
-  font-size: 1.54em;
-  line-height: 1.54em;
-  margin: 0;
-}
-.overlay ul.secondary {
-  background: transparent none;
-  margin: -1.4em 0 0.3em 0; /* LTR */
-  overflow: visible;
+  padding: 15px;
 }
 .overlay #content {
   padding: 0;
@@ -1032,7 +1011,7 @@ h1#overlay-title {
 .add-or-remove-shortcuts a:hover span.text {
   color: #fff;
   background-color: #5f605b;
-  padding: 0 6px;
+  padding: 2px 6px;
   border-radius: 5px;
 }