diff --git a/lib/ajax/getnavbranch.php b/lib/ajax/getnavbranch.php
index b55ebf88904..5309c6b70ba 100644
--- a/lib/ajax/getnavbranch.php
+++ b/lib/ajax/getnavbranch.php
@@ -49,6 +49,7 @@ try {
     // This identifies the block instance requesting AJAX extension
     $instanceid = optional_param('instance', null, PARAM_INT);
 
+    $PAGE->set_url(new moodle_url('/lib/ajax/getnavbranch.php'));
     $PAGE->set_context(context_system::instance());
 
     // Create a global nav object
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 4e7a8fcdecc..68cfaef40be 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -2462,7 +2462,7 @@ class global_navigation extends navigation_node {
         $icon = new pix_icon(
             $activitydata->icon ?: 'monologo',
             get_string('modulename', $activitydata->modname),
-            $activitydata->modname
+            $activitydata->icon ? $activitydata->iconcomponent : $activitydata->modname,
         );
 
         // Prepare the default name and url for the node.