diff --git a/calendar/export.php b/calendar/export.php
index 59e785b18ab..cb48f4cc8b7 100644
--- a/calendar/export.php
+++ b/calendar/export.php
@@ -123,11 +123,13 @@ $calendar->set_sources($course, $courses);
 $pagetitle = get_string('export', 'calendar');
 
 $PAGE->navbar->add(get_string('managesubscriptions', 'calendar'), $managesubscriptionsurl);
-$PAGE->navbar->add($pagetitle);
+$PAGE->navbar->add(get_string('exportcalendar', 'calendar'), $url);
 
 // Print title and header.
+$headingstr = get_string('calendar', 'core_calendar');
+$headingstr = ($courseid != SITEID && !empty($courseid)) ? "{$headingstr}: {$COURSE->shortname}" : $headingstr;
 $PAGE->set_title($course->shortname.': '.get_string('calendar', 'calendar').': '.$pagetitle);
-$PAGE->set_heading($course->fullname);
+$PAGE->set_heading($headingstr);
 $PAGE->set_pagelayout('standard');
 
 $renderer = $PAGE->get_renderer('core_calendar');
diff --git a/calendar/import.php b/calendar/import.php
index 1e561b7009f..52bb68eeb06 100644
--- a/calendar/import.php
+++ b/calendar/import.php
@@ -98,14 +98,15 @@ if (!empty($category)) {
 }
 
 $heading = get_string('importcalendar', 'calendar');
+$headingstr = get_string('calendar', 'core_calendar');
+$headingstr = ($courseid != SITEID && !empty($courseid)) ? "{$headingstr}: {$COURSE->shortname}" : $headingstr;
 $pagetitle = $course->shortname . ': ' . get_string('calendar', 'calendar') . ': ' . $heading;
 
 $PAGE->set_title($pagetitle);
-$PAGE->set_heading($heading);
+$PAGE->set_heading($headingstr);
 $PAGE->set_url($pageurl);
 $PAGE->set_pagelayout('admin');
-$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'), $managesubscriptionsurl);
-$PAGE->navbar->add($heading);
+$PAGE->navbar->add($heading, $pageurl);
 $renderer = $PAGE->get_renderer('core_calendar');
 
 $customdata = [
diff --git a/calendar/managesubscriptions.php b/calendar/managesubscriptions.php
index 316b1f6b395..26c03a170fa 100644
--- a/calendar/managesubscriptions.php
+++ b/calendar/managesubscriptions.php
@@ -67,8 +67,7 @@ require_login($course, false);
 if (!calendar_user_can_add_event($course)) {
     print_error('errorcannotimport', 'calendar');
 }
-
-$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'));
+$PAGE->navbar->add(get_string('managesubscriptions', 'calendar'), $PAGE->url);
 
 $types = calendar_get_allowed_event_types($courseid);
 
@@ -140,7 +139,9 @@ $subscriptions = $DB->get_records_sql($sql, $params);
 
 // Print title and header.
 $PAGE->set_title("$course->shortname: ".get_string('calendar', 'calendar').": ".get_string('subscriptions', 'calendar'));
-$PAGE->set_heading($course->fullname);
+$heading = get_string('calendar', 'core_calendar');
+$heading = ($courseid != SITEID && !empty($courseid)) ? "{$heading}: {$COURSE->shortname}" : $heading;
+$PAGE->set_heading($heading);
 
 $renderer = $PAGE->get_renderer('core_calendar');
 
diff --git a/calendar/view.php b/calendar/view.php
index 827bbdaa233..1f3f8b84093 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -138,8 +138,8 @@ switch($view) {
 $PAGE->set_pagelayout('standard');
 $PAGE->set_title("$course->shortname: $strcalendar: $pagetitle");
 
-$headingstr = ($iscoursecalendar) ? get_string('coursecalendar', 'core_calendar', $COURSE->shortname) :
-        get_string('calendar', 'core_calendar');
+$headingstr = get_string('calendar', 'core_calendar');
+$headingstr = ($iscoursecalendar) ? "{$headingstr}: {$COURSE->shortname}" : $headingstr;
 $PAGE->set_heading($headingstr);
 
 $renderer = $PAGE->get_renderer('core_calendar');