diff --git a/core/modules/overlay/overlay-child-rtl.css b/core/modules/overlay/overlay-child-rtl.css
index 4ff6a58..79b6ce1 100644
--- a/core/modules/overlay/overlay-child-rtl.css
+++ b/core/modules/overlay/overlay-child-rtl.css
@@ -8,11 +8,7 @@ html {
   direction: rtl;
 }
 
-#overlay-title {
-  float: right;
-  left: auto;
-}
-#overlay-close-wrapper {
-  left: 25px;
+#overlay-close {
+  left: 5px;
   right: auto;
 }
diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css
index aa23d37..e38fe87 100644
--- a/core/modules/overlay/overlay-child.css
+++ b/core/modules/overlay/overlay-child.css
@@ -55,22 +55,17 @@ body.overlay #branding h1.page-title {
   color: #fff; /* This is white to contrast with the dark background behind it. */
 }
 
-#overlay-close-wrapper {
-  position: absolute;
-  right: 25px; /* LTR */
-  top: 5px;
-  z-index: 40;
-}
-#overlay-close,
-#overlay-close:hover {
-  background: transparent url(images/close.png) no-repeat;
+#overlay-close {
+  background: transparent url("images/close.png") no-repeat scroll;
+  cursor: pointer;
   display: block;
-  height: 26px;
-  margin: 0;
+  height: 21px;
   padding: 0;
-  /* Replace with position:fixed to get a scrolling close button. */
   position: absolute;
-  width: 26px;
+  right: 5px; /* LTR */
+  top: 5px;
+  width: 21px;
+  z-index: 40;
 }
 
 /**
diff --git a/core/modules/overlay/templates/overlay.tpl.php b/core/modules/overlay/templates/overlay.tpl.php
index 8baf621..29d6599 100644
--- a/core/modules/overlay/templates/overlay.tpl.php
+++ b/core/modules/overlay/templates/overlay.tpl.php
@@ -23,9 +23,7 @@
 
 <?php print render($disable_overlay); ?>
 <div id="overlay" <?php print $attributes; ?>>
-  <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>
+  <a id="overlay-close" class="overlay-close" role="button" aria-disabled="false"><span class="element-invisible"><?php print t('Close overlay'); ?></span></a>
   <div id="overlay-content"<?php print $content_attributes; ?>>
     <?php print $page; ?>
   </div>