diff --git a/htdocs/admin/extensions/iframesites.php b/htdocs/admin/extensions/iframesites.php
index adbc5d4e2951455a3cbebc944565ed1bb4c9f506..de29e56eec78aa14b8b26fad3a3014a69ecc4f3a 100644
--- a/htdocs/admin/extensions/iframesites.php
+++ b/htdocs/admin/extensions/iframesites.php
@@ -101,7 +101,7 @@ foreach ($iframesources as $url => $name) {
                     'type'         => 'button',
                     'class'        => 'btn-secondary btn-sm',
                     'usebuttontag' => true,
-                    'value'          => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>',
+                    'value'          => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>',
 
                     'confirm'      => get_string('confirmdeletemenuitem', 'admin'),
                 ),
diff --git a/htdocs/admin/groups/groupcategories.php b/htdocs/admin/groups/groupcategories.php
index eb9bbe6122839979d406c85f489012dd5c22b76e..6379432688180ae6dc8956356e12362052742431 100644
--- a/htdocs/admin/groups/groupcategories.php
+++ b/htdocs/admin/groups/groupcategories.php
@@ -115,7 +115,7 @@ jQuery(function($) {
         'title':{$getstring['delete']},
         'alt':{$getstring['deletespecific']}.replace('%s', item.name)
       });
-      del.append($('<span>', {'class':'icon icon-trash text-danger icon-lg', 'role':'presentation'}));
+      del.append($('<span>', {'class':'icon icon-trash-alt text-danger icon-lg', 'role':'presentation'}));
       del.append($('<span class="sr-only">' + {$getstring['deletespecific']}.replace('%s', item.name) + '</span>'));
 
       del.on('click', function (e) { e.preventDefault(); delitem(item.id); });
diff --git a/htdocs/admin/site/menu.php b/htdocs/admin/site/menu.php
index de4e24feb3f949cffc95646031042a64133e7068..7ea7245fc4a4d5b402c6642490961ed19668ba56 100644
--- a/htdocs/admin/site/menu.php
+++ b/htdocs/admin/site/menu.php
@@ -87,10 +87,10 @@ jQuery(function($) {
       var type = eval(item.type);
       var linkedto = $('<a>', {'href':item.linkedto, 'text': item.linktext});
       var edit = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title':{$getstring['edit']}})
-        .append($('<span>', {'class':'icon icon-lg icon-pencil', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['edit']}}));
+        .append($('<span>', {'class':'icon icon-lg icon-pencil-alt', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['edit']}}));
       edit.on('click', function () { edititem(item); });
       var del = $('<button>', {'type':'button','class':'button btn btn-secondary btn-sm','title': {$getstring['delete']}})
-      .append($('<span>', {'class':'icon icon-lg icon-trash text-danger', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['delete']}}));
+      .append($('<span>', {'class':'icon icon-lg icon-trash-alt text-danger', 'role':'presentation'}), $('<span>', {'class':'sr-only','text': {$getstring['delete']}}));
       del.on('click', function() { delitem(item.id); });
       var buttonGroup = $('<span>', {'class':'btn-group'}).append(edit, del);
 
diff --git a/htdocs/admin/site/pages.php b/htdocs/admin/site/pages.php
index 198c9b0faa894e2c39a68546b2b1104ee6fe3427..d344f9ce92234b0e148ccfec0d63f71fa7ed8e3c 100644
--- a/htdocs/admin/site/pages.php
+++ b/htdocs/admin/site/pages.php
@@ -95,7 +95,7 @@ function editsitepage_submit(Pieform $form, $values) {
 }
 
 $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
-setpageicon($smarty, 'icon-pencil');
+setpageicon($smarty, 'icon-pencil-alt');
 
 $smarty->assign('pageeditform', $form);
 $smarty->display('admin/site/pages.tpl');
diff --git a/htdocs/admin/site/views.php b/htdocs/admin/site/views.php
index 3583ab4d1df9ded06a5865de2fbde4f009c050b0..61d5d9485c9b1c3edca4520dfb14ee8832b87c67 100644
--- a/htdocs/admin/site/views.php
+++ b/htdocs/admin/site/views.php
@@ -62,7 +62,7 @@ $urlparams['institution'] = 'mahara';
 $urlparamsstr = '&' . http_build_query($urlparams);
 
 $smarty = smarty(array('paginator'));
-setpageicon($smarty, 'icon-file-text');
+setpageicon($smarty, 'icon-file-alt');
 
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign('views', $views);
diff --git a/htdocs/admin/users/edit.php b/htdocs/admin/users/edit.php
index 17e834eb0185b60c90cba7b2fe26354743c0713b..5376fb9bb04b0af64f6d445827c6bca42347c7e1 100644
--- a/htdocs/admin/users/edit.php
+++ b/htdocs/admin/users/edit.php
@@ -760,7 +760,7 @@ $deleteform = pieform(array(
             'type' => 'button',
             'usebuttontag' => true,
             'class' => 'btn-secondary',
-            'value'          => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span><span>'. get_string('deleteuser', 'admin') . '</span>',
+            'value'          => '<span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span><span>'. get_string('deleteuser', 'admin') . '</span>',
             'confirm' => get_string('confirmdeleteuser', 'admin'),
         ),
     ),
diff --git a/htdocs/artefact/annotation/lib.php b/htdocs/artefact/annotation/lib.php
index 986dcb8d4e1df49f7665e5acd46c36e674c522a7..ed4fef19db17053fd8e087d2167d39796464c0cd 100644
--- a/htdocs/artefact/annotation/lib.php
+++ b/htdocs/artefact/annotation/lib.php
@@ -1399,7 +1399,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
                     'type'  => 'button',
                     'usebuttontag' => true,
                     'class' => 'btn-secondary btn-sm',
-                    'value' => '<span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
+                    'value' => '<span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
                     'elementtitle' => get_string('delete'),
                     'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
                     'name'  => 'delete_annotation_feedback_submit',
diff --git a/htdocs/artefact/blog/lib.php b/htdocs/artefact/blog/lib.php
index cce0414e1050141c2b3a485e03a3e086c1d59fc4..7e6d93d00aafc65e06bd860c8afd9140037eea53 100644
--- a/htdocs/artefact/blog/lib.php
+++ b/htdocs/artefact/blog/lib.php
@@ -602,7 +602,7 @@ class ArtefactTypeBlog extends ArtefactType {
                     'alt' => get_string('deletespecific', 'mahara', $title),
                     'elementtitle' => get_string('delete'),
                     'confirm' => $confirm,
-                    'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
+                    'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
                 ),
                 'delete' => array(
                     'type' => 'hidden',
@@ -1254,7 +1254,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
                     'class' => 'btn-secondary btn-sm last',
                     'elementtitle' => get_string('delete'),
                     'confirm' => get_string('deleteblogpost?', 'artefact.blog'),
-                    'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
+                    'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('deletespecific', 'mahara', $title) . '</span>',
                 ),
             ),
         ));
diff --git a/htdocs/artefact/comment/lib.php b/htdocs/artefact/comment/lib.php
index 9f05338a34d1f3c025b41baf70190a35d319f851..2ea0d2e6b749f182d295bbb4782cd22af3e1eac1 100644
--- a/htdocs/artefact/comment/lib.php
+++ b/htdocs/artefact/comment/lib.php
@@ -1037,7 +1037,7 @@ class ArtefactTypeComment extends ArtefactType {
                     'type'  => 'button',
                     'usebuttontag' => true,
                     'class' => 'btn-secondary btn-sm',
-                    'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
+                    'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
                     'confirm' => get_string('reallydeletethiscomment', 'artefact.comment'),
                     'name'  => 'delete_comment_submit',
                 ),
diff --git a/htdocs/artefact/file/sitefiles.php b/htdocs/artefact/file/sitefiles.php
index 51a4f7d8794c8578c267c016f954c64e99d44840..f2ec2bd1947df047710372595e1c6a2c59c673e7 100644
--- a/htdocs/artefact/file/sitefiles.php
+++ b/htdocs/artefact/file/sitefiles.php
@@ -25,7 +25,7 @@ $form = pieform(ArtefactTypeFileBase::files_form(get_config('wwwroot') . 'artefa
 $js = ArtefactTypeFileBase::files_js();
 
 $smarty = smarty();
-setpageicon($smarty, 'icon-file-image-o');
+setpageicon($smarty, 'icon-regular icon-file-image');
 
 $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>'));
 $smarty->assign('institution', 'mahara');
diff --git a/htdocs/artefact/internal/editnote.php b/htdocs/artefact/internal/editnote.php
index 1cb50b09b6cbaa81d2b8824c99429d1ffd08152f..11a93938609af0d355b4557474772a1c46f33454 100644
--- a/htdocs/artefact/internal/editnote.php
+++ b/htdocs/artefact/internal/editnote.php
@@ -152,7 +152,7 @@ $smarty = smarty(array(), array(), array(), array(
         image_filebrowser: "editnote_filebrowser",
     '
 ));
-setpageicon($smarty, 'icon-pencil-square-o');
+setpageicon($smarty, 'icon-regular icon-edit');
 $smarty->assign('INLINEJAVASCRIPT', $javascript);
 $smarty->assign('form', $form);
 $smarty->assign('PAGEHEADING', $artefact->get('title'));
diff --git a/htdocs/artefact/internal/notes.json.php b/htdocs/artefact/internal/notes.json.php
index 653c8fb466b52f82c99d9e67f8f5612bdaa61613..cef910fb2bd1a553df6692980777f6d343f523c4 100644
--- a/htdocs/artefact/internal/notes.json.php
+++ b/htdocs/artefact/internal/notes.json.php
@@ -212,7 +212,7 @@ function deletenote_form($id, $notedata) {
                 'usebuttontag' => true,
                 'class' => 'btn-secondary btn-sm last',
                 'elementtitle' => get_string('delete'),
-                'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
+                'value' => '<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
             ),
         ),
     );
diff --git a/htdocs/artefact/internal/notes.php b/htdocs/artefact/internal/notes.php
index 1c3cb4fa9c94b2984d681a0650679008738cc7b5..ac746905a64eb2de490fbfe24f5844f7f864f364 100644
--- a/htdocs/artefact/internal/notes.php
+++ b/htdocs/artefact/internal/notes.php
@@ -201,7 +201,7 @@ jQuery(function($) {
 });';
 
 $smarty = smarty(array('paginator'));
-setpageicon($smarty, 'icon-pencil-square-o');
+setpageicon($smarty, 'icon-regular icon-edit');
 $smarty->assign('PAGEHEADING', $pageheading);
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign('data', $data);
@@ -227,7 +227,7 @@ function deletenote_form($id, $notedata) {
                 'usebuttontag' => true,
                 'class' => 'btn-secondary btn-sm last',
                 'elementtitle' => get_string('delete'),
-                'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
+                'value' => '<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
             ),
         ),
     );
diff --git a/htdocs/artefact/peerassessment/lib.php b/htdocs/artefact/peerassessment/lib.php
index 9c837cc9da841a42a1e2d1c4e32a817e16917824..055272fa846fddbacf9e5f0f3e11177ae9c2a9ad 100644
--- a/htdocs/artefact/peerassessment/lib.php
+++ b/htdocs/artefact/peerassessment/lib.php
@@ -804,7 +804,7 @@ class ArtefactTypePeerassessment extends ArtefactType {
                     'type'  => 'button',
                     'usebuttontag' => true,
                     'class' => 'btn-secondary btn-sm',
-                    'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
+                    'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
                     'confirm' => get_string('reallydeletethisassessment', 'artefact.peerassessment'),
                     'name'  => 'delete_assessment_submit',
                 ),
diff --git a/htdocs/artefact/resume/lib.php b/htdocs/artefact/resume/lib.php
index 28ab05e32ad4a8c5fe24ffe4534fa96b78f4cb43..2022a8b5ae58759a0a60b3f5b96c7153e4e39c18 100644
--- a/htdocs/artefact/resume/lib.php
+++ b/htdocs/artefact/resume/lib.php
@@ -1138,12 +1138,12 @@ EOF;
             var editlink =
                 jQuery('<a>', {'href': 'editcomposite.php?id=' + row.id + '&artefact=' + row.artefact,
                                'title': {$editstr}, 'class': 'btn btn-secondary btn-sm'}).append(
-                                    jQuery('<span>',{'class': 'icon icon-pencil icon-lg', 'role':'presentation'}),
+                                    jQuery('<span>',{'class': 'icon icon-pencil-alt icon-lg', 'role':'presentation'}),
                                     jQuery('<span>',{'class': 'sr-only'}).append({$editjsstr})
                                );
             var dellink =
                 jQuery('<a>', {'href': '', 'title': {$delstr}, 'class': 'btn btn-secondary btn-sm'}).append(
-                    jQuery('<span>',{'class': 'icon icon-trash text-danger icon-lg','role':'presentation'}),
+                    jQuery('<span>',{'class': 'icon icon-trash-alt text-danger icon-lg','role':'presentation'}),
                     jQuery('<span>',{'class': 'sr-only'}).append({$deljsstr})
                 );
                 dellink.on('click', function (e) {
diff --git a/htdocs/blocktype/openbadgedisplayer/badgrtoken.php b/htdocs/blocktype/openbadgedisplayer/badgrtoken.php
index 470e719043de602208e39cf915af99ac481aac46..6c462ed45dd94a2594e1b23997974174eeb336e7 100644
--- a/htdocs/blocktype/openbadgedisplayer/badgrtoken.php
+++ b/htdocs/blocktype/openbadgedisplayer/badgrtoken.php
@@ -51,7 +51,7 @@ if ($token) {
         'type'  => 'button',
         'usebuttontag' => true,
         'class' => 'btn-secondary btn-sm',
-        'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
+        'value' => '<span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
         'elementtitle' => get_string('deletespecific', 'mahara', $token),
     );
 }
diff --git a/htdocs/js/customlayout.js b/htdocs/js/customlayout.js
index be0170963e52d3d7d2a29f7d243aa724b284d09a..ee00c95462e0312b9a77dc0469bf671bf220e491 100644
--- a/htdocs/js/customlayout.js
+++ b/htdocs/js/customlayout.js
@@ -30,7 +30,7 @@
             }
             else {
                 // warning: classes are modified above for any subsequent button instances
-                newrow.append('<button name="removerow" class="float-left btn btn-sm btn-secondary removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(\'' + pieformname + '\', this)"><span class="icon icon-lg icon-trash text-danger"></span><span class="d-none d-md-inline-block"> ' + get_string('removethisrow', 'view') + '</span></button>');
+                newrow.append('<button name="removerow" class="float-left btn btn-sm btn-secondary removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(\'' + pieformname + '\', this)"><span class="icon icon-lg icon-trash-alt text-danger"></span><span class="d-none d-md-inline-block"> ' + get_string('removethisrow', 'view') + '</span></button>');
             }
             $('#customrow_' + numrows).after(newrow);
             $('#' + pieformname + '_customlayoutnumrows').val(numrows + 1);
diff --git a/htdocs/js/views.js b/htdocs/js/views.js
index 6385fb000dc0b74889bd1e16d9e6afd0811fd885..8b86b69c71acfedeac0e95c12bb9168d198e35d9 100644
--- a/htdocs/js/views.js
+++ b/htdocs/js/views.js
@@ -1053,7 +1053,7 @@
             blockinstanceId = blockinstance.attr('data-id'),
             content = blockinstance.find('.js-blockinstance-content'),
             oldContent = content.html(),
-            loading = $('<span>').attr('class', 'icon icon-spinner icon-spin block-loading'),
+            loading = $('<span>').attr('class', 'icon icon-spinner icon-pulse block-loading'),
             pd = {'id': $('#viewid').val(), 'change': 1};
 
 
diff --git a/htdocs/lib/pieforms/pieform/elements/calendar.php b/htdocs/lib/pieforms/pieform/elements/calendar.php
index 62d7ddf868e0045e4afc1c14128459c12bf56696..06d642da26dd10171e970e633f4be7a831bf1882 100644
--- a/htdocs/lib/pieforms/pieform/elements/calendar.php
+++ b/htdocs/lib/pieforms/pieform/elements/calendar.php
@@ -99,7 +99,7 @@ function pieform_element_calendar(Pieform $form, $element) {
             previous: "icon icon-chevron-left",
             next: "icon icon-chevron-right",
             close: "icon icon-times",
-            clear: "icon icon-trash",
+            clear: "icon icon-trash-alt",
             today: "icon icon-crosshairs",
         },
     });
diff --git a/htdocs/lib/web.php b/htdocs/lib/web.php
index 43dc3bacec139672f8158b9a8ed1798ad591c52e..d2af93c7425815a6fd298b93c08396057b138ac5 100755
--- a/htdocs/lib/web.php
+++ b/htdocs/lib/web.php
@@ -2867,7 +2867,7 @@ function mahara_standard_nav() {
             'url' => null,
             'title' => get_string('share'),
             'weight' => 30,
-            'iconclass' => 'unlock-alt',
+            'iconclass' => 'unlock',
         ),
         'engage' => array(
             'path' => 'engage',
diff --git a/htdocs/module/framework/frameworks.php b/htdocs/module/framework/frameworks.php
index 2498050573bd191b4c88a9a38d4ba7a590c1b4b3..51865f86d798f135ccfbe2cfe13660f8f984df0b 100644
--- a/htdocs/module/framework/frameworks.php
+++ b/htdocs/module/framework/frameworks.php
@@ -196,7 +196,7 @@ if ($frameworks) {
                             'type'         => 'button',
                             'class'        => 'btn-secondary btn-sm button',
                             'usebuttontag' => true,
-                            'value'        => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>',
+                            'value'        => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('delete') . '</span>',
                             'confirm'      => get_string('confirmdeletemenuitem', 'admin'),
                         ),
                         'framework'  => array(
diff --git a/htdocs/module/mobileapi/apps.php b/htdocs/module/mobileapi/apps.php
index 4dc35a7b2394019d4736d5af79c5d3b3da0d077e..021e277badabdcb15c60a04f657af8b297b6302c 100644
--- a/htdocs/module/mobileapi/apps.php
+++ b/htdocs/module/mobileapi/apps.php
@@ -171,7 +171,7 @@ else {
                                 'type'  => 'button',
                                 'usebuttontag' => true,
                                 'class' => 'btn-secondary btn-sm',
-                                'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
+                                'value' => '<span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
                                 'elementtitle' => get_string('deletespecific', 'mahara', $service->clientname),
                             ),
                     ),
diff --git a/htdocs/module/multirecipientnotification/sendmessage.php b/htdocs/module/multirecipientnotification/sendmessage.php
index a1d98e03fec2b5cfefa19e676f2e1f13770f2a89..40a0c2aa9f3ea9d498e702408669562a6397e4f8 100644
--- a/htdocs/module/multirecipientnotification/sendmessage.php
+++ b/htdocs/module/multirecipientnotification/sendmessage.php
@@ -241,7 +241,7 @@ $form = pieform(array(
 ));
 
 $smarty = smarty();
-setpageicon($smarty, 'icon-pencil-square-o');
+setpageicon($smarty, 'icon-regular icon-edit');
 $smarty->assign('form', $form);
 $smarty->assign('user', $USER);
 $smarty->assign('messages', $messages);
diff --git a/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl b/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl
index 5ee2f61d392bb0191e605b437fce1e3bb6bca5c5..0e5103685b9c91e7ae2ebb232d616815d23420ba 100644
--- a/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationlist.tpl
@@ -29,7 +29,7 @@
         <div class="btn-group btn-group-top comment-item-buttons">
             {if $item->canedit}
             <a href="{$WWWROOT}artefact/annotation/edit.php?id={$item->id}&amp;viewid={$viewid}" class="btn btn-secondary btn-sm">
-                <span class="icon icon-lg icon-pencil text-default" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-lg icon-pencil-alt text-default" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{str tag=edit}</span>
             </a>
             {/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl
index 6315755a7b92ad0e15aecb4541156b7baa5245c9..7b35945443e75b18c95fff421db2951fdb1af636 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl
@@ -35,7 +35,7 @@
                 <span class="text-small">{str tag=submittedforassessment section=view}</span>
             {else}
             <a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str(tag=settingsspecific arg1=$blog->title)|escape:html|safe}" class="btn btn-secondary btn-sm btn-group-item">
-                <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{str tag=editspecific arg1=$blog->title}</span>
             </a>
             {$blog->deleteform|safe}
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl
index e6cf267f4dae828038647739e98cb00ff27f819c..6792a9e230fae31252b30dd033ccbfff03c5d92a 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl
@@ -31,7 +31,7 @@
                         <input type="hidden" name="id" value="{$post->id}">
                         <div class="first">
                             <button type="submit" class="submit btn btn-secondary btn-sm" title="{str(tag=edit)|escape:html|safe}">
-                                <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                                <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                                 <span class="sr-only">{str tag=editspecific arg1=$post->title |escape:html|safe}</span>
                             </button>
                         </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
index 40556cb7530c3260a9ddaa0747aee751a97b7e06..5fa10f4d5187e286dd573b409bc0c358c508a5b6 100644
--- a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
@@ -42,7 +42,7 @@
                 {if !$onview}
                     {if $item->canedit}
                     <a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&amp;view={$viewid}" class="btn btn-secondary btn-group-item form-as-button float-left">
-                        <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str tag=edit}</span>
                     </a>
                     {/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl b/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl
index cfa14ae340b37043a43a1c51851970f94682353e..022e1371ac2d3b8bc5004b137d97fcd9f3a9494b 100644
--- a/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl
@@ -118,7 +118,7 @@
                     {elseif !$file->isparent}
                         {if !isset($file->can_edit) || $file->can_edit !== 0}
                         <button name="{$prefix}_edit[{$file->id}]" class="btn btn-secondary btn-sm editable" title="{str tag=edit}">
-                            <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                             {if $file->artefacttype == 'folder'}
                                 <span class="sr-only">{str tag=editfolderspecific section=artefact.file arg1=$displaytitle|escape:html|safe}</span>
                             {else}
@@ -158,12 +158,12 @@
                         {/if}
 
                         <button name="{$prefix}_edit[{$file->id}]" class="btn btn-secondary btn-sm">
-                            <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                             <span class="sr-only">{$edittext|escape:html|safe}</span>
                         </button>
 
                         <button name="{$prefix}_delete[{$file->id}]" class="btn btn-secondary btn-sm">
-                            <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                             <span class="sr-only">{$deletetext|escape:html|safe}</span>
                         </button>
                     </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl b/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl
index 9130ef070bebfd88ed51bda5f0b61dc71a7182f0..55d94f13534619ec4d63e88b04149643bcf89524 100644
--- a/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/file/templates/profileicons.tpl
@@ -20,7 +20,7 @@
                             {str tag="setdefault" section=artefact.file}
                         </button>
                         <button id="settings_delete" type="submit" class="delete btn btn-secondary" name="delete">
-                             <span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>
+                             <span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>
                              {str tag="deleteselectedicons" section=artefact.file}
                          </button>
                     </td>
diff --git a/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl b/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl
index 47f89f014944be003847edb2c02ec060a096d197..e1e952c47ef2d600c874d91df70a99ade6663486 100755
--- a/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/internal/templates/noteresults.tpl
@@ -89,7 +89,7 @@
                     {else}
                     <div class="btn-group">
                         <a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}" class="btn btn-secondary btn-sm">
-                            <span class="icon icon-lg icon-pencil" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span>
                             <span class="sr-only">
                                 {str(tag=editspecific arg1=$n->title)|escape:html|safe}
                             </span>
diff --git a/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl b/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl
index 82bba49cdb50d2d6a914ac1cfd3f505fa1ec441b..714f180bdfd9ac37e72ec38ab5f8fd6927737959 100644
--- a/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/internal/templates/socialprofiles.tpl
@@ -38,12 +38,12 @@
             <td class="control-buttons">
                 <div class="btn-group">
                     <a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}" class="btn btn-secondary btn-sm">
-                        <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str tag='edit'}</span>
                     </a>
                     {if $candelete}
                     <a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}&delete=1" title="{str tag='delete'}" class="btn btn-secondary btn-sm">
-                        <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str tag='delete'}</span>
                     </a>
                     {/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl b/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl
index 13f9265042574ed06af300f40a978c8fcd3e242d..a5633bc523c6f130e7e44d33339d0a1e73907c23 100644
--- a/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl
@@ -1,4 +1,4 @@
 <a id="modify_assessment_feedback_{$block}" class="js-peerassessment-modal feedback assessbtn btn btn-secondary btn-sm" href="#" data-toggle="modal-docked" data-target="#assessment_feedbackform_{$block}" data-blockid="{$block}" data-id="{$id}">
-    <span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
+    <span class="icon icon-pencil-alt" role="presentation" aria-hidden="true"></span>
     <span class="sr-only">{str tag=editspecific arg1=$title}</span>
 </a>
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
index ea3bf041900c4387c55b3f65b16d7fab56ad4515..8aa19734f79c41c37b7630313a796b279f5aef43 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
@@ -6,7 +6,7 @@
     {if $editing}
         <div class="float-right btn-group">
             <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=editspecific arg1=$plan.title)|escape:html|safe}">
-                <span class="icon icon-pencil"></span>
+                <span class="icon icon-pencil-alt"></span>
                 <span class="sr-only">{str tag='edit'}</span>
             </a>
             <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/new.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=addtaskspecific section='artefact.plans' arg1=$plan.title)|escape:html|safe}">
@@ -14,7 +14,7 @@
                 <span class="sr-only">{str tag='addtask' section='artefact.plans'}</span>
             </a>
             <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=deletespecific arg1=$plan.title)|escape:html|safe}">
-                <span class="icon icon-trash text-danger"></span>
+                <span class="icon icon-trash-alt text-danger"></span>
                 <span class="sr-only">{str tag='Delete'}</span>
             </a>
         </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl
index 92886e941ab26d7e230932b4bdb814aaf4f29ba5..501e33ad2e9e0bf12e0c13a19afb3d299397f8fb 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/planslist.tpl
@@ -9,7 +9,7 @@
             <div class="list-group-item-controls">
                 <div class="btn-group btn-group-top">
                     <a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str(tag=editspecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
-                        <span class="icon icon-lg icon-pencil" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-lg icon-pencil-alt" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str tag=edit}</span>
                     </a>
                     <a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-secondary btn-sm">
@@ -17,7 +17,7 @@
                         <span class="sr-only">{str tag=managetasks section=artefact.plans}</span>
                     </a>
                     <a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}" class="btn btn-secondary btn-sm">
-                        <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str tag=delete}</span>
                     </a>
                 </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
index b8568286f31566bddb4b826301f24a5985ad3acf..58c14c7cb31cded09575ea94d2ae35d7e8c5af9b 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
@@ -3,8 +3,8 @@
         <div class="task-item plan_incomplete list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
             {if $editing}
             <div class="float-right btn-group">
-                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
-                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
+                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a>
+                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
             </div>
             {/if}
             {if $task->description || $task->tags} <a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if}
@@ -42,8 +42,8 @@
         <div class="task-item list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
             {if $editing}
             <div class="float-right btn-group">
-                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
-                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
+                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil-alt text-default"></span></a>
+                <a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash-alt text-danger"></span></a>
             </div>
             {/if}
             {if $task->description || $task->tags}<a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}{if $versioning}-{$versioning->version}{/if}">{/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskslist.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskslist.tpl
index 4ab0d015be15430f7713e5c8afea5064c51563a9..38400caf9149675d9f1310871c012e55dcaec170 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskslist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskslist.tpl
@@ -38,11 +38,11 @@
             <td class="planscontrols control-buttons text-right">
                 <div class="btn-group">
                     <a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" title="{str tag=edit}" class="btn btn-secondary btn-sm">
-                        <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str(tag=editspecific arg1=$task->title)|escape:html|safe}</span>
                     </a>
                     <a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" title="{str tag=delete}" class="btn btn-secondary btn-sm">
-                        <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str(tag=deletespecific arg1=$task->title)|escape:html|safe}</span>
                     </a>
                 </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl
index b639cfa748d714b94ce53f8936f82dc0e6f85e2d..1929d64f48780f242f1165c4077e2681110ac6e6 100644
--- a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/goals.tpl
@@ -13,13 +13,13 @@
                 {if $n->exists}
                     <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
                     {str tag=$n->artefacttype section='artefact.resume'}
-                    <span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
                     <span class="sr-only">{str tag=edit}</span>
                     </a>
                 {else}
                     <a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
                           {str tag=$n->artefacttype section='artefact.resume'}
-                    <span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
                     <span class="sr-only">{str tag=edit}</span>
                     </a>
                 {/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl
index 342fabe729fa53b0ec56aeb4dde4b9ef0d70cda2..42c952e1138a1f6edf00095e3d7e019e693290f2 100644
--- a/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/resume/templates/fragments/skills.tpl
@@ -14,13 +14,13 @@
                 {if $n->exists}
                 <a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
                 {str tag=$n->artefacttype section='artefact.resume'}
-                <span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{str tag=edit}</span>
                 </a>
                 {else}
                 <a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}">
                 {str tag=$n->artefacttype section='artefact.resume'}
-                <span class="icon icon-pencil float-right" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt float-right" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{str tag=edit}</span>
                 </a>
                 {/if}
diff --git a/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl b/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl
index f4402307b0e87f7785b9150491da42c5dee23c6c..e53e472191cfbfb16091b231c65fc1015fb0429d 100644
--- a/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl
+++ b/htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl
@@ -1,6 +1,6 @@
 {if $r.delete}
     <button type="button" onclick="deleteidp(this, '{$r.idpentityid}')" name="delete" value="{$r.idpentityid}" class="deletebutton btn btn-secondary btn-sm" alt='{str tag=deletespecific section=mahara arg1=$r.name}'>
-        <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+        <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
         <span class="sr-only">
             {str tag=delete section=mahara}
         </span>
diff --git a/htdocs/theme/raw/plugintype/auth/webservice/templates/connections.tpl b/htdocs/theme/raw/plugintype/auth/webservice/templates/connections.tpl
index 2b5b3a23a8f9e31cc224f244eae4f043bfbe1ba2..b237ba993784ca41adf71a95223bbbe742a68ee5 100644
--- a/htdocs/theme/raw/plugintype/auth/webservice/templates/connections.tpl
+++ b/htdocs/theme/raw/plugintype/auth/webservice/templates/connections.tpl
@@ -56,7 +56,7 @@
                 buttons += '<span class="emptybtnspace"></span>';
             }
         }
-        buttons += '<a class="btn btn-secondary btn-sm" href="" onclick="removeConnection(' + id + '); return false;"><span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' + get_string('deleteitem') + '</span></a>' + "\n";
+        buttons += '<a class="btn btn-secondary btn-sm" href="" onclick="removeConnection(' + id + '); return false;"><span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">' + get_string('deleteitem') + '</span></a>' + "\n";
         return buttons;
     }
 
@@ -146,7 +146,7 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div.
                 <span class="emptybtnspace"></span>
             {{/if}}
             <a href="" class="btn btn-secondary btn-sm" onclick="removeConnection({{$instance->id}}); return false;">
-                <span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{{str tag=deleteitem}}</span>
             </a>
         </span>
diff --git a/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl b/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl
index a8b29d16305e46dda4216316c3b7f07f7b7a5547..fbb847818eb2c7d9d79918e7952a58e6be9f651b 100644
--- a/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl
@@ -14,7 +14,7 @@
                     </a>
                 {if $wallpost->deletable}
                     <a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="card-control card-header-action">
-                        <span class="icon icon-trash left text-danger icon-sm" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-trash-alt left text-danger icon-sm" role="presentation" aria-hidden="true"></span>
                         <span class="sr-only">{str tag='delete' section='blocktype.wall'}</span>
                     </a>
                 {/if}
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl
index 05711fa598b99056be5f09895a866b2c75d9a837..1abd3f557b217f679b551895e644174a1d874916 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl
@@ -85,12 +85,12 @@
                 <td class="right control-buttons">
                     <div class="btn-group">
                         <a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="btn btn-secondary btn-sm" title="{str tag=edit}">
-                            <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                             <span class="sr-only">{str tag=editspecific arg1=$forum->title}</span>
                         </a>
 
                         <a href="{$WWWROOT}interaction/delete.php?id={$forum->id}&amp;returnto=index" class="btn btn-secondary btn-sm" title="{str tag=delete}">
-                            <span class="text-danger icon icon-trash icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="text-danger icon icon-trash-alt icon-lg" role="presentation" aria-hidden="true"></span>
                             <span class="sr-only">{str tag=deletespecific arg1=$forum->title}</span>
                         </a>
                     </div>
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl
index 66ac66b873334f6abce5cf105d1575597f6e126b..c555b24ac9f3c4fed469cec14f91579d21537da8 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl
@@ -51,14 +51,14 @@
 
                 {if $post->canedit}
                 <a href="{$WWWROOT}interaction/forum/editpost.php?id={$post->id}">
-                    <span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-pencil-alt" role="presentation" aria-hidden="true"></span>
                     {str tag="edit"}
                 </a>
                 {/if}
 
                 {if $moderator && $post->parent}
                 <a href="{$WWWROOT}interaction/forum/deletepost.php?id={$post->id}">
-                    <span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span>
                     {str tag="delete"}
                 </a>
                 {/if}
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl
index 3a85bb640d7400750fecf54134f2e186751ede31..21ba0aecf952d0ea7800f09fda98d1aa07bfef6b 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl
@@ -6,12 +6,12 @@
     {/if}
     {if $topic->canedit}
     <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}" class="btn btn-secondary editforum">
-        <span class="icon icon-pencil icon-lg left" role="presentation" aria-hidden="true"></span>
+        <span class="icon icon-pencil-alt icon-lg left" role="presentation" aria-hidden="true"></span>
         {str tag=edittopic section=interaction.forum}
     </a>
     {if $moderator}
     <a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}" class="btn btn-secondary deletetopic">
-        <span class="icon icon-trash icon-lg left text-danger" role="presentation" aria-hidden="true"></span>
+        <span class="icon icon-trash-alt icon-lg left text-danger" role="presentation" aria-hidden="true"></span>
         {str tag=deletetopic section=interaction.forum}
     </a>
     {/if}
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
index 941d0952d034c4abbe7be128b8bd3f41c692b8b0..1dd412a8ba67979d53c1a6f9771b4ce27b91e9b5 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
@@ -86,13 +86,13 @@
     <td class="control-buttons">
         <div class="btn-group">
             <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-secondary btn-sm" title="{str tag="edit"}">
-                <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">
                     {str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
                 </span>
             </a>
             <a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-secondary btn-sm" title="{str tag="delete"}">
-                <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">
                     {str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject}
                 </span>
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl
index bd7366b7495ccde933fac9ad9377215df7d8f9c9..bb274ccb9f4335c7246a77dc91f2da09de73cff1 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl
@@ -19,7 +19,7 @@
     {if $membership && ($moderator || ($forum->newtopicusers != 'moderators') && $ineditwindow) }
         {if $admin}
             <a href="{$WWWROOT}interaction/delete.php?id={$forum->id}" class="btn btn-secondary deleteforum">
-                <span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span>
                 {str tag="deleteforum" section="interaction.forum"}
             </a>
         {/if}
diff --git a/htdocs/theme/raw/templates/account/index.tpl b/htdocs/theme/raw/templates/account/index.tpl
index ad1bafc96664ab13d87999ac44c94275dfc2531d..2d1b1d63a382250b5fd822cc6d05b9aed8231de6 100644
--- a/htdocs/theme/raw/templates/account/index.tpl
+++ b/htdocs/theme/raw/templates/account/index.tpl
@@ -2,7 +2,7 @@
 {if $candeleteself && !$deletionsent}
 <div class="btn-top-right btn-group btn-group-top">
     <a href="{$WWWROOT}account/delete.php" class="btn btn-secondary delete">
-        <span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>
+        <span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>
         <span>{str tag=deleteaccount1}</span>
     </a>
 </div>
diff --git a/htdocs/theme/raw/templates/admin/extensions/iframesites.tpl b/htdocs/theme/raw/templates/admin/extensions/iframesites.tpl
index 8767d695b6a8c65dd2eb962abcc86ad08d8dc906..72a5d811de0a26134023ade4bbd5c0c1f180e98d 100644
--- a/htdocs/theme/raw/templates/admin/extensions/iframesites.tpl
+++ b/htdocs/theme/raw/templates/admin/extensions/iframesites.tpl
@@ -22,7 +22,7 @@
           <div class="btn-group">
 
             <a id="edit-{$item.id}" class="url-open-editform btn btn-secondary btn-sm float-left closed" title="{str tag=edit}" href="">
-              <span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
+              <span class="icon icon-pencil-alt" role="presentation" aria-hidden="true"></span>
               <span class="icon icon-chevron-down icon-sm" role="presentation" aria-hidden="true"></span>
               <span class="sr-only">{str(tag=editspecific arg1=$item.name)|escape:html|safe}</span>
             </a>
diff --git a/htdocs/theme/raw/templates/admin/groups/groupsresults.tpl b/htdocs/theme/raw/templates/admin/groups/groupsresults.tpl
index 6dbe8168bc877e5b47f4ebd828a17ed77e69fbb5..d0b1ed996ec333d2b4a96e010cf012e2238bdf70 100644
--- a/htdocs/theme/raw/templates/admin/groups/groupsresults.tpl
+++ b/htdocs/theme/raw/templates/admin/groups/groupsresults.tpl
@@ -26,7 +26,7 @@
                 <span class="icon icon-clone icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=copygroup section=group arg1=$group->name)|escape:html|safe}</span>
             </a>
             <a class="btn btn-secondary btn-sm" title="{str tag="delete"}" href="{$WWWROOT}admin/groups/delete.php?id={$group->id}">
-                <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=deletespecific arg1=$group->name)|escape:html|safe}</span>
+                <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">{str(tag=deletespecific arg1=$group->name)|escape:html|safe}</span>
             </a>
         </div>
     </td>
diff --git a/htdocs/theme/raw/templates/admin/index.tpl b/htdocs/theme/raw/templates/admin/index.tpl
index 51d60879e4401d8fa68986d030c54ae210f5cbc9..dd58216f0d9c086c0f3e4cf332cac57a21fb85b0 100644
--- a/htdocs/theme/raw/templates/admin/index.tpl
+++ b/htdocs/theme/raw/templates/admin/index.tpl
@@ -113,7 +113,7 @@
                 {$closeform|safe}
             </div>
         {else}
-            <h3 class="card-header">{str tag=closesite section=admin} <span class="icon icon-unlock-alt float-right" role="presentation" aria-hidden="true"></span></h3>
+            <h3 class="card-header">{str tag=closesite section=admin} <span class="icon icon-unlock float-right" role="presentation" aria-hidden="true"></span></h3>
             <div class="card-body">
                 <p>{str tag=closesitedetail section=admin}</p>
                 {$closeform|safe}
diff --git a/htdocs/theme/raw/templates/admin/site/licenses.tpl b/htdocs/theme/raw/templates/admin/site/licenses.tpl
index d08be2c714e60b01262ac10b36118b87283c1734..a3ca17554887bebbeb4143cf2a5cebd0e2f4a78f 100644
--- a/htdocs/theme/raw/templates/admin/site/licenses.tpl
+++ b/htdocs/theme/raw/templates/admin/site/licenses.tpl
@@ -41,11 +41,11 @@
                             <td class="control-buttons">
                                 <div class="btn-group">
                                     <a href="license-edit.php?edit={$l->name|escape:url}" title="{str tag=edit}" class="btn btn-secondary btn-sm">
-                                        <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str(tag=editspecific arg1=$l->shortname)|escape:html|safe}</span>
                                     </a>
                                     <button class="btn btn-secondary btn-sm" type="submit" title="{str tag=delete}" name="license_delete[{$l->name}]" alt="{str(tag=deletespecific arg1=$l->shortname)|escape:html|safe}">
-                                        <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str tag=delete}</span>
                                     </button>
                                 </div>
diff --git a/htdocs/theme/raw/templates/admin/site/privacytable.tpl b/htdocs/theme/raw/templates/admin/site/privacytable.tpl
index 00f2bcf0dd4b8009b7f3a4181dd3ff2885ea35f1..1f101446bdbe8d9f06b05d351c414d33a8ea5eed 100644
--- a/htdocs/theme/raw/templates/admin/site/privacytable.tpl
+++ b/htdocs/theme/raw/templates/admin/site/privacytable.tpl
@@ -14,7 +14,7 @@
                 {if $result->id == $result->current}
                     <div class="btn-group">
                         <a href="{$WWWROOT}{$link}{$result->id}" title="{str tag=editversion section='admin' arg1='$result->version'}" class="btn btn-secondary btn-sm">
-                            <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                         </a>
                     </div>
                 {else}
diff --git a/htdocs/theme/raw/templates/admin/users/bulk.tpl b/htdocs/theme/raw/templates/admin/users/bulk.tpl
index e2df29bbcc32130d794c0edbec0016f56bc159f6..2b428f847d43602dec88036e091e87c1dd6e0092 100644
--- a/htdocs/theme/raw/templates/admin/users/bulk.tpl
+++ b/htdocs/theme/raw/templates/admin/users/bulk.tpl
@@ -25,7 +25,7 @@
             {/if}
             <li id="delete-user-tab" class="" role="presentation" aria-hidden="true">
                 <a href="#delete-form" aria-controls="delete-form" role="tab" data-toggle="tab">
-                    <span class="icon icon-lg icon-trash left" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-lg icon-trash-alt left" role="presentation" aria-hidden="true"></span>
                     {str tag=deleteusers section=admin}
                 </a>
             </li>
diff --git a/htdocs/theme/raw/templates/admin/users/institutions.tpl b/htdocs/theme/raw/templates/admin/users/institutions.tpl
index fc666629105908302db3b18b619d5882fc0ae5c0..6c1b9f97e749e8c14c91a6217cffcb10ecf86758 100644
--- a/htdocs/theme/raw/templates/admin/users/institutions.tpl
+++ b/htdocs/theme/raw/templates/admin/users/institutions.tpl
@@ -52,7 +52,7 @@
         {if $countinstitutions > 1}
 
             <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                <span class="icon icon-pencil icon-lg left" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt icon-lg left" role="presentation" aria-hidden="true"></span>
                 <span class="icon icon-ellipsis-h icon-xs" role="presentation" aria-hidden="true"></span>
                 <span class="btn-title sr-only">{str tag="edit"}</span>
             </button>
diff --git a/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl b/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl
index 94f45e8d1dc75416a49d00e398a3259e4fcff8f4..c6a8b4065a6081c4e45cd134397dba264dbd9e6e 100644
--- a/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl
+++ b/htdocs/theme/raw/templates/admin/users/institutionsresults.tpl
@@ -48,7 +48,7 @@
                          {if $siteadmin && !$institution->members && $institution->name != 'mahara'}
                             <button type="submit" name="delete" value="1" class="btn-secondary btn-sm button btn btn-group-last" alt="{str(tag=deletespecific arg1=$institution->displayname)|escape:html|safe}">
 
-                                <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                                <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                                 <span class="sr-only">
                                     {str tag="delete"}
                                 </span>
diff --git a/htdocs/theme/raw/templates/admin/users/institutiontags.tpl b/htdocs/theme/raw/templates/admin/users/institutiontags.tpl
index 85f53b30f6ff7f067503d826f0d66826852ce47e..dc05d3210083f975bf444c08114879d6b23b9eb4 100644
--- a/htdocs/theme/raw/templates/admin/users/institutiontags.tpl
+++ b/htdocs/theme/raw/templates/admin/users/institutiontags.tpl
@@ -21,7 +21,7 @@
                 <div class="float-right">
                   {if $tag->count <= 0}
                     <a href="{$WWWROOT}admin/users/institutiontags.php?delete={$tag->id}&institution={$institution}" title="{str tag=deleteinstitutiontag}" class="btn btn-secondary btn-sm">
-                    <span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
                     <span class="sr-only">{str tag=deleteinstitutiontagspecific arg1=$tag->tag}</span>
                     </a>
                   {else}
diff --git a/htdocs/theme/raw/templates/admin/users/search.tpl b/htdocs/theme/raw/templates/admin/users/search.tpl
index 6d91b092afa65cbda87cffaef4a8ebc8f2fd9b6b..32614fd844655f342e48a98c010045c0741c999d 100644
--- a/htdocs/theme/raw/templates/admin/users/search.tpl
+++ b/htdocs/theme/raw/templates/admin/users/search.tpl
@@ -167,7 +167,7 @@
                 {if $USER->get('admin') || $USER->is_institutional_admin()}
                 <form class="nojs-hidden-inline form-as-button float-left" id="bulkactions" action="{$WWWROOT}admin/users/bulk.php" method="post">
                     <button action="{$WWWROOT}admin/users/bulk.php" type="submit" class="btn btn-secondary disabled" name="edit" id="editbtn" value="{str tag=edit}">
-                        <span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>
                         {str tag=withselectedusersedit section=admin}
                     </button>
 
diff --git a/htdocs/theme/raw/templates/collection/actions.tpl b/htdocs/theme/raw/templates/collection/actions.tpl
index 0dcf30b701ae1da23cd4f587647ab0e1ff1adb2a..c13f24d9b23fe55c416eeff52914608840ff522a 100644
--- a/htdocs/theme/raw/templates/collection/actions.tpl
+++ b/htdocs/theme/raw/templates/collection/actions.tpl
@@ -4,7 +4,7 @@
             <span class="icon icon-plus icon-lg left" role="presentation" aria-hidden="true"></span>
             {str section=collection tag=newcollection}</a>
         <a class="btn btn-secondary" href="{$WWWROOT}view/choosetemplate.php?searchcollection=1{$urlparamsstr}">
-            <span class="icon icon-files-o icon-lg left" role="presentation" aria-hidden="true"></span>
+            <span class="icon icon-regular icon-copy icon-lg left" role="presentation" aria-hidden="true"></span>
             {str section=collection tag=copyacollection}
         </a>
     </div>
diff --git a/htdocs/theme/raw/templates/collection/collectionresults.tpl b/htdocs/theme/raw/templates/collection/collectionresults.tpl
index 61854e02682327448cd3de284229e07d9c0bf0f9..b41d35dc46c1b4e5d0c84c1d4aa959408f6a8a55 100644
--- a/htdocs/theme/raw/templates/collection/collectionresults.tpl
+++ b/htdocs/theme/raw/templates/collection/collectionresults.tpl
@@ -38,11 +38,11 @@
                                         <span class="sr-only">{str(tag=manageviewsspecific section=collection arg1=$collection->name)|escape:html|safe}</span>
                                     </a>
                                     <a href="{$WWWROOT}collection/edit.php?id={$collection->id}" title="{str tag=edittitleanddescription section=view}" class="btn btn-secondary btn-sm">
-                                        <span class="icon icon-pencil icon-lg text-default" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-pencil-alt icon-lg text-default" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str(tag=editspecific arg1=$collection->name)|escape:html|safe}</span>
                                     </a>
                                     <a href="{$WWWROOT}collection/delete.php?id={$collection->id}" title="{str tag=deletecollection section=collection}" class="btn btn-secondary btn-sm">
-                                        <span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str(tag=deletespecific arg1=$collection->name)|escape:html|safe}</span>
                                     </a>
                                 </div>
diff --git a/htdocs/theme/raw/templates/edittags.tpl b/htdocs/theme/raw/templates/edittags.tpl
index d2cd87c75e52b45dc7d97157c303efccbd610106..53fdfb0ee9806f1c93205fb011cd8320a7903125 100644
--- a/htdocs/theme/raw/templates/edittags.tpl
+++ b/htdocs/theme/raw/templates/edittags.tpl
@@ -19,7 +19,7 @@
 {if $tag}
 <div class="edittag list-group-item">
     <h3 class="list-group-item-heading">
-        <span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>
+        <span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>
         {str tag=edittag arg1=$tagsearchurl arg2=$tag}
     </h3>
     <div class="tag-action-description text-small">{str tag=edittagdescription arg1=$tag}</div>
@@ -27,7 +27,7 @@
 </div>
 <div class="deletetag list-group-item">
     <h3 class="list-group-item-heading">
-        <span class="icon icon-trash left text-danger" role="presentation" aria-hidden="true"></span>
+        <span class="icon icon-trash-alt left text-danger" role="presentation" aria-hidden="true"></span>
         {str tag=deletetag arg1=$tagsearchurl arg2=$tag}
     </h3>
     <div class="tag-action-description text-small">{str tag=deletetagdescription}</div>
diff --git a/htdocs/theme/raw/templates/form/authlist.tpl b/htdocs/theme/raw/templates/form/authlist.tpl
index ce2f82a1da019ec72ff0c081dda49beee75070d4..c859be4ab97cdcc9bc1d8130ed55225b0b9769aa 100644
--- a/htdocs/theme/raw/templates/form/authlist.tpl
+++ b/htdocs/theme/raw/templates/form/authlist.tpl
@@ -71,7 +71,7 @@
 
             jQuery(displayArray[i]).find('span.authIcons').first()
                 .append('<a class="btn btn-secondary btn-sm" href="" onclick="removeAuth('+outputArray[i]+'); ' +
-                    'return false;"><span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true">' +
+                    'return false;"><span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true">' +
                     '</span><span class="sr-only">'+get_string('deleteitem')+'</span></a>'+"\n");
 
             instanceListDiv.appendChild(displayArray[i]);
@@ -210,7 +210,7 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div.
             </a>
             {{/if}}
             <a href="" class="btn btn-secondary btn-sm" onclick="removeAuth({{$instance->id}}); return false;">
-                <span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{{str tag=deleteitem}}</span>
             </a>
         </span>
diff --git a/htdocs/theme/raw/templates/form/emaillist.tpl b/htdocs/theme/raw/templates/form/emaillist.tpl
index a002c88cdce9ea8973c08c4436c1fea51ef59c25..853ad10da1d848a42da6ce95b1ae1190943f7df4 100644
--- a/htdocs/theme/raw/templates/form/emaillist.tpl
+++ b/htdocs/theme/raw/templates/form/emaillist.tpl
@@ -38,7 +38,7 @@
                     ' ',
                     jQuery('<span>', {'class': 'pseudolabel'}).append(email),' ',
                     jQuery('<button>', {'class': 'btn btn-secondary btn-sm float-right', 'onclick': '{{$name}}_remove(this); return false'}).append(
-                      jQuery('<span>', {'class': 'icon icon-trash icon-lg text-danger', 'role': 'presentation'})
+                      jQuery('<span>', {'class': 'icon icon-trash-alt icon-lg text-danger', 'role': 'presentation'})
                     ),
                     jQuery('<div>', {'class': 'clearfix description'}).append({{$validationemailstr|safe}})
                 ));
@@ -109,7 +109,7 @@
         </label>
         {{if $email != $default}}
         <button class="btn btn-secondary btn-sm float-right" onclick="{{$name}}_remove(this); return false;" title="{{str tag=delete}}">
-            <span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
+            <span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
         </button>
         {{/if}}
     </div>
@@ -122,7 +122,7 @@
             {{$email}}
         </span>
         <button class="btn btn-secondary btn-sm float-right" onclick="{{$name}}_remove(this); return false;" title="{{str tag=delete}}">
-            <span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span>
+            <span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span>
         </button>
         <div class="description">{{str tag=validationemailsent section=artefact.internal}}</div>
     </div>
diff --git a/htdocs/theme/raw/templates/form/viewacl.tpl b/htdocs/theme/raw/templates/form/viewacl.tpl
index ccd209646a8d1687dace335b01d2ba6cec215186..9826fd3a846de11fc11a8001a3e58565fb06830b 100644
--- a/htdocs/theme/raw/templates/form/viewacl.tpl
+++ b/htdocs/theme/raw/templates/form/viewacl.tpl
@@ -40,7 +40,7 @@
 <tr id="row-{%=o.id%}" data-id="{%=o.id%}">
     <td class="text-center with-icon tiny">
         <a class="{% if (o.presets.locked || o.presets.empty) { %}icon-placeholder{% } %} text-block" data-bind="remove-share" href="#" id="remove-share{%=o.id%}">
-            <span class="text-danger icon icon-lg icon-trash" role="presentation" aria-hidden="true"></span>
+            <span class="text-danger icon icon-lg icon-trash-alt" role="presentation" aria-hidden="true"></span>
             <span class="sr-only">{%={{jstr tag=remove section=view}}%}</span>
         </a>
     </td>
@@ -182,7 +182,7 @@ jQuery(function($) {
                         previous: "icon icon-chevron-left",
                         next: "icon icon-chevron-right",
                         close: "icon icon-times",
-                        clear: "icon icon-trash",
+                        clear: "icon icon-trash-alt",
                         today: "icon icon-crosshairs",
                     },
                 });
diff --git a/htdocs/theme/raw/templates/group/groupuserstatus.tpl b/htdocs/theme/raw/templates/group/groupuserstatus.tpl
index 0354b30607104aef57b347c3b014ff8969f795bd..bdf88fa010cf3fd8c61f6cc1fe839751bfe95178 100644
--- a/htdocs/theme/raw/templates/group/groupuserstatus.tpl
+++ b/htdocs/theme/raw/templates/group/groupuserstatus.tpl
@@ -26,7 +26,7 @@
         <div class="groupuserstatus btn-top-right btn-group btn-group-top">
             {if $viewid}
             <a href="{$WWWROOT}view/blocks.php?id={$viewid}&group={$group->id}" title="{str tag=editcontentandlayout section='view'}" class="btn btn-secondary">
-                <span class="icon icon-pencil text-default" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt text-default" role="presentation" aria-hidden="true"></span>
                 <span class="btn-title">{str tag=editthisview section='view'}</span>
             </a>
             {/if}
@@ -44,7 +44,7 @@
             </a>
             {/if}
             <a href="{$WWWROOT}group/delete.php?id={$group->id}" title="{str(tag=deletespecific arg1=$group->name)|escape:html|safe}" class="btn btn-secondary">
-                <span class="icon icon-trash text-danger" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-trash-alt text-danger" role="presentation" aria-hidden="true"></span>
                 <span class="btn-title">{str tag=delete}</span>
                 <span class="sr-only">{str(tag=deletespecific arg1=$group->name)|escape:html|safe}</span>
             </a>
diff --git a/htdocs/theme/raw/templates/header/pageactions.tpl b/htdocs/theme/raw/templates/header/pageactions.tpl
index 264561caa7c5acc176e21c34e39adf322714352b..48553711f0a81de718d647abf8911f92d89ae28d 100644
--- a/htdocs/theme/raw/templates/header/pageactions.tpl
+++ b/htdocs/theme/raw/templates/header/pageactions.tpl
@@ -2,7 +2,7 @@
     <div class="btn-group-vertical">
         {if $editurl}{strip}
             <a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn btn-secondary">
-                <span class="icon icon-pencil icon-lg left" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pencil-alt icon-lg left" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{str tag=editthisview section=view}</span>
             </a>
         {/strip}{/if}
@@ -27,7 +27,7 @@
                     {else}
                         <a id="copyview-button" title="{str tag=copythisview section=view}" href="{$copyurl}">
                     {/if}
-                    <span class="icon icon-files-o icon-lg left" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-regular icon-copy icon-lg left" role="presentation" aria-hidden="true"></span>
                     {str tag=copy section=mahara}
                     </a>
                 </li>
@@ -78,7 +78,7 @@
                 {if $userisowner || $canremove}
                 <li class="dropdown-item">
                     <a href="{$WWWROOT}view/delete.php?id={$viewid}" title="{str tag=deletethisview section=view}">
-                        <span class="icon icon-lg icon-trash text-danger left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-lg icon-trash-alt text-danger left" role="presentation" aria-hidden="true"></span>
                         <span class="link-text">{str tag=deletethisview section=view}</span>
                         <span class="sr-only">{str(tag=deletespecific arg1=$maintitle)|escape:html|safe}</span>
                     </a>
diff --git a/htdocs/theme/raw/templates/header/profileactions.tpl b/htdocs/theme/raw/templates/header/profileactions.tpl
index c80a4604f77c1bc9ef910a40b19655ae4416647c..0c9dcde22dc75f8c1195768fd0b567f391e165d1 100644
--- a/htdocs/theme/raw/templates/header/profileactions.tpl
+++ b/htdocs/theme/raw/templates/header/profileactions.tpl
@@ -2,7 +2,7 @@
     <div class="btn-group-vertical">
         {if $ownprofile}
             <a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn btn-secondary">
-                <span class="icon-pencil icon icon-lg left" role="presentation" aria-hidden="true"></span>
+                <span class="icon-pencil-alt icon icon-lg left" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">{str tag=editthisview section=view}</span>
             </a>
         {/if}
diff --git a/htdocs/theme/raw/templates/homeinfo.tpl b/htdocs/theme/raw/templates/homeinfo.tpl
index 8cc14e1a62ba85de7b50f9b9cbb44a1bfe756d97..98b6d055cea45ee4170bdfc9421bfb3be8228775 100644
--- a/htdocs/theme/raw/templates/homeinfo.tpl
+++ b/htdocs/theme/raw/templates/homeinfo.tpl
@@ -35,7 +35,7 @@
             <div id="home-info-share" class="home-info-box">
                 <div class="widget-heading">
                     <div class="circle-bg">
-                        <span class="icon icon-unlock-alt" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-unlock" role="presentation" aria-hidden="true"></span>
                     </div>
                     <h2 class="title">
                         {str tag=share}
diff --git a/htdocs/theme/raw/templates/index.tpl b/htdocs/theme/raw/templates/index.tpl
index 79e01ca04aa81e440d2352160ec578fe3ea42d8d..45bbc0b3bc06beb42e45f3fef927c0b8efacb7f0 100644
--- a/htdocs/theme/raw/templates/index.tpl
+++ b/htdocs/theme/raw/templates/index.tpl
@@ -6,7 +6,7 @@
 {if $dashboardview}
     <div class="dashboard-editable">
         <div class="btn-top-right btn-group btn-group-top" id="editdashboard">
-            <a class="btn btn-secondary" href="{$WWWROOT}view/blocks.php?id={$viewid}"><span class="btn-edit"><span class="icon icon-pencil left" role="presentation" aria-hidden="true"> </span> {str tag='editdashboard'}</span></a>
+            <a class="btn btn-secondary" href="{$WWWROOT}view/blocks.php?id={$viewid}"><span class="btn-edit"><span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"> </span> {str tag='editdashboard'}</span></a>
         </div>
 
         {include file="user/dashboard.tpl"}
diff --git a/htdocs/theme/raw/templates/skin/index.tpl b/htdocs/theme/raw/templates/skin/index.tpl
index 8c4940a27655328eed752e4bcdfdf6d8610c5633..679aaaec6d8e8402e22f5430d1b4f1d5b8600b9f 100644
--- a/htdocs/theme/raw/templates/skin/index.tpl
+++ b/htdocs/theme/raw/templates/skin/index.tpl
@@ -46,7 +46,7 @@
             <div class="skin-controls card-footer">
                 {if $skin.editable}
                 <a href="{$WWWROOT}skin/design.php?id={$skin.id}{if $skin.type == 'site'}&site=1{/if}" title="{str tag='editthisskin' section='skin'}" {if $skin.type == 'site'} onclick="return confirm('{str tag='editsiteskin?' section='skin'}');"{/if} class="btn btn-secondary btn-sm">
-                    <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                     <span class="sr-only">
                         {str tag=editspecific arg1=$skin.title}
                     </span>
@@ -63,7 +63,7 @@
                 </a>
 
                 <a href="{$WWWROOT}skin/delete.php?id={$skin.id}{if $skin.type == 'site'}&site=1{/if}" title="{str tag='deletethisskin' section='skin'}" class="btn btn-secondary btn-sm">
-                    <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span>
                     <span class="sr-only">
                         {str tag=deletespecific arg1=$skin.title}
                     </span>
diff --git a/htdocs/theme/raw/templates/styleguide.tpl b/htdocs/theme/raw/templates/styleguide.tpl
index afe98b64b735a43b4fc9664840293e762570e560..669276b2c0e4c18575f49a59387cb049ee2a16d4 100644
--- a/htdocs/theme/raw/templates/styleguide.tpl
+++ b/htdocs/theme/raw/templates/styleguide.tpl
@@ -86,7 +86,7 @@ This pair of buttons is used for editing or deleting a block item on a page.
         <span class="icon icon-cog icon-lg"></span>
     </button>
     <button class="deletebutton btn btn-inverse btn-sm">
-        <span class="icon icon-trash text-danger icon-lg"></span>
+        <span class="icon icon-trash-alt text-danger icon-lg"></span>
     </button>
 </span>
 </div>
@@ -748,7 +748,7 @@ This card is used to show a page.
                 <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     <li class="dropdown-item">
                         <a href="" title="Edit content and layout">
-                        <span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>
                         <span class="link-text">Edit</span>
                         <span class="sr-only">Edit "Dashboard page"</span>
                         </a>
@@ -791,13 +791,13 @@ section .card-quarter:nth-child(4n) .page-access .dropdown-menu {
             <div class="page-access">
                 <a href="#" class="dropdown-toggle btn btn-link" data-toggle="dropdown" aria-expanded="false" title="Manage access">
                     <span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
-                    <span class="icon icon-unlock-alt close-indicator" role="presentation" aria-hidden="true"></span>
+                    <span class="icon icon-unlock close-indicator" role="presentation" aria-hidden="true"></span>
                     <span class="sr-only">Access rules for "Unnamed page"</span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
                     <li class="dropdown-item">
                         <a class="seperator" href="">
-                            <span class="icon icon-unlock-alt left" role="presentation" aria-hidden="true"></span>
+                            <span class="icon icon-unlock left" role="presentation" aria-hidden="true"></span>
                             <span class="link-text">Manage access</span>
                             <span class="sr-only">Manage access for "Unnamed page"</span>
                         </a>
@@ -819,7 +819,7 @@ section .card-quarter:nth-child(4n) .page-access .dropdown-menu {
                 <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     <li class="dropdown-item">
                         <a href="" title="Edit content and layout">
-                        <span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>
                         <span class="link-text">Edit</span>
                         <span class="sr-only">Edit "Unnamed page"</span>
                         </a>
@@ -863,13 +863,13 @@ section .card-quarter:nth-child(4n) .page-access .dropdown-menu {
             <div class="page-access">
                 <a href="#" class="dropdown-toggle btn btn-link" data-toggle="dropdown" aria-expanded="false" title="Manage access">
                 <span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
-                <span class="icon icon-unlock-alt close-indicator" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-unlock close-indicator" role="presentation" aria-hidden="true"></span>
                 <span class="sr-only">Access rules for "collection"</span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
                     <li class="dropdown-item">
                         <a class="seperator" href="">
-                        <span class="icon icon-unlock-alt left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-unlock left" role="presentation" aria-hidden="true"></span>
                         <span class="link-text">Manage access</span>
                         <span class="sr-only">Manage access for "collection"</span>
                         </a>
@@ -898,14 +898,14 @@ section .card-quarter:nth-child(4n) .page-access .dropdown-menu {
                     </li>
                     <li class="dropdown-item">
                         <a href="" title="Edit title and description">
-                        <span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>
                         <span class="link-text">Edit</span>
                         <span class="sr-only">Edit "collection"</span>
                         </a>
                     </li>
                     <li class="dropdown-item">
                         <a href="" title="Delete collection">
-                        <span class="icon icon-trash text-danger left" role="presentation" aria-hidden="true"></span>
+                        <span class="icon icon-trash-alt text-danger left" role="presentation" aria-hidden="true"></span>
                         <span class="link-text">Delete</span>
                         <span class="sr-only">Delete "collection"</span>
                         </a>
@@ -1119,7 +1119,7 @@ A striped table is most frequently found in the administration area where tables
                         <span class="icon icon-cog icon-lg"></span><span class="sr-only">{str tag=groupmanagespecific section=admin arg1='Item 1'}</span>
                     </a>
                     <a class="btn btn-secondary btn-sm" title="{str tag=delete}" href="">
-                        <span class="icon icon-trash text-danger icon-lg"></span><span class="sr-only">{str tag=deletespecific section=mahara arg1='Item 1'}</span>
+                        <span class="icon icon-trash-alt text-danger icon-lg"></span><span class="sr-only">{str tag=deletespecific section=mahara arg1='Item 1'}</span>
                     </a>
                 </div>
             </td>
@@ -1136,7 +1136,7 @@ A striped table is most frequently found in the administration area where tables
                         <span class="icon icon-cog icon-lg"></span><span class="sr-only">{str tag=groupmanagespecific section=admin arg1='Item 2'}</span>
                     </a>
                     <a class="btn btn-secondary btn-sm" title="{str tag=delete}" href="">
-                        <span class="icon icon-trash text-danger icon-lg"></span><span class="sr-only">{str tag=deletespecific section=mahara arg1='Item 2'}</span>
+                        <span class="icon icon-trash-alt text-danger icon-lg"></span><span class="sr-only">{str tag=deletespecific section=mahara arg1='Item 2'}</span>
                     </a>
                 </div>
             </td>
@@ -1522,7 +1522,7 @@ Used to show comments and used for the "Recent forum posts" block.
 ### Copy to clipboard
 As used on the secret URLs page.
 ```
-<i class="icon icon-files-o" role="presentation"></i>
+<i class="icon icon-regular icon-copy" role="presentation"></i>
 ```
 </section>
 
@@ -1602,7 +1602,7 @@ Used for the "File(s) to download" block.
 ### File image
 As seen on the "Site files" page in the administration area.
 ```
-<i class="icon icon-file-image-o" role="presentation"></i>
+<i class="icon icon-regular icon-file-image" role="presentation"></i>
 ```
 </section>
 
@@ -1610,7 +1610,7 @@ As seen on the "Site files" page in the administration area.
 ### File text
 As seen on the "Site pages" page.
 ```
-<i class="icon icon-file-text" role="presentation"></i>
+<i class="icon icon-file-alt" role="presentation"></i>
 ```
 </section>
 
@@ -1690,7 +1690,7 @@ Used as a help icon.
 ### Image
 Used for the "Image" block.
 ```
-<i class="icon icon-image" role="presentation"></i>
+<i class="icon icon-regular icon-image" role="presentation"></i>
 ```
 </section>
 
@@ -1834,7 +1834,7 @@ Used for the "PDF" block.
 ### Pencil
 Used on "Edit" buttons.
 ```
-<i class="icon icon-pencil" role="presentation"></i>
+<i class="icon icon-pencil-alt" role="presentation"></i>
 ```
 </section>
 
@@ -2025,7 +2025,7 @@ Used for the "Text" block.
 ### Trash
 Used on buttons to signify deleting an item. The class "text-danger" makes the icon red.
 ```
-<i class="icon icon-trash text-danger" role="presentation"></i>
+<i class="icon icon-trash-alt text-danger" role="presentation"></i>
 ```
 </section>
 
@@ -2049,7 +2049,7 @@ Used on the "Administer institutions" page in the administration area.
 ### Unlock
 
 ```
-<i class="icon icon-unlock-alt" role="presentation"></i>
+<i class="icon icon-unlock" role="presentation"></i>
 ```
 </section>
 
@@ -2119,7 +2119,7 @@ Used as icon for a system notification.
         // add copy button
         var codeElem = $j(elem).find('code');
         codeElem.attr('id', 'code-block-' + i);
-        codeElem.before('<button class="copy" role="presentation" data-clipboard-target="#code-block-' + i + '" title="{$copy}"><i class="icon icon-files-o"></i></button>');
+        codeElem.before('<button class="copy" role="presentation" data-clipboard-target="#code-block-' + i + '" title="{$copy}"><i class="icon icon-regular icon-copy"></i></button>');
 
         // add the category to the sections index
         var category = $j(elem).data('category');
diff --git a/htdocs/theme/raw/templates/tags.tpl b/htdocs/theme/raw/templates/tags.tpl
index 86537600c0cb968ab6fe6155588c781415a5d981..011d0fcf17359b693317404456f1e05e10f87251 100644
--- a/htdocs/theme/raw/templates/tags.tpl
+++ b/htdocs/theme/raw/templates/tags.tpl
@@ -1,7 +1,7 @@
 {include file="header.tpl"}
 {if $tags}
     <div class="btn-top-right btn-group btn-group-top">
-        <a class="btn btn-secondary" href="{$WWWROOT}edittags.php"><span class="icon icon-lg icon-pencil left" role="presentation" aria-hidden="true"></span>{str tag=edittags}</a>
+        <a class="btn btn-secondary" href="{$WWWROOT}edittags.php"><span class="icon icon-lg icon-pencil-alt left" role="presentation" aria-hidden="true"></span>{str tag=edittags}</a>
     </div>
     <ul class="nav nav-tabs">
     {foreach from=$tagsortoptions key=tagsortfield item=selectedsort name=tagsortoptions}
@@ -21,7 +21,7 @@
         </h2>
         {if $not_institution_tag}
         <div class="btn-top-right btn-group btn-group-top d-block">
-            <a class="btn btn-secondary edit-tag float-right{if !$tag} d-none{/if}" href="{$WWWROOT}edittags.php?tag={$tag|urlencode|safe}"><span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>{str tag=editthistag}</a>
+            <a class="btn btn-secondary edit-tag float-right{if !$tag} d-none{/if}" href="{$WWWROOT}edittags.php?tag={$tag|urlencode|safe}"><span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>{str tag=editthistag}</a>
         </div>
         {/if}
         <div class="tag-filters">
diff --git a/htdocs/theme/raw/templates/view/accessurl.tpl b/htdocs/theme/raw/templates/view/accessurl.tpl
index 44e2f4648c0754e326900e3cb3c605222da56bcc..20380268cdfcfbfcbbc81d2d26d986bd54c61cdd 100644
--- a/htdocs/theme/raw/templates/view/accessurl.tpl
+++ b/htdocs/theme/raw/templates/view/accessurl.tpl
@@ -44,11 +44,11 @@
                             <div class="btn-action-list">
                                 <div class="btn-top-right btn-group btn-group-top">
                                     <a id="copytoclipboard-{$item.id}" data-clipboard-text="{$item.url}" class="url-copytoclipboardbutton btn btn-secondary btn-sm" title="{str tag=copytoclipboard}" href="#">
-                                        <span class="icon icon-files-o icon-lg" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-regular icon-copy icon-lg" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str tag=copytoclipboard}</span>
                                     </a>
                                     <a id="edit-{$item.id}" class="url-open-editform nojs-hidden-inline btn btn-secondary closed" title="{str tag=edit}" href="">
-                                        <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                                         <span class="icon icon-chevron-down right" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str tag=edit}</span>
                                     </a>
diff --git a/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl b/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl
index 5c88a8145163303c9d9af2785ed31a8b266ee1e7..92ede97d4f2ac2c42d9809ea1221742f1ccaec4e 100644
--- a/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl
+++ b/htdocs/theme/raw/templates/view/blocktypecategorylist.tpl
@@ -12,7 +12,7 @@
     {else}
         <div id="{$category.name}">
             <div class="metadata hide-title-collapsed">
-                <span class="icon icon-spin icon-spinner icon left" role="presentation" aria-hidden="true"></span>
+                <span class="icon icon-pulse icon-spinner icon left" role="presentation" aria-hidden="true"></span>
                 <span class="title">{str tag=loading section=mahara}</span>
             </div>
         </div>
diff --git a/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl b/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl
index 43bd66cfe8d781bc62c24d59dfb012afb45f0fe5..369cc7c4903272c203e69b907ccb743a3f05c04a 100644
--- a/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl
+++ b/htdocs/theme/raw/templates/view/blocktypecontainerediting.tpl
@@ -25,7 +25,7 @@
                 {/if}
                 {if !$lockblocks}
                 <button class="deletebutton btn btn-inverse btn-sm" name="action_removeblockinstance_id_{$id}" alt="{$strremovetitletext}" data-id="{$id}">
-                    <span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true" title="{$strremovetitletexttooltip}"></span>
+                    <span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true" title="{$strremovetitletexttooltip}"></span>
                 </button>
                 {/if}
             </span>
diff --git a/htdocs/theme/raw/templates/view/editviewtabs.tpl b/htdocs/theme/raw/templates/view/editviewtabs.tpl
index f9b67af040e4c8c3bca16bc94d7849b01aa2297a..aa92b952938b7a525b6fb760a8f78cf25254e536 100644
--- a/htdocs/theme/raw/templates/view/editviewtabs.tpl
+++ b/htdocs/theme/raw/templates/view/editviewtabs.tpl
@@ -6,13 +6,13 @@
             <span class="btn-title">{if ($edittitle || $canuseskins) }{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}</span>
         </a>
     <a class="btn btn-secondary editviews editcontent {if $selected == 'content'}active{/if}" href="{$WWWROOT}view/blocks.php?id={$viewid}" title="{str tag=editcontent1 section=view}">
-        <span class="icon icon-lg icon-pencil" aria-hidden="true" role="presentation"></span>
+        <span class="icon icon-lg icon-pencil-alt" aria-hidden="true" role="presentation"></span>
         <span class="btn-title">{str tag=editcontent1 section=view}</span>
     </a>
 
     {if !$accesssuspended && ($edittitle || $viewtype == 'share')}
         <a class="btn btn-secondary editviews editshare {if $selected == 'share'}active{/if}" href="{$WWWROOT}view/accessurl.php?id={$viewid}{if $collectionid}&collection={$collectionid}{/if}"  title="{str tag=shareview1 section=view}">
-            <span class="icon icon-lg icon-unlock-alt" aria-hidden="true" role="presentation"></span>
+            <span class="icon icon-lg icon-unlock" aria-hidden="true" role="presentation"></span>
            <span class="btn-title">{str tag=shareview1 section=view}</span>
         </a>
     {/if}
diff --git a/htdocs/theme/raw/templates/view/index.tpl b/htdocs/theme/raw/templates/view/index.tpl
index f5c10350deff2c9cf8b91ebf45d88c6b82602d58..7d612aa84a77ecfa1ed8daac4097e20b28738172 100644
--- a/htdocs/theme/raw/templates/view/index.tpl
+++ b/htdocs/theme/raw/templates/view/index.tpl
@@ -6,7 +6,7 @@
             {str section=mahara tag=add}
         </a>
         <a id="copyview-button" class="btn btn-secondary" href="{$WWWROOT}view/choosetemplate.php?searchcollection=1{$urlparamsstr}">
-            <span class="icon icon-files-o icon-lg left" role="presentation" aria-hidden="true"></span>
+            <span class="icon icon-regular icon-copy icon-lg left" role="presentation" aria-hidden="true"></span>
             {str section=mahara tag=copy}
         </a>
     </div>
@@ -47,7 +47,7 @@
                     <p>{str tag=confirmadddesc section=view}</p>
                     <div class="btn-group">
                         <button id="add-collection-button" type="button" class="btn btn-secondary"><span class="icon icon-folder-open"></span> {str tag=Collection section=collection}</button>
-                        <button id="add-view-button" type="button" class="btn btn-secondary"><span class="icon icon-file-text"></span> {str tag=view}</button>
+                        <button id="add-view-button" type="button" class="btn btn-secondary"><span class="icon icon-file-alt"></span> {str tag=view}</button>
                     </div>
                 </div>
             </div>
diff --git a/htdocs/theme/raw/templates/view/indexresults.tpl b/htdocs/theme/raw/templates/view/indexresults.tpl
index 10238e549173a406fbb0ce3c490ce26d2604b243..a8333d7555f4addbc690ac7013adab8f4ad081a0 100644
--- a/htdocs/theme/raw/templates/view/indexresults.tpl
+++ b/htdocs/theme/raw/templates/view/indexresults.tpl
@@ -43,7 +43,7 @@
                                 {if $view.accesslist || $view.manageaccess}
                                     <a href="#" class="dropdown-toggle btn btn-link" data-toggle="dropdown" aria-expanded="false" title="{str tag='manageaccess' section='view'}">
                                         <span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
-                                        <span class="icon {if !$view.accesslist}icon-lock{else}icon-unlock-alt{/if} close-indicator" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon {if !$view.accesslist}icon-lock{else}icon-unlock{/if} close-indicator" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str tag="accessrulesfor" section="view" arg1="$view.vtitle"}</span>
                                     </a>
                                     <ul class="dropdown-menu" role="menu">
@@ -54,7 +54,7 @@
                                         <li class="dropdown-item">
                                             {if $manageitem->accesstype == 'managesharing'}
                                             <a class="seperator" href="{$WWWROOT}view/accessurl.php?id={$view.id}{if $view.collid}&collection={$view.collid}{/if}">
-                                                <span class="icon {if $view.locked}icon-lock{else}icon-unlock-alt{/if} left" role="presentation" aria-hidden="true"></span>
+                                                <span class="icon {if $view.locked}icon-lock{else}icon-unlock{/if} left" role="presentation" aria-hidden="true"></span>
                                                 <span class="link-text">{$manageitem->displayname}</span>
                                                 <span class="sr-only">{$manageitem->accessibilityname}</span>
                                             </a>
@@ -117,7 +117,7 @@
                                     {else}
                                         <a href="{$WWWROOT}view/blocks.php?id={$view.id}&{$querystring}" title="{str tag ="editcontentandlayout" section="view"}">
                                     {/if}
-                                            <span class="icon icon-pencil left" role="presentation" aria-hidden="true"></span>
+                                            <span class="icon icon-pencil-alt left" role="presentation" aria-hidden="true"></span>
                                             <span class="link-text">{str tag="edit" section="mahara"}</span>
                                             <span class="sr-only">{str(tag=editspecific arg1=$view.displaytitle)|escape:html|safe}</span>
                                         </a>
@@ -130,7 +130,7 @@
                                     {else}
                                         <a href="{$WWWROOT}view/delete.php?id={$view.id}&{$querystring}" title="{str tag=deletethisview section=view}">
                                     {/if}
-                                             <span class="icon icon-trash text-danger left" role="presentation" aria-hidden="true"></span>
+                                             <span class="icon icon-trash-alt text-danger left" role="presentation" aria-hidden="true"></span>
                                              <span class="link-text">{str tag="delete" section="mahara"}</span>
                                              <span class="sr-only">{str(tag=deletespecific arg1=$view.displaytitle)|escape:html|safe}</span>
                                         </a>
diff --git a/htdocs/theme/raw/templates/view/urls.tpl b/htdocs/theme/raw/templates/view/urls.tpl
index 098a1a13636cb043d2e6142004c27d93c1bc02c2..a1faec75355d0240b12fd0ab44d2dd5999773be1 100644
--- a/htdocs/theme/raw/templates/view/urls.tpl
+++ b/htdocs/theme/raw/templates/view/urls.tpl
@@ -31,11 +31,11 @@
                             <div class="btn-action-list">
                                 <div class="btn-top-right btn-group btn-group-top">
                                     <a id="copytoclipboard-{$item.id}" data-clipboard-text="{$item.url}" class="url-copytoclipboardbutton btn btn-secondary btn-sm" title="{str tag=copytoclipboard}" href="#">
-                                        <span class="icon icon-files-o icon-lg" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-regular icon-copy icon-lg" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str tag=copytoclipboard}</span>
                                     </a>
                                     <a id="edit-{$item.id}" class="url-open-editform nojs-hidden-inline btn btn-secondary closed" title="{str tag=edit}" href="">
-                                        <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
+                                        <span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span>
                                         <span class="icon icon-chevron-down right" role="presentation" aria-hidden="true"></span>
                                         <span class="sr-only">{str tag=edit}</span>
                                     </a>
diff --git a/htdocs/theme/raw/templates/view/view.tpl b/htdocs/theme/raw/templates/view/view.tpl
index a8ec4d8c3b200dcde10358b73b4733f387625183..6ee94814995f0a3a2717443e7c90f5e7893aa00e 100644
--- a/htdocs/theme/raw/templates/view/view.tpl
+++ b/htdocs/theme/raw/templates/view/view.tpl
@@ -148,7 +148,7 @@
                         <p>{str tag=confirmcopydesc section=view}</p>
                         <div class="btn-group">
                             <button id="copy-collection-button" type="button" class="btn btn-secondary"><span class="icon icon-folder-open" role="presentation" aria-hidden="true"></span> {str tag=Collection section=collection}</button>
-                            <button id="copy-view-button" type="button" class="btn btn-secondary"><span class="icon icon-file-text " role="presentation" aria-hidden="true"></span> {str tag=view}</button>
+                            <button id="copy-view-button" type="button" class="btn btn-secondary"><span class="icon icon-regular icon-file-alt" role="presentation" aria-hidden="true"></span> {str tag=view}</button>
                         </div>
                     </div>
                 </div>
diff --git a/htdocs/view/accessurl.php b/htdocs/view/accessurl.php
index 533a5b3300275b34fa24c5b00a2db58d5748136e..dae904efe7641752d68398af43e22222b5d705c8 100644
--- a/htdocs/view/accessurl.php
+++ b/htdocs/view/accessurl.php
@@ -624,7 +624,7 @@ for ($i = 0; $i < count($records); $i++) {
                     'class'        => 'btn-secondary btn-sm',
                     'elementtitle' => get_string('delete'),
                     'confirm'      => get_string('reallydeletesecreturl', 'view'),
-                    'value'        => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
+                    'value'        => '<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
                 ),
             ),
         )),
diff --git a/htdocs/view/groupviews.php b/htdocs/view/groupviews.php
index 09e6d73db38d92af7b02882b719d713c16ca35d2..41006f27e6c72573979f220634e594f148ca1e92 100644
--- a/htdocs/view/groupviews.php
+++ b/htdocs/view/groupviews.php
@@ -124,7 +124,7 @@ if (!empty($group->id)) {
 }
 
 $smarty = smarty(array('paginator'));
-setpageicon($smarty, 'icon-file-text-o');
+setpageicon($smarty, 'icon-regular icon-file-alt');
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign('views', $data->data);
 $smarty->assign('headingclass', 'page-header');
diff --git a/htdocs/view/index.php b/htdocs/view/index.php
index c726fa84f1538e22f9a0c970245e77539f785243..5959ee4c0959bd5b91ec9f95747509ab2ac6a4c6 100644
--- a/htdocs/view/index.php
+++ b/htdocs/view/index.php
@@ -51,7 +51,7 @@ $groupid = param_integer('group', 0);
 $institutionname = param_alphanum('institution', false);
 
 $smarty = smarty(array('paginator', 'js/jquery/jquery-ui/js/jquery-ui.min.js'));
-setpageicon($smarty, 'icon-file-text-o');
+setpageicon($smarty, 'icon-regular icon-file-alt');
 $smarty->assign('INLINEJAVASCRIPT', $js);
 $smarty->assign('views', $data->data);
 $smarty->assign('sitetemplate', View::SITE_TEMPLATE);
diff --git a/htdocs/view/urls.php b/htdocs/view/urls.php
index f0653ff982843e90fa53f286b02c54e0f5e48749..fa144a4570b58ef5002e69175b5872fa26b85996 100644
--- a/htdocs/view/urls.php
+++ b/htdocs/view/urls.php
@@ -140,7 +140,7 @@ for ($i = 0; $i < count($records); $i++) {
                     'class'        => 'btn-secondary btn-sm',
                     'elementtitle' => get_string('delete'),
                     'confirm'      => get_string('reallydeletesecreturl', 'view'),
-                    'value'        => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
+                    'value'        => '<span class="icon icon-trash-alt text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
                 ),
             ),
         )),
diff --git a/htdocs/webservice/admin/index.php b/htdocs/webservice/admin/index.php
index 162c55ae2cf5e06b87d416b107584ce90b95e7e9..10ce2260133e4f2c0c748cb37f7e0344b8bfd776 100644
--- a/htdocs/webservice/admin/index.php
+++ b/htdocs/webservice/admin/index.php
@@ -492,8 +492,8 @@ function webservice_provider_protocols_submit(Pieform $form, $values) {
 function webservice_function_groups_form() {
     global $THEME;
 
-    $editicon = 'icon icon-pencil left';
-    $deleteicon = 'icon icon-trash left text-danger';
+    $editicon = 'icon icon-pencil-alt left';
+    $deleteicon = 'icon icon-trash-alt left text-danger';
 
     $form = array(
         'name'            => 'webservices_function_groups',
@@ -729,8 +729,8 @@ function webservice_function_groups_submit(Pieform $form, $values) {
 function webservice_tokens_form() {
     global $THEME, $USER;
 
-    $editicon = 'icon icon-pencil left';
-    $deleteicon = 'icon icon-trash left text-danger';
+    $editicon = 'icon icon-pencil-alt left';
+    $deleteicon = 'icon icon-trash-alt left text-danger';
 
     $form = array(
         'name'            => 'webservices_tokens',
@@ -1002,8 +1002,8 @@ function webservice_token_submit(Pieform $form, $values) {
 function webservice_users_form() {
     global $THEME, $USER;
 
-    $editicon = 'icon icon-pencil left';
-    $deleteicon = 'icon icon-trash left text-danger';
+    $editicon = 'icon icon-pencil-alt left';
+    $deleteicon = 'icon icon-trash-alt left text-danger';
 
     $form = array(
         'name'            => 'webservices_users',
diff --git a/htdocs/webservice/admin/oauthv1sregister.php b/htdocs/webservice/admin/oauthv1sregister.php
index 00453e46a02211facd48ae183547af510997e44a..96a70a3df736e9a6009c474f08aae628423e5dd0 100644
--- a/htdocs/webservice/admin/oauthv1sregister.php
+++ b/htdocs/webservice/admin/oauthv1sregister.php
@@ -449,7 +449,7 @@ function webservice_server_list_form($sopts, $iopts) {
                                 'type' => 'button',
                                 'usebuttontag' => true,
                                 'class' => 'btn-secondary btn-sm',
-                                'value' => '<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('editspecific', 'mahara', $consumer->application_title) . '</span>',
+                                'value' => '<span class="icon icon-pencil-alt icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('editspecific', 'mahara', $consumer->application_title) . '</span>',
                                 'elementtitle' => get_string('editspecific', 'mahara', $consumer->application_title),
                             ),
                         ),
@@ -469,7 +469,7 @@ function webservice_server_list_form($sopts, $iopts) {
                                 'type' => 'button',
                                 'usebuttontag' => true,
                                 'class' => 'btn-secondary btn-sm',
-                                'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('deletespecific', 'mahara', $consumer->application_title).'</span>',
+                                'value' => '<span class="icon icon-trash-alt icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('deletespecific', 'mahara', $consumer->application_title).'</span>',
                                 'elementtitle' => get_string('deletespecific', 'mahara', $consumer->application_title),
                             ),
                         ),
diff --git a/htdocs/webservice/apptokens.php b/htdocs/webservice/apptokens.php
index 8152c5a1b4b66519a357c3fa055379c0a61101e8..321ab368d31cdc990fd2a90480f3bbb346742ca2 100644
--- a/htdocs/webservice/apptokens.php
+++ b/htdocs/webservice/apptokens.php
@@ -229,7 +229,7 @@ if (!empty($dbservices)) {
                                                 'type'  => 'button',
                                                 'usebuttontag' => true,
                                                 'class' => 'btn-secondary btn-sm',
-                                                'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
+                                                'value' => '<span class="icon icon-trash-alt icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
                                                 'elementtitle' => get_string('deletespecific', 'mahara', $service->id),
                                             ),
                                     ),