diff --git a/mod/lesson/editpage_form.php b/mod/lesson/editpage_form.php
index 7777447eedc..dd137cde9c9 100644
--- a/mod/lesson/editpage_form.php
+++ b/mod/lesson/editpage_form.php
@@ -46,7 +46,6 @@ class lesson_add_page_form_selection extends lesson_add_page_form_base {
         $types = $this->manager->get_page_type_strings(lesson_page::TYPE_QUESTION);
         asort($types);
         $mform->addElement('select', 'qtype', get_string('selectaqtype', 'lesson'), $types);
-        $mform->setHelpButton('qtype', array('questiontypes', get_string("questiontype", "lesson"), "lesson"));
     }
 }
 
@@ -54,4 +53,4 @@ class lesson_add_page_form_selection extends lesson_add_page_form_base {
  * Dummy class to represent an unknown question type and direct to the selection
  * form.
  */
-final class lesson_add_page_form_unknown extends lesson_add_page_form_base {}
\ No newline at end of file
+final class lesson_add_page_form_unknown extends lesson_add_page_form_base {}
diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index 3eaef03ece7..14fd45281be 100644
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -62,7 +62,7 @@ $mform->set_data($data);
     $PAGE->set_heading($strimportquestions);
     echo $OUTPUT->header();
 
-echo $OUTPUT->heading_with_help($strimportquestions, 'import', 'lesson' );
+echo $OUTPUT->heading_with_help($strimportquestions, 'importquestions', 'lesson' );
 
 if ($data = $mform->get_data()) {
 
@@ -104,4 +104,4 @@ if ($data = $mform->get_data()) {
     $mform->display();
 }
 
-echo $OUTPUT->footer();
\ No newline at end of file
+echo $OUTPUT->footer();
diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php
index 5f803c078af..6aaef17ef56 100644
--- a/mod/lesson/lang/en/lesson.php
+++ b/mod/lesson/lang/en/lesson.php
@@ -79,7 +79,6 @@ $string['cannotfindrecords'] = 'Error: could not find lesson records';
 $string['cannotfindtimer'] = 'Error: could not find lesson_timer records';
 $string['cannotfinduser'] = 'Error: could not find users';
 $string['canretake'] = '{$a} can re-take';
-$string['canretake_help'] = 'If enabled, students can attempt the lesson more than once.';
 $string['casesensitive'] = 'Use regular expressions';
 $string['casesensitive_help'] = 'Tick the checkbox to use regular expressions for analysing responses.';
 $string['classstats'] = 'Class statistics';
@@ -131,10 +130,10 @@ $string['displaydefaultfeedback'] = 'Display default feedback';
 $string['displaydefaultfeedback_help'] = 'If enabled, when a response is not found for a particular question, the default response of "That\'s the correct answer" or "That\'s the wrong answer" will be shown.';
 $string['displayhighscores'] = 'Display high scores';
 $string['displayinleftmenu'] = 'Display in left menu?';
-$string['displayleftif'] = 'Display left menu only if grade greater than:';
+$string['displayleftif'] = 'Display left menu only if grade greater than';
+$string['displayleftif_help'] = 'This setting determines whether a student must obtain a certain grade before viewing the left menu. This forces the student to go through the entire lesson on their first attempt, then after obtaining the required grade they can use the left menu for review.';
 $string['displayleftmenu'] = 'Display left menu';
 $string['displayleftmenu_help'] = 'If enabled, a list of pages (branch tables) is displayed.';
-$string['displayleftmenuif'] = 'Display left menu: grade condition';
 $string['displayofgrade'] = 'Display of grade (for students only)';
 $string['displayreview'] = 'Display review button';
 $string['displayreview_help'] = 'If enabled, a review button is shown after an incorrectly answered question, allowing a student to re-attempt it.';
@@ -181,7 +180,7 @@ $string['handlingofretakes_help'] = 'If re-takes are allowed, this setting speci
 $string['havenotgradedyet'] = 'Have not graded yet.';
 $string['here'] = 'here';
 $string['highscore'] = 'High score';
-$string['highscores'] = 'High Scores';
+$string['highscores'] = 'High scores';
 $string['hightime'] = 'High time';
 $string['checkbranchtable'] = 'Check branch table';
 $string['checkedthisone'] = 'checked this one.';
@@ -208,7 +207,6 @@ $string['lessonattempted'] = 'Lesson attempted';
 $string['lessonclosed'] = 'This lesson closed on {$a}.';
 $string['lessoncloses'] = 'Lesson closes';
 $string['lessoncloseson'] = 'Lesson closes on {$a}';
-$string['lessondefault'] = 'Use this lesson\'s settings as defaults';
 $string['lesson:edit'] = 'Edit a lesson activity';
 $string['lessonformating'] = 'Lesson formatting';
 $string['lesson:manage'] = 'Manage a lesson activity';
@@ -236,7 +234,6 @@ $string['maximumnumberofattempts'] = 'Maximum number of attempts';
 $string['maximumnumberofattempts_help'] = 'This setting specifies the maximum number of attempts allowed for each question. It applies to all questions in the lesson regardless of their type.';
 $string['maximumnumberofattemptsreached'] = 'Maximum number of attempts reached - Moving to next page';
 $string['maxtime'] = 'Time limit (minutes)';
-$string['maxtime_help'] = 'To set a time limit, tick the enable checkbox and enter the time limit in minutes. The timer does not evict a student from the lesson when the time is up, however a question answered after the time limit is not counted.';
 $string['maxtimewarning'] = 'You have {$a} minute(s) to finish the lesson.';
 $string['mediaclose'] = 'Show close button:';
 $string['mediafile'] = 'Pop-up to file or web page';
@@ -346,6 +343,7 @@ $string['report'] = 'Report';
 $string['reports'] = 'Reports';
 $string['response'] = 'Response';
 $string['retakesallowed'] = 'Re-takes allowed';
+$string['retakesallowed_help'] = 'If enabled, students can attempt the lesson more than once.';
 $string['returnto'] = 'Return to {$a}';
 $string['returntocourse'] = 'Return to the course';
 $string['review'] = 'Review';
@@ -368,11 +366,8 @@ $string['skip'] = 'Skip navigation';
 $string['slideshow'] = 'Slideshow';
 $string['slideshow_help'] = 'If enabled, the lesson is displayed as a slideshow, with a fixed width and height.';
 $string['slideshowbgcolor'] = 'Slideshow background colour';
-$string['slideshowbgcolor_help'] = 'This setting specifies the background colour of the slides as a 6-figure hexadecimal number.';
 $string['slideshowheight'] = 'Slideshow height';
-$string['slideshowheight_help'] = 'This setting specifies the height in pixels of the slides.';
 $string['slideshowwidth'] = 'Slideshow width';
-$string['slideshowwidth_help'] = 'This setting specifies the width in pixels of the slides.';
 $string['startlesson'] = 'Start lesson';
 $string['studentattemptlesson'] = '{$a->lastname}, {$a->firstname}\'s attempt number {$a->attempt}';
 $string['studentname'] = '{$a} Name';
@@ -386,7 +381,6 @@ $string['thatsthecorrectanswer'] = 'That\'s the correct answer';
 $string['thatsthewronganswer'] = 'That\'s the wrong answer';
 $string['thefollowingpagesjumptothispage'] = 'The following pages jump to this page';
 $string['thispage'] = 'This page';
-$string['timed'] = 'Timed';
 $string['timeremaining'] = 'Time remaining';
 $string['timespenterror'] = 'Spend at least {$a} minutes in the lesson';
 $string['timespentminutes'] = 'Time spent (minutes)';
@@ -399,7 +393,6 @@ $string['unseenpageinbranch'] = 'Unseen question within a branch';
 $string['unsupportedqtype'] = 'Unsupported question type ({$a})!';
 $string['updatedpage'] = 'Updated page';
 $string['updatefailed'] = 'Update failed';
-$string['useeditor_help'] = 'If enabled, an HTML editor will be available after clicking the "Redisplay page" button at the bottom of the page.';
 $string['usemaximum'] = 'Use maximum';
 $string['usemean'] = 'Use mean';
 $string['usepassword'] = 'Password protected lesson';
diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index a7ed35ad05c..1a4e064644a 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -3037,7 +3037,7 @@ abstract class lesson_add_page_form_base extends moodleform {
         }
         $this->_form->addElement('select', $name, $label, $this->_customdata['jumpto']);
         $this->_form->setDefault($name, $selected);
-        $this->_form->setHelpButton($name, array("jumpto", $title, "lesson"));
+        $this->_form->addHelpButton($name, 'jumps', 'lesson');
     }
 
     /**
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index acf0ff9ee04..77f49e15873 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -454,8 +454,6 @@ function lesson_mediafile_block_contents($cmid, $lesson) {
     $action = new popup_action('click', $link, 'lessonmediafile', $options);
     $content = $OUTPUT->action_link($link, get_string('mediafilepopup', 'lesson'), $action, array('title'=>get_string('mediafilepopup', 'lesson')));
 
-    $content .= $OUTPUT->old_help_icon("mediafilestudent", get_string("mediafile", "lesson"), "lesson");
-
     $bc = new block_contents();
     $bc->title = get_string('linkedmedia', 'lesson');
     $bc->attributes['class'] = 'mediafile';
diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php
index 7140d4f023f..2cddce92d53 100644
--- a/mod/lesson/mod_form.php
+++ b/mod/lesson/mod_form.php
@@ -103,7 +103,6 @@ class mod_lesson_mod_form extends moodleform_mod {
         $mform->setDefault('timed', 0);
         $mform->setDefault('maxtime', 20);
         $mform->setType('maxtime', PARAM_INT);
-        $mform->setHelpButton('timedgrp', array('timed', get_string('timed', 'lesson'), 'lesson'));
 
         $numbers = array();
         for ($i=20; $i>1; $i--) {
@@ -119,15 +118,14 @@ class mod_lesson_mod_form extends moodleform_mod {
         $mform->addElement('select', 'maxanswers', get_string('maximumnumberofanswersbranches', 'lesson'), $numbers);
         $mform->setDefault('maxanswers', $CFG->lesson_maxanswers);
         $mform->setType('maxanswers', PARAM_INT);
-        $mform->setHelpButton('maxanswers', array('maxanswers', get_string('maximumnumberofanswersbranches', 'lesson'), 'lesson'));
+        $mform->addHelpButton('maxanswers', 'maximumnumberofanswersbranches', 'lesson');
 
         $mform->addElement('selectyesno', 'usepassword', get_string('usepassword', 'lesson'));
-        $mform->setHelpButton('usepassword', array('usepassword', get_string('usepassword', 'lesson'), 'lesson'));
+        $mform->addHelpButton('usepassword', 'usepassword', 'lesson');
         $mform->setDefault('usepassword', 0);
         $mform->setAdvanced('usepassword');
 
         $mform->addElement('passwordunmask', 'password', get_string('password', 'lesson'));
-        $mform->setHelpButton('password', array('password', get_string('password', 'lesson'), 'lesson'));
         $mform->setDefault('password', '');
         $mform->setType('password', PARAM_RAW);
         $mform->setAdvanced('password');
@@ -137,47 +135,47 @@ class mod_lesson_mod_form extends moodleform_mod {
         $mform->addElement('header', 'gradeoptions', get_string('gradeoptions', 'lesson'));
 
         $mform->addElement('selectyesno', 'practice', get_string('practice', 'lesson'));
-        $mform->setHelpButton('practice', array('practice', get_string('practice', 'lesson'), 'lesson'));
+        $mform->addHelpButton('practice', 'practice', 'lesson');
         $mform->setDefault('practice', 0);
 
         $mform->addElement('selectyesno', 'custom', get_string('customscoring', 'lesson'));
-        $mform->setHelpButton('custom', array('custom', get_string('customscoring', 'lesson'), 'lesson'));
+        $mform->addHelpButton('custom', 'customscoring', 'lesson');
         $mform->setDefault('custom', 1);
 
         $grades = array();
         for ($i=100; $i>=0; $i--) {
             $grades[$i] = $i;
         }
-        $mform->addElement('select', 'grade', get_string('maximumgrade'), $grades);
+        $mform->addElement('select', 'grade', get_string('maxgrade', 'lesson'), $grades);
         $mform->setDefault('grade', 0);
-        $mform->setHelpButton('grade', array('grade', get_string('maximumgrade'), 'lesson'));
+        $mform->addHelpButton('grade', 'maxgrade', 'lesson');
         $mform->disabledIf('grade', 'practice', 'eq', '1');
 
         $mform->addElement('selectyesno', 'retake', get_string('retakesallowed', 'lesson'));
-        $mform->setHelpButton('retake', array('retake', get_string('retakesallowed', 'lesson'), 'lesson'));
+        $mform->addHelpButton('retake', 'retakesallowed', 'lesson');
         $mform->setDefault('retake', 0);
 
         $options = array();
         $options[0] = get_string('usemean', 'lesson');
         $options[1] = get_string('usemaximum', 'lesson');
         $mform->addElement('select', 'usemaxgrade', get_string('handlingofretakes', 'lesson'), $options);
-        $mform->setHelpButton('usemaxgrade', array('handlingofretakes', get_string('handlingofretakes', 'lesson'), 'lesson'));
+        $mform->addHelpButton('usemaxgrade', 'handlingofretakes', 'lesson');
         $mform->setDefault('usemaxgrade', 0);
         $mform->disabledIf('usemaxgrade', 'retake', 'eq', '0');
 
         $mform->addElement('selectyesno', 'ongoing', get_string('ongoing', 'lesson'));
-        $mform->setHelpButton('ongoing', array('ongoing', get_string('ongoing', 'lesson'), 'lesson'));
+        $mform->addHelpButton('ongoing', 'ongoing', 'lesson');
         $mform->setDefault('ongoing', 0);
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'flowcontrol', get_string('flowcontrol', 'lesson'));
 
         $mform->addElement('selectyesno', 'modattempts', get_string('modattempts', 'lesson'));
-        $mform->setHelpButton('modattempts', array('modattempts', get_string('modattempts', 'lesson'), 'lesson'));
+        $mform->addHelpButton('modattempts', 'modattempts', 'lesson');
         $mform->setDefault('modattempts', 0);
 
         $mform->addElement('selectyesno', 'review', get_string('displayreview', 'lesson'));
-        $mform->setHelpButton('review', array('review', get_string('displayreview', 'lesson'), 'lesson'));
+        $mform->addHelpButton('review', 'displayreview', 'lesson');
         $mform->setDefault('review', 0);
 
         $numbers = array();
@@ -185,28 +183,28 @@ class mod_lesson_mod_form extends moodleform_mod {
             $numbers[$i] = $i;
         }
         $mform->addElement('select', 'maxattempts', get_string('maximumnumberofattempts', 'lesson'), $numbers);
-        $mform->setHelpButton('maxattempts', array('maxattempts', get_string('maximumnumberofattempts', 'lesson'), 'lesson'));
+        $mform->addHelpButton('maxattempts', 'maximumnumberofattempts', 'lesson');
         $mform->setDefault('maxattempts', 1);
 
         $defaultnextpages = array();
-        $defaultnextpages[0] = get_string("normal", "lesson");
-        $defaultnextpages[LESSON_UNSEENPAGE] = get_string("showanunseenpage", "lesson");
-        $defaultnextpages[LESSON_UNANSWEREDPAGE] = get_string("showanunansweredpage", "lesson");
+        $defaultnextpages[0] = get_string('normal', 'lesson');
+        $defaultnextpages[LESSON_UNSEENPAGE] = get_string('showanunseenpage', 'lesson');
+        $defaultnextpages[LESSON_UNANSWEREDPAGE] = get_string('showanunansweredpage', 'lesson');
         $mform->addElement('select', 'nextpagedefault', get_string('actionaftercorrectanswer', 'lesson'), $defaultnextpages);
-        $mform->setHelpButton('nextpagedefault', array('nextpageaction', get_string('actionaftercorrectanswer', 'lesson'), 'lesson'));
+        $mform->addHelpButton('nextpagedefault', 'actionaftercorrectanswer', 'lesson');
         $mform->setDefault('nextpagedefault', $CFG->lesson_defaultnextpage);
         $mform->setAdvanced('nextpagedefault');
 
         $mform->addElement('selectyesno', 'feedback', get_string('displaydefaultfeedback', 'lesson'));
-        $mform->setHelpButton('feedback', array('feedback', get_string('displaydefaultfeedback', 'lesson'), 'lesson'));
+        $mform->addHelpButton('feedback', 'displaydefaultfeedback', 'lesson');
         $mform->setDefault('feedback', 0);
 
         $mform->addElement('selectyesno', 'progressbar', get_string('progressbar', 'lesson'));
-        $mform->setHelpButton('progressbar', array('progressbar', get_string('progressbar', 'lesson'), 'lesson'));
+        $mform->addHelpButton('progressbar', 'progressbar', 'lesson');
         $mform->setDefault('progressbar', 0);
 
         $mform->addElement('selectyesno', 'displayleft', get_string('displayleftmenu', 'lesson'));
-        $mform->setHelpButton('displayleft', array('displayleft', get_string('displayleftmenu', 'lesson'), 'lesson'));
+        $mform->addHelpButton('displayleft', 'displayleftmenu', 'lesson');
         $mform->setDefault('displayleft', 0);
 
         $options = array();
@@ -214,7 +212,7 @@ class mod_lesson_mod_form extends moodleform_mod {
             $options[$i] = $i.'%';
         }
         $mform->addElement('select', 'displayleftif', get_string('displayleftif', 'lesson'), $options);
-        $mform->setHelpButton('displayleftif', array('displayleftif', get_string('displayleftmenuif', 'lesson'), 'lesson'));
+        $mform->addHelpButton('displayleftif', 'displayleftif', 'lesson');
         $mform->setDefault('displayleftif', 0);
         $mform->setAdvanced('displayleftif');
 
@@ -223,7 +221,7 @@ class mod_lesson_mod_form extends moodleform_mod {
             $numbers[$i] = $i;
         }
         $mform->addElement('select', 'minquestions', get_string('minimumnumberofquestions', 'lesson'), $numbers);
-        $mform->setHelpButton('minquestions', array('minquestions', get_string('minimumnumberofquestions', 'lesson'), 'lesson'));
+        $mform->addHelpButton('minquestions', 'minimumnumberofquestions', 'lesson');
         $mform->setDefault('minquestions', 0);
         $mform->setAdvanced('minquestions');
 
@@ -232,12 +230,12 @@ class mod_lesson_mod_form extends moodleform_mod {
             $numbers[$i] = $i;
         }
         $mform->addElement('select', 'maxpages', get_string('numberofpagestoshow', 'lesson'), $numbers);
-        $mform->setHelpButton('maxpages', array('maxpages', get_string('numberofpagestoshow', 'lesson'), 'lesson'));
+        $mform->addHelpButton('maxpages', 'numberofpagestoshow', 'lesson');
         $mform->setAdvanced('maxpages');
         $mform->setDefault('maxpages', 0);
 
         $mform->addElement('selectyesno', 'slideshow', get_string('slideshow', 'lesson'));
-        $mform->setHelpButton('slideshow', array('slideshow', get_string('slideshow', 'lesson'), 'lesson'));
+        $mform->addHelpButton('slideshow', 'slideshow', 'lesson');
         $mform->setDefault('slideshow', 0);
         $mform->setAdvanced('slideshow');
 
@@ -257,7 +255,7 @@ class mod_lesson_mod_form extends moodleform_mod {
             $modinstances=array(0=>get_string('none'))+$modinstances;
 
             $mform->addElement('select', 'activitylink', get_string('activitylink', 'lesson'), $modinstances);
-            $mform->setHelpButton('activitylink', array('activitylink', get_string('activitylink', 'lesson'), 'lesson'));
+            $mform->addHelpButton('activitylink', 'activitylink', 'lesson');
             $mform->setDefault('activitylink', 0);
             $mform->setAdvanced('activitylink');
         }
@@ -269,7 +267,7 @@ class mod_lesson_mod_form extends moodleform_mod {
         $filepickeroptions['filetypes'] = '*';
         $filepickeroptions['maxbytes'] = $this->course->maxbytes;
         $mform->addElement('filepicker', 'mediafile', get_string('mediafile', 'lesson'), null, $filepickeroptions);
-        $mform->setHelpButton('mediafile', array('mediafile', get_string('mediafile', 'lesson'), 'lesson'));
+        $mform->addHelpButton('mediafile', 'mediafile', 'lesson');
         $mform->setDefault('mediafile', '');
 
 //-------------------------------------------------------------------------------
@@ -285,7 +283,7 @@ class mod_lesson_mod_form extends moodleform_mod {
             }
         }
         $mform->addElement('select', 'dependency', get_string('dependencyon', 'lesson'), $options);
-        $mform->setHelpButton('dependency', array('dependency', get_string('dependencyon', 'lesson'), 'lesson'));
+        $mform->addHelpButton('dependency', 'dependencyon', 'lesson');
         $mform->setDefault('dependency', 0);
 
         $mform->addElement('text', 'timespent', get_string('timespentminutes', 'lesson'));
diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index 57839c98bc8..be7b7c02944 100644
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -414,7 +414,7 @@ class lesson_add_page_form_multichoice extends lesson_add_page_form_base {
 
         $this->_form->addElement('checkbox', 'qoption', get_string('options', 'lesson'), get_string('multianswer', 'lesson'));
         $this->_form->setDefault('qoption', true);
-        $this->_form->setHelpButton('qoption', array("questionoption", get_string("questionoption", "lesson"), "lesson"));
+        $this->_form->addHelpButton('qoption', 'multianswer', 'lesson');
 
         for ($i = 0; $i < $this->_customdata['lesson']->maxanswers; $i++) {
             $this->_form->addElement('header', 'answertitle'.$i, get_string('answer').' '.($i+1));
@@ -500,4 +500,4 @@ class lesson_display_answer_form_multichoice_multianswer extends moodleform {
         $this->add_action_buttons(null, get_string("pleasecheckoneormoreanswers", "lesson"));
     }
 
-}
\ No newline at end of file
+}
diff --git a/mod/lesson/pagetypes/shortanswer.php b/mod/lesson/pagetypes/shortanswer.php
index 2fe51d70ec4..3decd61cc42 100644
--- a/mod/lesson/pagetypes/shortanswer.php
+++ b/mod/lesson/pagetypes/shortanswer.php
@@ -309,7 +309,7 @@ class lesson_add_page_form_shortanswer extends lesson_add_page_form_base {
 
         $this->_form->addElement('checkbox', 'qoption', get_string('options', 'lesson'), get_string('casesensitive', 'lesson'));
         $this->_form->setDefault('qoption', true);
-        $this->_form->setHelpButton('qoption', array("questionoption", get_string("questionoption", "lesson"), "lesson"));
+        $this->_form->addHelpButton('qoption', 'casesensitive', 'lesson');
 
         for ($i = 0; $i < $this->_customdata['lesson']->maxanswers; $i++) {
             $this->_form->addElement('header', 'answertitle'.$i, get_string('answer').' '.($i+1));
@@ -346,4 +346,4 @@ class lesson_display_answer_form_shortanswer extends moodleform {
         $this->add_action_buttons(null, get_string("pleaseenteryouranswerinthebox", "lesson"));
     }
 
-}
\ No newline at end of file
+}