diff --git a/admin/tool/policy/classes/output/page_viewalldoc.php b/admin/tool/policy/classes/output/page_viewalldoc.php
index 232547a52c4..f8dacf434d7 100644
--- a/admin/tool/policy/classes/output/page_viewalldoc.php
+++ b/admin/tool/policy/classes/output/page_viewalldoc.php
@@ -107,6 +107,10 @@ class page_viewalldoc implements renderable, templatable {
 
         $data->policies = array_values($this->policies);
 
+        array_walk($data->policies, function($item, $key) {
+            $item->policytypestr = get_string('policydoctype'.$item->type, 'tool_policy');
+        });
+
         return $data;
     }
 }
diff --git a/admin/tool/policy/lib.php b/admin/tool/policy/lib.php
index 410e05c7c9c..6c9afa90e0c 100644
--- a/admin/tool/policy/lib.php
+++ b/admin/tool/policy/lib.php
@@ -93,6 +93,25 @@ function tool_policy_before_standard_html_head() {
     return $message;
 }
 
+/**
+ * Callback to add footer elements.
+ *
+ * @return str valid html footer content
+ */
+function tool_policy_standard_footer_html() {
+    global $CFG;
+
+    $output = '';
+    if (!empty($CFG->sitepolicyhandler)
+            && $CFG->sitepolicyhandler == 'tool_policy') {
+        $url = (new moodle_url('/admin/tool/policy/viewall.php'))->out();
+        $output .= html_writer::link($url, get_string('userpolicysettings', 'tool_policy'));
+        $output = html_writer::div($output, 'policiesfooter');
+    }
+
+    return $output;
+}
+
 /**
  * Hooks redirection to policy acceptance pages before sign up.
  */
diff --git a/admin/tool/policy/templates/page_viewalldoc.mustache b/admin/tool/policy/templates/page_viewalldoc.mustache
index df70f1a52bb..d25e40c8978 100644
--- a/admin/tool/policy/templates/page_viewalldoc.mustache
+++ b/admin/tool/policy/templates/page_viewalldoc.mustache
@@ -32,31 +32,52 @@
     {
         "policies": [
             {
+                "id": "2",
                 "name": "Terms & conditions",
                 "summary": "Policy <u>summary</u>",
-                "content": "Policy <em>content</em>"
+                "content": "Policy <em>content</em>",
+                "policytypestr": "Site policy"
             },
             {
+                "id": "5",
                 "name": "Privacy",
                 "summary": "We keep your information private",
-                "content": "Very private"
+                "content": "Very private",
+                "policytypestr": "Privacy policy"
             }
         ]
     }
 }}
 
+<a id="top"></a>
+<div id="policies_index" class="m-b-3">
+<ul>
+    {{#policies }}
+        <li><a href="#policy-{{id}}">{{{name}}} ({{{policytypestr}}})</a></li>
+    {{/policies }}
+</ul>
+</div>
+
 {{#policies }}
+        <hr>
     <div class="policy_version m-b-3">
         <div class="clearfix m-t-2">
-            <h1>{{{name}}}</h1>
+            <h1><a id="policy-{{id}}">{{{name}}}</a></h1>
         </div>
         <div class="policy_document_summary clearfix m-b-1">
+            <h2>{{# str }} policydocsummary, tool_policy {{/ str }}</h2>
             {{{summary}}}
         </div>
         <div class="policy_document_content m-t-2">
+            <h2>{{# str }} policydoccontent, tool_policy {{/ str }}</h2>
             {{{content}}}
         </div>
-        <hr>
+        <div class="pull-right">
+            <a href="#top">
+                {{# str }} backtotop, tool_policy {{/ str }}
+                <i class="icon text-primary fa fa-caret-up" title="{{# str }} backtotop, tool_policy {{/ str }}" ></i>
+            </a>
+        </div>
     </div>
 
 {{/policies }}