diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 0266da8b5e6..2df27d91dbf 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -124,7 +124,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
     $temp = new admin_settingpage('gradeitemsettings', get_string('gradeitemsettings', 'grades'), 'moodle/grade:manage');
     if ($ADMIN->fulltree) {
         $temp->add(new admin_setting_configselect('grade_displaytype', get_string('gradedisplaytype', 'grades'),
-                                                  get_string('configgradedisplaytype', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
+                                                  get_string('gradedisplaytype_help', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
 
         $temp->add(new admin_setting_configselect('grade_decimalpoints', get_string('decimalpoints', 'grades'),
                                                   get_string('decimalpoints_help', 'grades'), 2,
diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php
index 27204520f9d..bfdd28ca59c 100644
--- a/grade/edit/settings/form.php
+++ b/grade/edit/settings/form.php
@@ -85,7 +85,7 @@ class course_settings_form extends moodleform {
             }
         }
         $mform->addElement('select', 'displaytype', get_string('gradedisplaytype', 'grades'), $options);
-        $mform->setHelpButton('displaytype', array('gradedisplaytype', get_string('gradedisplaytype', 'grades'), 'grade'));
+        $mform->addHelpButton('displaytype', 'gradedisplaytype', 'grades');
 
 
         $options = array(-1=> get_string('defaultprev', 'grades', $CFG->grade_decimalpoints), 0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5);
diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index a24bcf3cec8..23871b97dfe 100644
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -184,7 +184,7 @@ class edit_category_form extends moodleform {
             }
         }
         $mform->addElement('select', 'grade_item_display', get_string('gradedisplaytype', 'grades'), $options);
-        $mform->setHelpButton('grade_item_display', array('gradedisplaytype', get_string('gradedisplaytype', 'grades'), 'grade'), true);
+        $mform->addHelpButton('grade_item_display', 'gradedisplaytype', 'grades');
 
         $default_gradedecimals = grade_get_setting($COURSE->id, 'decimalpoints', $CFG->grade_decimalpoints);
         $options = array(-1=>get_string('defaultprev', 'grades', $default_gradedecimals), 0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5);
diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php
index f3eeafbcf1e..3832011d4af 100644
--- a/grade/edit/tree/item_form.php
+++ b/grade/edit/tree/item_form.php
@@ -123,7 +123,7 @@ class edit_item_form extends moodleform {
             }
         }
         $mform->addElement('select', 'display', get_string('gradedisplaytype', 'grades'), $options);
-        $mform->setHelpButton('display', array('gradedisplaytype', get_string('gradedisplaytype', 'grades'), 'grade'), true);
+        $mform->addHelpButton('display', 'gradedisplaytype', 'grades');
 
         $default_gradedecimals = grade_get_setting($COURSE->id, 'decimalpoints', $CFG->grade_decimalpoints);
         $options = array(-1=>get_string('defaultprev', 'grades', $default_gradedecimals), 0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5);
diff --git a/lang/en/grades.php b/lang/en/grades.php
index 889c0a63d2f..5fa34600c30 100755
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -120,7 +120,6 @@ $string['configcoursegradedisplaytype'] = 'Select the default display type of gr
 $string['configdisablegradehistory'] = 'Disable history tracking of changes in grades related tables. This may speed up the server a little and conserve space in database.';
 $string['configenableoutcomes'] = 'Support for Outcomes (also known as Competencies, Goals, Standards or Criteria) means that we can grade things using one or more scales that are tied to outcome statements. Enabling outcomes makes such special grading possible throughout the site.';
 $string['configfixedstudents'] = 'Allows grades to scroll horizontally without losing sight of the students column, by making it static.';
-$string['configgradedisplaytype'] = 'Specifies how to display grades in the grader and user reports. Grades may be shown as actual grades, as percentages (in reference to the minimum and maximum grades) or as letters.';
 $string['configgradeexportdisplaytype'] = 'Grades can be shown as real grades, as percentages (in reference to the minimum and maximum grades) or as letters (A, B, C etc..) during export. This can be overridden during export.';
 $string['configgradehistorylifetime'] = 'This specifies the length of time you want to keep history of changes in grade related tables. It is recommended to keep it as long as possible. If you experience performance problems or have limited database space, try to set lower value.';
 $string['configgradeitemadvanced'] = 'Select all elements that should be displayed as advanced when editing grade items.';
diff --git a/lang/en/help/grade/gradedisplaytype.html b/lang/en/help/grade/gradedisplaytype.html
deleted file mode 100644
index 9ebae05f16e..00000000000
--- a/lang/en/help/grade/gradedisplaytype.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Grade display type</h1>
-<p>Specifies how to display grades in the grader and user reports. Grades may be shown as actual grades, as percentages (in reference to the minimum and maximum grades) or as letters.</p>