diff --git a/src/partials/download-this-page.hbs b/src/partials/download-this-page.hbs
new file mode 100644
index 0000000..08204eb
--- /dev/null
+++ b/src/partials/download-this-page.hbs
@@ -0,0 +1,5 @@
+{{#if page.attributes.pdf-filename}}
+  &nbsp;<i class="fa-solid fa-download"></i>&nbsp;
+  <a href="{{{page.attributes.pdf-filename}}}" title="Save page as PDF">Download</a>
+  &nbsp;&nbsp; &nbsp;&nbsp;
+{{/if}}
diff --git a/src/partials/edit-this-page.hbs b/src/partials/edit-this-page.hbs
index 27946f4..e6e0042 100644
--- a/src/partials/edit-this-page.hbs
+++ b/src/partials/edit-this-page.hbs
@@ -1,5 +1,9 @@
 {{#if (and page.fileUri (not env.CI))}}
-<div class="edit-this-page"><a href="{{page.fileUri}}">Edit this Page</a></div>
+  <i class="fa-brands fa-github"></i>&nbsp;
+<div class="edit-this-page"><a href="{{page.fileUri}}" title="View/edit the source of this page">Edit</a></div>
+  &nbsp;&nbsp;
 {{else if (and page.editUrl (or env.FORCE_SHOW_EDIT_PAGE_LINK (not page.origin.private)))}}
-<div class="edit-this-page"><a href="{{page.editUrl}}">Edit this Page</a></div>
+  <i class="fa-brands fa-github"></i>&nbsp;
+<div class="edit-this-page"><a href="{{page.editUrl}}" title="View/edit the source of this page">Edit</a></div>
+  &nbsp;&nbsp;
 {{/if}}
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index 862900f..ede07dd 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -25,7 +25,7 @@
           <a class="navbar-item" href="{{{or site.url siteRootPath}}}/txprotect/current/index.html">Protect {{#if page.attributes.txprotect-current-version}}<small>v{{{page.attributes.txprotect-current-version}}}{{/if}}</small></a>
         </div>
       </div>
-        {{#if page.attributes.pdf-filename}}
+        <!--{{#if page.attributes.pdf-filename}}
         <div class="navbar-item">
           <span class="control">
             <a class="button is-primary" title="Export and save the current page in PDF format."
@@ -34,7 +34,7 @@
             </a>
           </span>
         </div>
-        {{/if}}
+        {{/if}}-->
       </div>
     </div>
   </nav>
diff --git a/src/partials/page-versions.hbs b/src/partials/page-versions.hbs
index a9792db..f3fc78b 100644
--- a/src/partials/page-versions.hbs
+++ b/src/partials/page-versions.hbs
@@ -1,6 +1,8 @@
 {{#with page.versions}}
 <div class="page-versions">
-  <button class="version-menu-toggle" title="Show other versions of page">{{@root.page.componentVersion.displayVersion}}</button>
+  <button class="version-menu-toggle" title="Show other versions of page">
+    &nbsp;<i class="fa-solid fa-tag"></i>&nbsp;
+    {{@root.page.componentVersion.displayVersion}}</button>
   <div class="version-menu">
     {{#each this}}
     <a class="version
diff --git a/src/partials/toolbar.hbs b/src/partials/toolbar.hbs
index f0e0bb6..a831445 100644
--- a/src/partials/toolbar.hbs
+++ b/src/partials/toolbar.hbs
@@ -5,8 +5,7 @@
   {{/with}}
 {{> breadcrumbs}}
 {{> page-versions}}
-  {{#if page.editUrl}}
-    <i class="fa-brands fa-github"></i>
-  <div class="edit-this-page"> <a href="{{page.editUrl}}">&nbsp; Edit this page</a></div>
-  {{/if}}
+{{> download-this-page}}
+{{> edit-this-page}}
+
   </div>