From e1353c7649c3e18cf3836c5bf9738aa957b313b7 Mon Sep 17 00:00:00 2001
From: Adrian Perez <me@adrianperez.me>
Date: Wed, 22 May 2024 16:41:17 +0200
Subject: [PATCH] MDL-74251 core: Remove old icon helper classes

---
 .upgradenotes/MDL-74251-2024062716222581.yml             | 7 +++++++
 admin/renderer.php                                       | 2 +-
 admin/tool/analytics/templates/models_list.mustache      | 8 ++++----
 backup/moodle2/backup_activity_task.class.php            | 2 +-
 backup/moodle2/restore_activity_task.class.php           | 2 +-
 backup/util/ui/renderer.php                              | 2 +-
 badges/renderer.php                                      | 4 ++--
 badges/templates/award_badge.mustache                    | 2 +-
 badges/templates/manage_badge.mustache                   | 2 +-
 course/dndupload.js                                      | 2 +-
 course/renderer.php                                      | 4 ++--
 course/templates/activityinstance.mustache               | 2 +-
 course/templates/defaultactivitycompletion.mustache      | 2 +-
 course/tests/behat/activity_chooser.feature              | 4 ++--
 lib/classes/output/core_renderer.php                     | 8 ++++----
 lib/classes/output/help_icon.php                         | 2 +-
 lib/installlib.php                                       | 2 +-
 lib/templates/activity_header.mustache                   | 2 +-
 lib/templates/help_icon.mustache                         | 2 +-
 lib/templates/local/choicelist.mustache                  | 4 ++--
 lib/templates/local/choicelist/option.mustache           | 2 +-
 lib/templates/local/dropdown/status.mustache             | 4 ++--
 lib/templates/loginform.mustache                         | 2 +-
 lib/templates/url_select.mustache                        | 2 +-
 mod/assign/templates/override_actionmenu.mustache        | 2 +-
 mod/assign/templates/user_submission_actionmenu.mustache | 8 ++++----
 mod/feedback/templates/main_action_menu.mustache         | 2 +-
 mod/glossary/templates/standard_action_menu.mustache     | 2 +-
 mod/lesson/templates/edit_action_area.mustache           | 2 +-
 mod/lesson/templates/override_action_menu.mustache       | 2 +-
 mod/lesson/templates/report_action_menu.mustache         | 2 +-
 mod/quiz/classes/output/renderer.php                     | 2 +-
 mod/quiz/templates/add_random_question_form.mustache     | 2 +-
 mod/workshop/renderer.php                                | 4 ++--
 question/classes/local/bank/column_base.php              | 7 ++++---
 question/templates/column_header.mustache                | 2 +-
 repository/filepicker.php                                | 2 +-
 37 files changed, 61 insertions(+), 53 deletions(-)
 create mode 100644 .upgradenotes/MDL-74251-2024062716222581.yml

diff --git a/.upgradenotes/MDL-74251-2024062716222581.yml b/.upgradenotes/MDL-74251-2024062716222581.yml
new file mode 100644
index 00000000000..0dbfbc8599c
--- /dev/null
+++ b/.upgradenotes/MDL-74251-2024062716222581.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-74251
+notes:
+  theme:
+    - message: >-
+        Removed all references to iconhelp, icon-pre, icon-post, iconlarge, and
+        iconsort classes
+      type: removed
diff --git a/admin/renderer.php b/admin/renderer.php
index 0f9333f78e5..6e53a42ad2e 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -1004,7 +1004,7 @@ class core_admin_renderer extends plugin_renderer_base {
     function upgrade_reload($url) {
         return html_writer::empty_tag('br') .
                 html_writer::tag('div',
-                    html_writer::link($url, $this->pix_icon('i/reload', '', '', array('class' => 'icon icon-pre')) .
+                    html_writer::link($url, $this->pix_icon('i/reload', '', '', ['class' => 'icon']) .
                             get_string('reload'), array('title' => get_string('reload'))),
                 array('class' => 'continuebutton')) . html_writer::empty_tag('br');
     }
diff --git a/admin/tool/analytics/templates/models_list.mustache b/admin/tool/analytics/templates/models_list.mustache
index 640a6f1bb1a..19e150ff3fc 100644
--- a/admin/tool/analytics/templates/models_list.mustache
+++ b/admin/tool/analytics/templates/models_list.mustache
@@ -69,7 +69,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
@@ -87,7 +87,7 @@
                             "url": "http://example.org/help",
                             "linktext": "",
                             "icon": {
-                                "extraclasses": "iconhelp",
+                                "extraclasses": "",
                                 "attributes": [
                                     {"name": "src", "value": "../../../pix/help.svg"},
                                     {"name": "alt", "value": "Help icon"}
@@ -103,7 +103,7 @@
                             "url": "http://example.org/help",
                             "linktext": "",
                             "icon": {
-                                "extraclasses": "iconhelp",
+                                "extraclasses": "",
                                 "attributes": [
                                     {"name": "src", "value": "../../../pix/help.svg"},
                                     {"name": "alt", "value": "Help icon"}
@@ -119,7 +119,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/backup/moodle2/backup_activity_task.class.php b/backup/moodle2/backup_activity_task.class.php
index f0df9d0ab2e..c98dd4d5983 100644
--- a/backup/moodle2/backup_activity_task.class.php
+++ b/backup/moodle2/backup_activity_task.class.php
@@ -277,7 +277,7 @@ abstract class backup_activity_task extends backup_task {
         $settingname = $settingprefix . 'included';
         $activityincluded = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
+            $this->modulename, array('class' => 'ml-1')));
         $this->add_setting($activityincluded);
         // Look for "activities" root setting.
         $activities = $this->plan->get_setting('activities');
diff --git a/backup/moodle2/restore_activity_task.class.php b/backup/moodle2/restore_activity_task.class.php
index 12f6006f114..181cfa38583 100644
--- a/backup/moodle2/restore_activity_task.class.php
+++ b/backup/moodle2/restore_activity_task.class.php
@@ -301,7 +301,7 @@ abstract class restore_activity_task extends restore_task {
         $settingname = $settingprefix . 'included';
         $activity_included = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activity_included->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
+            $this->modulename, ['class' => 'ml-1']));
         $this->add_setting($activity_included);
         // Look for "activities" root setting
         $activities = $this->plan->get_setting('activities');
diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php
index 938fd5469ef..87c137a757a 100644
--- a/backup/util/ui/renderer.php
+++ b/backup/util/ui/renderer.php
@@ -203,7 +203,7 @@ class core_backup_renderer extends plugin_renderer_base {
                         $table->data = array();
                     }
                     $name = get_string('pluginname', $activity->modulename);
-                    $icon = new image_icon('monologo', '', $activity->modulename, ['class' => 'iconlarge icon-pre']);
+                    $icon = new image_icon('monologo', '', $activity->modulename);
                     $table->data[] = array(
                         $this->output->render($icon).$name,
                         $activity->title,
diff --git a/badges/renderer.php b/badges/renderer.php
index 2651c02cf82..8740f66f0f3 100644
--- a/badges/renderer.php
+++ b/badges/renderer.php
@@ -783,13 +783,13 @@ class core_badges_renderer extends plugin_renderer_base {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sort' => $sortid, 'dir' => 'ASC'));
                 $out .= $this->output->action_icon($url,
-                        new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null, array('class' => 'iconsort')));
+                        new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null));
             }
             if ($sortby !== $sortid || $sorthow !== 'DESC') {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sort' => $sortid, 'dir' => 'DESC'));
                 $out .= $this->output->action_icon($url,
-                        new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null, array('class' => 'iconsort')));
+                        new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null));
             }
         }
         return $out;
diff --git a/badges/templates/award_badge.mustache b/badges/templates/award_badge.mustache
index 0aadf5b8021..ea888409622 100644
--- a/badges/templates/award_badge.mustache
+++ b/badges/templates/award_badge.mustache
@@ -48,7 +48,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/badges/templates/manage_badge.mustache b/badges/templates/manage_badge.mustache
index 1974521f7cf..9a5fd160c28 100644
--- a/badges/templates/manage_badge.mustache
+++ b/badges/templates/manage_badge.mustache
@@ -47,7 +47,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/course/dndupload.js b/course/dndupload.js
index 783a37bcfc9..487f6d700b9 100644
--- a/course/dndupload.js
+++ b/course/dndupload.js
@@ -549,7 +549,7 @@ M.course_dndupload = {
         resel.div.appendChild(resel.a);
 
         resel.icon.src = M.util.image_url('i/ajaxloader');
-        resel.icon.className = 'activityicon iconlarge';
+        resel.icon.className = 'activityicon';
         resel.a.appendChild(resel.icon);
 
         resel.namespan.className = 'instancename';
diff --git a/course/renderer.php b/course/renderer.php
index 4bfd1a5b1c6..f667bfd11bf 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -378,8 +378,8 @@ class core_course_renderer extends plugin_renderer_base {
         }
 
         $altname = get_accesshide(' ' . $cm->modfullname);
-        $name = html_writer::empty_tag('img', array('src' => $cm->get_icon_url(),
-                'class' => 'iconlarge activityicon', 'alt' => '')) .
+        $name = html_writer::empty_tag('img', ['src' => $cm->get_icon_url(),
+                'class' => 'activityicon', 'alt' => '']) .
             html_writer::tag('span', ' '.$cm->get_formatted_name() . $altname, array('class' => 'instancename'));
         $formattedinfo = \core_availability\info::format_info($cm->availableinfo, $cm->get_course());
         return html_writer::div($name, 'activityinstance-error') .
diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache
index d1af70a3a4d..1a2b197f999 100644
--- a/course/templates/activityinstance.mustache
+++ b/course/templates/activityinstance.mustache
@@ -42,7 +42,7 @@
             <input type="checkbox" id="selectactivity_{{cmid}}" class="mr-1" name="cmid[]" data-section="{{sectionnumber}}" value="{{cmid}}" aria-label="{{#str}}checkactivity, completion, {{{modname}}}{{/str}}">
             {{/canmanage}}
             <a href="{{url}}">
-            <img src="{{icon}}" class="iconlarge activityicon" alt="">
+            <img src="{{icon}}" class="activityicon" alt="">
             <span class="instancename">{{{modname}}}</span>
             </a>
         </div>
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache
index d2a64d21855..5d1e05dc7c5 100644
--- a/course/templates/defaultactivitycompletion.mustache
+++ b/course/templates/defaultactivitycompletion.mustache
@@ -68,7 +68,7 @@
                             {{#pix}} t/expandedchevron, core {{/pix}}
                             <span class="sr-only">{{#str}} collapsecategory, core, {{formatedname}} {{/str}}</span>
                         </span>
-                        <img class="iconlarge activityicon ml-4" src="{{icon}}" alt="" aria-hidden="true">
+                        <img class="activityicon ml-4" src="{{icon}}" alt="" aria-hidden="true">
                         <h2 class="activityname ml-3 mb-0">{{{formattedname}}}</h2>
                     </a>
                 </div>
diff --git a/course/tests/behat/activity_chooser.feature b/course/tests/behat/activity_chooser.feature
index 1d099e6fde8..ad6b9115fb1 100644
--- a/course/tests/behat/activity_chooser.feature
+++ b/course/tests/behat/activity_chooser.feature
@@ -302,7 +302,7 @@ Feature: Display and choose from the available activities in course
     # Confirm more help link exists
     Then "More help" "link" should exist
     # Confirm that corresponding help icon exist
-    And ".iconhelp" "css_element" should exist
+    And ".fa-info-circle" "css_element" should exist
     # Confirm that link opens in new window
     And "Opens in new window" "link" should be visible
     # Confirm the same behaviour for weekly format course
@@ -313,6 +313,6 @@ Feature: Display and choose from the available activities in course
     # Confirm more help link exists
     And "More help" "link" should exist
     # Confirm that corresponding help icon exist
-    And ".iconhelp" "css_element" should exist
+    And ".fa-info-circle" "css_element" should exist
     # Confirm that link opens in new window
     And "Opens in new window" "link" should be visible
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index 8b07c2e4e44..27d63344b7b 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -1878,7 +1878,7 @@ class core_renderer extends renderer_base {
     public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) {
         global $CFG;
 
-        $icon = $this->pix_icon('book', '', 'moodle', ['class' => 'iconhelp icon-pre']);
+        $icon = $this->pix_icon('book', '', 'moodle');
 
         $attributes['href'] = new moodle_url(get_docs_url($path));
         $newwindowicon = '';
@@ -2079,7 +2079,7 @@ class core_renderer extends renderer_base {
     public function heading_with_help($text, $helpidentifier, $component = 'moodle', $icon = '', $iconalt = '', $level = 2, $classnames = null) {
         $image = '';
         if ($icon) {
-            $image = $this->pix_icon($icon, $iconalt, $component, ['class' => 'icon iconlarge']);
+            $image = $this->pix_icon($icon, $iconalt, $component);
         }
 
         $help = '';
@@ -2146,7 +2146,7 @@ class core_renderer extends renderer_base {
 
         $title = get_string('helpprefix2', '', $scale->name) . ' (' . get_string('newwindow') . ')';
 
-        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', ['class' => 'iconhelp']);
+        $icon = $this->pix_icon('help', get_string('scales'), 'moodle');
 
         $scaleid = abs($scale->id);
 
@@ -2521,7 +2521,7 @@ EOD;
         if (empty($message)) {
             return '';
         }
-        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon icon-pre', 'title' => '']) . $message;
+        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon', 'title' => '']) . $message;
         return html_writer::tag('span', $message, ['class' => 'error']);
     }
 
diff --git a/lib/classes/output/help_icon.php b/lib/classes/output/help_icon.php
index 4fd2beec17f..91edfc91c83 100644
--- a/lib/classes/output/help_icon.php
+++ b/lib/classes/output/help_icon.php
@@ -100,7 +100,7 @@ class help_icon implements renderable, templatable {
         $data = get_formatted_help_string($this->identifier, $this->component, false, $this->a);
 
         $data->alt = $alt;
-        $data->icon = (new pix_icon('help', $alt, 'core', ['class' => 'iconhelp']))->export_for_template($output);
+        $data->icon = (new pix_icon('help', $alt, 'core'))->export_for_template($output);
         $data->linktext = $this->linktext;
         $data->title = get_string('helpprefix2', '', trim($title, ". \t"));
 
diff --git a/lib/installlib.php b/lib/installlib.php
index 8e9c5af1ec8..416c7e8b8ea 100644
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -162,7 +162,7 @@ function install_helpbutton($url, $title='') {
     echo "<a href=\"javascript:void(0)\" ";
     echo "onclick=\"return window.open('$url','Help','menubar=0,location=0,scrollbars,resizable,width=500,height=400')\"";
     echo ">";
-    echo "<img src=\"pix/help.gif\" class=\"iconhelp\" alt=\"$title\" title=\"$title\"/>";
+    echo "<img src=\"pix/help.gif\" alt=\"$title\" title=\"$title\"/>";
     echo "</a>\n";
 }
 
diff --git a/lib/templates/activity_header.mustache b/lib/templates/activity_header.mustache
index 1e4515cff35..484643a18ce 100644
--- a/lib/templates/activity_header.mustache
+++ b/lib/templates/activity_header.mustache
@@ -42,7 +42,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/help_icon.mustache b/lib/templates/help_icon.mustache
index 5d2f7d08b36..e62c95880e2 100644
--- a/lib/templates/help_icon.mustache
+++ b/lib/templates/help_icon.mustache
@@ -10,7 +10,7 @@
         "linktext": "",
         "icon":{
             "attributes": [
-                {"name": "class", "value": "iconhelp"},
+                {"name": "class", "value": ""},
                 {"name": "src", "value": "../../../pix/help.svg"},
                 {"name": "alt", "value": "Help icon"}
             ]
diff --git a/lib/templates/local/choicelist.mustache b/lib/templates/local/choicelist.mustache
index 73bd2c4a846..2eaba17ea15 100644
--- a/lib/templates/local/choicelist.mustache
+++ b/lib/templates/local/choicelist.mustache
@@ -48,7 +48,7 @@
                 "name": "Second option",
                 "description": "Second option description",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
@@ -64,7 +64,7 @@
                 "name": "Third option",
                 "description": "Third option description",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/local/choicelist/option.mustache b/lib/templates/local/choicelist/option.mustache
index 056cd6338ac..74ada8d9c49 100644
--- a/lib/templates/local/choicelist/option.mustache
+++ b/lib/templates/local/choicelist/option.mustache
@@ -36,7 +36,7 @@
         "name": "Second option",
         "description": "Second option description",
         "icon": {
-            "extraclasses": "iconhelp",
+            "extraclasses": "",
             "attributes": [
                 {"name": "src", "value": "../../../pix/help.svg"},
                 {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/local/dropdown/status.mustache b/lib/templates/local/dropdown/status.mustache
index 44e254d6e0e..38e82f83b7a 100644
--- a/lib/templates/local/dropdown/status.mustache
+++ b/lib/templates/local/dropdown/status.mustache
@@ -51,7 +51,7 @@
                     "name": "Second option",
                     "description": "Second option description",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
@@ -67,7 +67,7 @@
                     "name": "Third option",
                     "description": "Third option description",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache
index e03d23673f9..f12948067cc 100644
--- a/lib/templates/loginform.mustache
+++ b/lib/templates/loginform.mustache
@@ -56,7 +56,7 @@
                 "attributes": [
                     {
                         "name": "class",
-                        "value": "iconhelp"
+                        "value": ""
                     },
                     {
                         "name": "alt",
diff --git a/lib/templates/url_select.mustache b/lib/templates/url_select.mustache
index f735afb6fd7..7d9b06e80a0 100644
--- a/lib/templates/url_select.mustache
+++ b/lib/templates/url_select.mustache
@@ -14,7 +14,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon":{
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/assign/templates/override_actionmenu.mustache b/mod/assign/templates/override_actionmenu.mustache
index 0af1734686e..07c5b42ddf6 100644
--- a/mod/assign/templates/override_actionmenu.mustache
+++ b/mod/assign/templates/override_actionmenu.mustache
@@ -39,7 +39,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/assign/templates/user_submission_actionmenu.mustache b/mod/assign/templates/user_submission_actionmenu.mustache
index 084ae04ed96..a685379b963 100644
--- a/mod/assign/templates/user_submission_actionmenu.mustache
+++ b/mod/assign/templates/user_submission_actionmenu.mustache
@@ -48,7 +48,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -76,7 +76,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -104,7 +104,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -132,7 +132,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
diff --git a/mod/feedback/templates/main_action_menu.mustache b/mod/feedback/templates/main_action_menu.mustache
index 2a1032560c9..3407a79fecc 100644
--- a/mod/feedback/templates/main_action_menu.mustache
+++ b/mod/feedback/templates/main_action_menu.mustache
@@ -57,7 +57,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon":{
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/mod/glossary/templates/standard_action_menu.mustache b/mod/glossary/templates/standard_action_menu.mustache
index f961cce087d..c46bb7cba9a 100644
--- a/mod/glossary/templates/standard_action_menu.mustache
+++ b/mod/glossary/templates/standard_action_menu.mustache
@@ -75,7 +75,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/edit_action_area.mustache b/mod/lesson/templates/edit_action_area.mustache
index f0278897d6c..2f4e0a85a35 100644
--- a/mod/lesson/templates/edit_action_area.mustache
+++ b/mod/lesson/templates/edit_action_area.mustache
@@ -43,7 +43,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/override_action_menu.mustache b/mod/lesson/templates/override_action_menu.mustache
index 6fd20bb9361..177ecf3be9a 100644
--- a/mod/lesson/templates/override_action_menu.mustache
+++ b/mod/lesson/templates/override_action_menu.mustache
@@ -39,7 +39,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/report_action_menu.mustache b/mod/lesson/templates/report_action_menu.mustache
index 2ac0ec91bc0..c09d6401683 100644
--- a/mod/lesson/templates/report_action_menu.mustache
+++ b/mod/lesson/templates/report_action_menu.mustache
@@ -38,7 +38,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon":{
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/quiz/classes/output/renderer.php b/mod/quiz/classes/output/renderer.php
index 347a19f8530..4e70395f177 100644
--- a/mod/quiz/classes/output/renderer.php
+++ b/mod/quiz/classes/output/renderer.php
@@ -804,7 +804,7 @@ class renderer extends plugin_renderer_base {
             if ($attemptobj->is_question_flagged($slot)) {
                 // Quiz has custom JS manipulating these image tags - so we can't use the pix_icon method here.
                 $flag = html_writer::empty_tag('img', ['src' => $this->image_url('i/flagged'),
-                        'alt' => get_string('flagged', 'question'), 'class' => 'questionflag icon-post']);
+                        'alt' => get_string('flagged', 'question'), 'class' => 'questionflag']);
             }
             if ($attemptobj->can_navigate_to($slot)) {
                 $row = [html_writer::link($attemptobj->attempt_url($slot),
diff --git a/mod/quiz/templates/add_random_question_form.mustache b/mod/quiz/templates/add_random_question_form.mustache
index 5cf4e428c1b..701dd49a14a 100644
--- a/mod/quiz/templates/add_random_question_form.mustache
+++ b/mod/quiz/templates/add_random_question_form.mustache
@@ -39,7 +39,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon": {
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index 20ef24637aa..3109026b086 100644
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -1022,13 +1022,13 @@ class mod_workshop_renderer extends plugin_renderer_base {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sortby' => $sortid, 'sorthow' => 'ASC'));
                 $out .= $this->output->action_icon($url, new pix_icon('t/sort_asc', get_string('sortasc', 'workshop')),
-                    null, array('class' => 'iconsort sort asc'));
+                    null, ['class' => 'sort asc']);
             }
             if ($sortby !== $sortid or $sorthow !== 'DESC') {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sortby' => $sortid, 'sorthow' => 'DESC'));
                 $out .= $this->output->action_icon($url, new pix_icon('t/sort_desc', get_string('sortdesc', 'workshop')),
-                    null, array('class' => 'iconsort sort desc'));
+                    null, ['class' => 'sort desc']);
             }
         }
         return $out;
diff --git a/question/classes/local/bank/column_base.php b/question/classes/local/bank/column_base.php
index c4abe2dc8a0..3636db7699b 100644
--- a/question/classes/local/bank/column_base.php
+++ b/question/classes/local/bank/column_base.php
@@ -221,16 +221,17 @@ abstract class column_base extends view_component {
     }
 
     /**
-     * Get an icon representing the corrent sort state.
+     * Get an icon representing the current sort state.
+     *
      * @param bool $reverse sort is descending, not ascending.
      * @return string HTML image tag.
      */
     protected function get_sort_icon($reverse): string {
         global $OUTPUT;
         if ($reverse) {
-            return $OUTPUT->pix_icon('t/sort_desc', get_string('desc'), '', ['class' => 'iconsort']);
+            return $OUTPUT->pix_icon('t/sort_desc', get_string('desc'));
         } else {
-            return $OUTPUT->pix_icon('t/sort_asc', get_string('asc'), '', ['class' => 'iconsort']);
+            return $OUTPUT->pix_icon('t/sort_asc', get_string('asc'));
         }
     }
 
diff --git a/question/templates/column_header.mustache b/question/templates/column_header.mustache
index 50558ca47a3..ec6b516b290 100644
--- a/question/templates/column_header.mustache
+++ b/question/templates/column_header.mustache
@@ -33,7 +33,7 @@
 
         Sortable column, with a single type of sort (e.g. question type)
             * sortable: true
-            * sortlinks: HTML of the title, in a link to sort by this. E.g. "<a href=\"http:\/\/localhost\/moodle_head\/question\/edit.php?courseid=100000&amp;qbs1=-qbank_viewquestiontype%5Cquestion_type_column&amp;qbs2=qbank_viewquestionname%5Cquestion_name_idnumber_tags_column-name\" title=\"Sort by Question type descending\">\n    T<i class=\"icon fa fa-sort-asc fa-fw iconsort\"  title=\"Ascending\" role=\"img\" aria-label=\"Ascending\"><\/i>\n<\/a>"
+            * sortlinks: HTML of the title, in a link to sort by this. E.g. "<a href=\"http:\/\/localhost\/moodle_head\/question\/edit.php?courseid=100000&amp;qbs1=-qbank_viewquestiontype%5Cquestion_type_column&amp;qbs2=qbank_viewquestionname%5Cquestion_name_idnumber_tags_column-name\" title=\"Sort by Question type descending\">\n    T<i class=\"icon fa fa-sort-asc fa-fw\"  title=\"Ascending\" role=\"img\" aria-label=\"Ascending\"><\/i>\n<\/a>"
 
         Sortable column, with an overall title, and multiple sort types (e.g. question name/idnumber)
             * sortable: true
diff --git a/repository/filepicker.php b/repository/filepicker.php
index 09c1d41ea99..fcdb2ab9182 100644
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -398,7 +398,7 @@ case 'plugins':
         $aurl->params(array('savepath'=>$savepath, 'action' => 'list', 'repo_id' => $info->id, 'draftpath'=>$draftpath));
 
         echo '<li>';
-        echo html_writer::empty_tag('img', array('src'=>$info->icon, 'alt'=>$info->name, 'class'=>'icon icon-pre'));
+        echo html_writer::empty_tag('img', ['src' => $info->icon, 'alt' => $info->name, 'class' => 'icon']);
         echo html_writer::link($aurl, s($info->name));
         echo '</li>';
     }