diff --git a/course/classes/output/activity_navigation.php b/course/classes/output/activity_navigation.php
index 84461428b6d..7412eaebbfa 100644
--- a/course/classes/output/activity_navigation.php
+++ b/course/classes/output/activity_navigation.php
@@ -74,7 +74,6 @@ class activity_navigation implements renderable, templatable {
             $attributes = [
                 'class' => 'btn btn-link',
                 'id' => 'prev-activity-link',
-                'title' => $linkname,
             ];
             $this->prevlink = new \action_link($linkurl, $OUTPUT->larrow() . ' ' . $linkname, null, $attributes);
         }
@@ -90,7 +89,6 @@ class activity_navigation implements renderable, templatable {
             $attributes = [
                 'class' => 'btn btn-link',
                 'id' => 'next-activity-link',
-                'title' => $linkname,
             ];
             $this->nextlink = new \action_link($linkurl, $linkname . ' ' . $OUTPUT->rarrow(), null, $attributes);
         }
diff --git a/lib/templates/action_link.mustache b/lib/templates/action_link.mustache
index 0616c6345cb..fde8f5b52dc 100644
--- a/lib/templates/action_link.mustache
+++ b/lib/templates/action_link.mustache
@@ -52,11 +52,11 @@
     }
 }}
 {{^disabled}}
-    <a href="{{{url}}}" id="{{id}}" class="{{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</a>
+    <a href="{{{url}}}" id="{{id}}" class="{{classes}}" {{#attributes}} {{name}}="{{value}}" {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</a>
     {{#hasactions}}
         {{> core/actions }}
     {{/hasactions}}
 {{/disabled}}
 {{#disabled}}
-    <span class="currentlink {{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}</span>
+    <span class="currentlink {{classes}}" {{#attributes}} {{name}}="{{value}}" {{/attributes}}>{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{text}}</span>
 {{/disabled}}