diff --git a/layouts/index.html b/layouts/index.html
index 0d7e1029b1..be3bd94616 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,6 +1,8 @@
 {{- partial "header.html" . }}
 <span id="sidebar-toggle-span">
-<a href="#" id="sidebar-toggle" data-sidebar-toggle=""><i class="fas fa-bars"></i>{{T "Navigation-toggle"}}</a>
+    <a href="#" id="sidebar-toggle" title='{{ T "Navigation-toggle" }}' data-sidebar-toggle="">
+        <i class="fas fa-bars"></i>
+    </a>
 </span>
 
 {{if .Site.Home.Content }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index cbb15b43d0..037efd3bbe 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -38,7 +38,6 @@
           <div id="top-github-link">
             <a class="github-link" title='{{ T "Edit-this-page" }}' href="{{ $Site.Params.editURL }}{{ replace $File.Dir "\\" "/" }}{{ $File.LogicalName }}" target="blank">
               <i class="fas fa-code-branch"></i>
-              <span id="top-github-link-text">{{T "Edit-this-page"}}</span>
             </a>
           </div>
           {{- end }}
@@ -48,7 +47,7 @@
         {{- $toc := (and (not $currentDisableToc) (not .Params.chapter)) }}
           <div id="breadcrumbs">
             <span id="sidebar-toggle-span">
-              <a href="#" id="sidebar-toggle" data-sidebar-toggle="">
+              <a href="#" id="sidebar-toggle" title='{{ T "Navigation-toggle" }}' data-sidebar-toggle="">
                 <i class="fas fa-bars"></i>
               </a>
             </span>
diff --git a/static/css/theme.css b/static/css/theme.css
index dfef2e50d0..0c6ff6e23a 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -954,6 +954,7 @@ td {
 #sidebar-toggle-span {
     display: none;
 }
+
 @media only all and (max-width: 47.938em) {
     #sidebar-toggle-span {
         display: inline;
@@ -1016,7 +1017,7 @@ a[aria-disabled="true"] {
         overflow: hidden;
     }
     .sidebar-hidden #overlay {
-        background-color: rgba(255, 255, 255, 0.5);
+        background-color: rgba(134, 134, 134, 0.5);
         bottom: 0;
         cursor: pointer;
         left: 0;
@@ -1231,6 +1232,11 @@ option {
     width: 100%;
 }
 
+#sidebar-toggle-span a.highlight:after,
+#top-github-link a.highlight:after {
+    background-color: transparent;
+}
+
 .progress {
     background-color: rgba(246, 246, 246, 0.97);
     border: thin solid #ECECEC;