diff --git a/docs/_includes/footer.htm b/docs/_includes/footer.htm
index e31df67b59..1417b17920 100644
--- a/docs/_includes/footer.htm
+++ b/docs/_includes/footer.htm
@@ -6,7 +6,7 @@
 	<ul span=12 row>
 		<li span=12>
 			<ul>
-				<li><a href="{{ "/" | prepend:site.baseurl }}">GitHub</a>
+				<li><a href="{{ "/" | prepend:site.baseurl }}">Home</a>
 			</ul>
 	</ul>
 </footer>
diff --git a/docs/_includes/github.htm b/docs/_includes/github.htm
index ea1afec6b0..dd8b52e328 100644
--- a/docs/_includes/github.htm
+++ b/docs/_includes/github.htm
@@ -1,19 +1,19 @@
-<script>
-    window.onload = function() {
-      var currentURL = window.location.href;
-      var regex = /https:\/\/bnd.bndtools.org\/(.*\.html)/;
-      var matches = currentURL.match(regex);
-      var filePath = matches[1];
-	  if (filePath.includes("/")) 
-		  filePath = "_" + filePath;
-      var markdownFileURL = 'https://github.com/bndtools/bnd/blob/master/docs/' + filePath.replace(".html", ".md");
-      var repoLink = document.getElementById('repo-link');
-      repoLink.href = markdownFileURL;		
-    };
-</script>
-
-<a id="repo-link" href="https://github.com/bndtools/bnd/docs/" target="_"><img
-	style="position:absolute;top:0;right:0;margin:0;padding:0;z-index:100"
-	src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67"
-	alt="Fork me on GitHub"
-	data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
+<a
+	id="repo-link"
+	href="https://github.com/bndtools/bnd/blob/master/docs/{{page.path}}"
+	target="_blank"
+>
+	<img
+		style="
+			position: absolute;
+			top: 0;
+			right: 0;
+			margin: 0;
+			padding: 4px;
+			z-index: 100;
+			width: 45px;
+		"
+		src="/img/github-mark.svg"
+		alt="Fork me on GitHub"
+		title="Fork me on GitHub"
+/></a>
diff --git a/docs/css/style.scss b/docs/css/style.scss
index 0b3e37478e..c4911fe274 100644
--- a/docs/css/style.scss
+++ b/docs/css/style.scss
@@ -91,7 +91,7 @@ $color-vignette:	#F0F0F0;
 	.search-container {
         width: 100%;
         input[type=text] {
-          width: calc(100% - 40px);
+          width: calc(100% - 65px);
           padding: 6px;
           margin-top: 8px;
           border: none;
@@ -102,7 +102,7 @@ $color-vignette:	#F0F0F0;
               width: 32px;
               padding: 6px 10px;
               margin-top: 8px;
-              margin-right: 0px;
+              margin-right: 28px;
               background: #ddd;
               border: none;
               border-radius: 4px;
@@ -122,9 +122,7 @@ $color-vignette:	#F0F0F0;
 
 .selected {
 	&:before { content: "\25B7\00A0"; }
-	font-weight: bolder;
 	color: $secondary-color;
-	font-size: 1.05em;
 }
 
 embed.illustration {
@@ -193,6 +191,7 @@ ul.side-nav{
 ul .side-nav-section{
   color: #720F10;
   font-weight: bold;
+  font-size: 1.05em;
 }
 
 .side-nav{
diff --git a/docs/img/github-mark.svg b/docs/img/github-mark.svg
new file mode 100644
index 0000000000..37fa923df3
--- /dev/null
+++ b/docs/img/github-mark.svg
@@ -0,0 +1 @@
+<svg width="98" height="96" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M48.854 0C21.839 0 0 22 0 49.217c0 21.756 13.993 40.172 33.405 46.69 2.427.49 3.316-1.059 3.316-2.362 0-1.141-.08-5.052-.08-9.127-13.59 2.934-16.42-5.867-16.42-5.867-2.184-5.704-5.42-7.17-5.42-7.17-4.448-3.015.324-3.015.324-3.015 4.934.326 7.523 5.052 7.523 5.052 4.367 7.496 11.404 5.378 14.235 4.074.404-3.178 1.699-5.378 3.074-6.6-10.839-1.141-22.243-5.378-22.243-24.283 0-5.378 1.94-9.778 5.014-13.2-.485-1.222-2.184-6.275.486-13.038 0 0 4.125-1.304 13.426 5.052a46.97 46.97 0 0 1 12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155 3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08 13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#24292f"/></svg>
\ No newline at end of file