diff --git a/administrator/components/com_actionlogs/Field/PlugininfoField.php b/administrator/components/com_actionlogs/Field/PlugininfoField.php
index 6f5ad1670bd31..09e1033921d84 100644
--- a/administrator/components/com_actionlogs/Field/PlugininfoField.php
+++ b/administrator/components/com_actionlogs/Field/PlugininfoField.php
@@ -59,7 +59,7 @@ protected function getInput()
 		);
 
 		return '<div class="alert alert-info">'
-			. '<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only">'
+			. '<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only">'
 			. Text::_('INFO')
 			. '</span>'
 			. Text::sprintf('PLG_SYSTEM_ACTIONLOGS_JOOMLA_ACTIONLOG_DISABLED_REDIRECT', $link)
diff --git a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
index 4cb948d35c169..cc0c52ecb4fd7 100644
--- a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
+++ b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
@@ -30,7 +30,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-13.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-13.sql
index 6096aeff05a8d..1ae0c1db62f33 100644
--- a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-13.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-13.sql
@@ -63,18 +63,18 @@ INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `c
 INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
 
 INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
-('Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fa fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
+('Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fas fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
 INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
 
 INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
-('System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fa fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
+('System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fas fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
 INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
 
 INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
-('3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fa fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
+('3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fas fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
 INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES (LAST_INSERT_ID(), 0);
 
-UPDATE `#__modules` SET `title` = 'Update Checks',`ordering` = 3,`position` = 'icon',`showtitle` = 1,`params` = '{"context":"update_quickicon","header_icon":"fa fa-sync","show_global":"0","show_checkin":"0","show_cache":"0","show_users":"0","show_articles":"0","show_categories":"0","show_media":"0","show_menuItems":"0","show_modules":"0","show_plugins":"0","show_templates":"0","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}' WHERE `#__modules`.`id` = 9;
+UPDATE `#__modules` SET `title` = 'Update Checks',`ordering` = 3,`position` = 'icon',`showtitle` = 1,`params` = '{"context":"update_quickicon","header_icon":"fas fa-sync","show_global":"0","show_checkin":"0","show_cache":"0","show_users":"0","show_articles":"0","show_categories":"0","show_media":"0","show_menuItems":"0","show_modules":"0","show_plugins":"0","show_templates":"0","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}' WHERE `#__modules`.`id` = 9;
 
 INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
 ('Help Dashboard', '', '', 1, 'cpanel-help', 0, NULL, NULL, NULL, 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"help","layout":"_:default","moduleclass_sfx":"","style":"System-none","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-13.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-13.sql
index 29f3f92c8f7cc..5990569492b92 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-13.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-13.sql
@@ -62,18 +62,18 @@ INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "c
 INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (currval(pg_get_serial_sequence('#__modules','id')), 0);
 
 INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
-('Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fa fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
+('Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fas fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
 INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (currval(pg_get_serial_sequence('#__modules','id')), 0);
 
 INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
-('System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fa fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
+('System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fas fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
 INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (currval(pg_get_serial_sequence('#__modules','id')), 0);
 
 INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
-('3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fa fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
+('3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fas fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*');
 INSERT INTO "#__modules_menu" ("moduleid", "menuid") VALUES (currval(pg_get_serial_sequence('#__modules','id')), 0);
 
-UPDATE "#__modules" SET "title" = 'Update Checks',"ordering" = 3,"position" = 'icon',"showtitle" = 1,"params" = '{"context":"update_quickicon","header_icon":"fa fa-sync","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}' WHERE "#__modules"."id" = 9;
+UPDATE "#__modules" SET "title" = 'Update Checks',"ordering" = 3,"position" = 'icon',"showtitle" = 1,"params" = '{"context":"update_quickicon","header_icon":"fas fa-sync","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}' WHERE "#__modules"."id" = 9;
 
 INSERT INTO "#__modules" ("title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
 ('Help Dashboard', '', '', 1, 'cpanel-help', 0, NULL, NULL, NULL, 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"help","layout":"_:default","moduleclass_sfx":"","style":"System-none","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*');
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index 87a20b14e2809..4dcb9ccf6b1e1 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.php
@@ -39,12 +39,12 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if ($this->state->get('itemtype') == '' || $this->state->get('language') == '') : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'); ?>
 					</div>
 				<?php elseif (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index f2c889d11d4a2..b4539b253a741 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -47,7 +47,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
@@ -160,4 +160,4 @@
 		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>">
 		<?php echo HTMLHelper::_('form.token'); ?>
 	</form>
-</div
\ No newline at end of file
+</div
diff --git a/administrator/components/com_banners/View/Banners/HtmlView.php b/administrator/components/com_banners/View/Banners/HtmlView.php
index 9fd2c8ebe072d..4697d74c9a2b6 100644
--- a/administrator/components/com_banners/View/Banners/HtmlView.php
+++ b/administrator/components/com_banners/View/Banners/HtmlView.php
@@ -146,7 +146,7 @@ protected function addToolbar(): void
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_banners/View/Clients/HtmlView.php b/administrator/components/com_banners/View/Clients/HtmlView.php
index f5b70fa1135e3..bc98821cadf49 100644
--- a/administrator/components/com_banners/View/Clients/HtmlView.php
+++ b/administrator/components/com_banners/View/Clients/HtmlView.php
@@ -127,7 +127,7 @@ protected function addToolbar(): void
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
index ef26d8458cbef..569105a28bb7a 100644
--- a/administrator/components/com_banners/tmpl/banners/default.php
+++ b/administrator/components/com_banners/tmpl/banners/default.php
@@ -43,7 +43,7 @@
 				?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -114,7 +114,7 @@
 										}
 										?>
 										<span class="sortable-handler <?php echo $iconClass ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" name="order[]" size="5"
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
index c0b243dad34d6..056a81c4fb8a6 100644
--- a/administrator/components/com_banners/tmpl/clients/default.php
+++ b/administrator/components/com_banners/tmpl/clients/default.php
@@ -44,7 +44,7 @@
 				?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_banners/tmpl/tracks/default.php b/administrator/components/com_banners/tmpl/tracks/default.php
index d7ba1ae24a358..c5061ba3298b9 100644
--- a/administrator/components/com_banners/tmpl/tracks/default.php
+++ b/administrator/components/com_banners/tmpl/tracks/default.php
@@ -26,7 +26,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php
index 38edc4a47af13..1c4bbbace8096 100644
--- a/administrator/components/com_cache/tmpl/cache/default.php
+++ b/administrator/components/com_cache/tmpl/cache/default.php
@@ -26,14 +26,14 @@
 		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<div class="alert alert-info">
-					<span class="fa fa-info-circle" aria-hidden="true"></span>
+					<span class="fas fa-info-circle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 					<?php echo Text::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?>
 				</div>
 				<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
 				<?php if (!$this->data) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_categories/View/Categories/HtmlView.php b/administrator/components/com_categories/View/Categories/HtmlView.php
index c7e6be9fb3849..7f1d5d1a9ff93 100644
--- a/administrator/components/com_categories/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/View/Categories/HtmlView.php
@@ -190,7 +190,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
index d4242d99501d2..660e752feb455 100644
--- a/administrator/components/com_categories/tmpl/categories/default.php
+++ b/administrator/components/com_categories/tmpl/categories/default.php
@@ -59,7 +59,7 @@
 				?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -174,7 +174,7 @@
 										}
 										?>
 										<span class="sortable-handler<?php echo $iconClass ?>">
-											<span class="fa fa-ellipsis-v"></span>
+											<span class="fas fa-ellipsis-v"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" class="hidden" name="order[]" size="5" value="<?php echo $item->lft; ?>">
diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php
index fabdf80f6caa6..ffafd1fc3f63c 100644
--- a/administrator/components/com_categories/tmpl/categories/modal.php
+++ b/administrator/components/com_categories/tmpl/categories/modal.php
@@ -40,7 +40,7 @@
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php
index 5c0fffbb8f913..5971caee9e4e7 100644
--- a/administrator/components/com_config/tmpl/component/default.php
+++ b/administrator/components/com_config/tmpl/component/default.php
@@ -105,7 +105,7 @@
 
 					<?php if (!empty($fieldSet->description)) : ?>
 						<div class="tab-description alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_($fieldSet->description); ?>
 						</div>
 					<?php endif; ?>
@@ -133,7 +133,7 @@
 
 			<?php else : ?>
 				<div class="alert alert-info">
-					<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+					<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 					<?php echo Text::_('COM_CONFIG_COMPONENT_NO_CONFIG_FIELDS_MESSAGE'); ?>
 				</div>
 			<?php endif; ?>
diff --git a/administrator/components/com_contact/View/Contacts/HtmlView.php b/administrator/components/com_contact/View/Contacts/HtmlView.php
index 0cab49d86b186..8eddb63960f58 100644
--- a/administrator/components/com_contact/View/Contacts/HtmlView.php
+++ b/administrator/components/com_contact/View/Contacts/HtmlView.php
@@ -151,7 +151,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
index 6595bf9dd5397..4e6cba3106d1c 100644
--- a/administrator/components/com_contact/tmpl/contacts/default.php
+++ b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -40,7 +40,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -115,7 +115,7 @@
 									}
 									?>
 									<span class="sortable-handler<?php echo $iconClass; ?>">
-										<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+										<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 									</span>
 									<?php if ($canChange && $saveOrder) : ?>
 										<input type="text" name="order[]" size="5"
diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
index fdbaf786625c9..fa82ce0857b4e 100644
--- a/administrator/components/com_contact/tmpl/contacts/modal.php
+++ b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -49,7 +49,7 @@
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_content/View/Articles/HtmlView.php b/administrator/components/com_content/View/Articles/HtmlView.php
index e559d2da3f80e..c59423c68b514 100644
--- a/administrator/components/com_content/View/Articles/HtmlView.php
+++ b/administrator/components/com_content/View/Articles/HtmlView.php
@@ -192,7 +192,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_content/View/Featured/HtmlView.php b/administrator/components/com_content/View/Featured/HtmlView.php
index 3f335dca4de65..28dbad3419934 100644
--- a/administrator/components/com_content/View/Featured/HtmlView.php
+++ b/administrator/components/com_content/View/Featured/HtmlView.php
@@ -171,7 +171,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index 7d6cb5435dcad..5b78e07e98c8e 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -93,7 +93,7 @@
 				?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -216,7 +216,7 @@
 									}
 									?>
 									<span class="sortable-handler<?php echo $iconClass ?>">
-										<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+										<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 									</span>
 									<?php if ($canChange && $saveOrder) : ?>
 										<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index 60d6589373883..5f21410feabae 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -50,7 +50,7 @@
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
index ff3f0e0857b01..eea9eec4b4bcf 100644
--- a/administrator/components/com_content/tmpl/featured/default.php
+++ b/administrator/components/com_content/tmpl/featured/default.php
@@ -80,7 +80,7 @@
 				?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -200,7 +200,7 @@
 									}
 									?>
 									<span class="sortable-handler<?php echo $iconClass ?>">
-										<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+										<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 									</span>
 									<?php if ($canChange && $saveOrder) : ?>
 										<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php
index 66b02e4531fad..cd7bceb4fc4c0 100644
--- a/administrator/components/com_cpanel/View/Cpanel/HtmlView.php
+++ b/administrator/components/com_cpanel/View/Cpanel/HtmlView.php
@@ -59,7 +59,7 @@ public function display($tpl = null)
 		$extension = ApplicationHelper::stringURLSafe($app->input->getCmd('dashboard'));
 
 		$title = Text::_('COM_CPANEL_DASHBOARD_BASE_TITLE');
-		$icon  = 'fa fa-home';
+		$icon  = 'fas fa-home';
 
 		$position = ApplicationHelper::stringURLSafe($extension);
 
@@ -100,23 +100,23 @@ public function display($tpl = null)
 				// Default core icons.
 				if ($parts[0] === 'content')
 				{
-					$icon = 'fa fa-file-alt';
+					$icon = 'fas fa-file-alt';
 				}
 				elseif ($parts[0] === 'components')
 				{
-					$icon = 'fa fa-puzzle-piece';
+					$icon = 'fas fa-puzzle-piece';
 				}
 				elseif ($parts[0] === 'menus')
 				{
-					$icon = 'fa fa-list';
+					$icon = 'fas fa-list';
 				}
 				elseif ($parts[0] === 'system')
 				{
-					$icon = 'fa fa-wrench';
+					$icon = 'fas fa-wrench';
 				}
 				elseif ($parts[0] === 'users')
 				{
-					$icon = 'fa fa-users';
+					$icon = 'fas fa-users';
 				}
 				elseif ($parts[0] === 'privacy')
 				{
@@ -124,7 +124,7 @@ public function display($tpl = null)
 				}
 				elseif ($parts[0] === 'help')
 				{
-					$icon = 'fa fa-info-circle';
+					$icon = 'fas fa-info-circle';
 				}
 				elseif ($lang->hasKey($keyIcon))
 				{
diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php
index c5157db2010a3..5928ef9ea81b9 100644
--- a/administrator/components/com_cpanel/tmpl/cpanel/default.php
+++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php
@@ -79,7 +79,7 @@
 	<div class="col-md-6">
 		<button type="button" data-toggle="modal" data-target="#moduleDashboardAddModal" class="cpanel-add-module text-center py-5 w-100 d-block">
 			<div class="cpanel-add-module-icon text-center">
-				<span class="fa fa-plus-square text-light mt-2"></span>
+				<span class="fas fa-plus-square text-light mt-2"></span>
 			</div>
 			<span><?php echo Text::_('COM_CPANEL_ADD_DASHBOARD_MODULE'); ?></span>
 		</button>
diff --git a/administrator/components/com_csp/tmpl/reports/default.php b/administrator/components/com_csp/tmpl/reports/default.php
index 118b94b235a6c..d244d25602c49 100644
--- a/administrator/components/com_csp/tmpl/reports/default.php
+++ b/administrator/components/com_csp/tmpl/reports/default.php
@@ -59,7 +59,7 @@
 				<?php endif; ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_fields/View/Fields/HtmlView.php b/administrator/components/com_fields/View/Fields/HtmlView.php
index 3f4fddef3901b..bfb8f66ce9af4 100644
--- a/administrator/components/com_fields/View/Fields/HtmlView.php
+++ b/administrator/components/com_fields/View/Fields/HtmlView.php
@@ -156,7 +156,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_fields/View/Groups/HtmlView.php b/administrator/components/com_fields/View/Groups/HtmlView.php
index 51fcca0fa0969..af847319a8e3c 100644
--- a/administrator/components/com_fields/View/Groups/HtmlView.php
+++ b/administrator/components/com_fields/View/Groups/HtmlView.php
@@ -158,7 +158,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index 46c7ab6b1222c..3788c28e70262 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -54,7 +54,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'context'))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -114,7 +114,7 @@
 											<?php $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); ?>
 										<?php endif; ?>
 										<span class="sortable-handler<?php echo $iconClass; ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" class="hidden" name="order[]" size="5" value="<?php echo $item->ordering; ?>">
diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
index c7a1b06364ac9..9aa924deb2f54 100644
--- a/administrator/components/com_fields/tmpl/fields/modal.php
+++ b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -34,7 +34,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index 76e4c5a7cfc4f..2eea60e73cb03 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -52,7 +52,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'context'))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -106,7 +106,7 @@
 											<?php $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED'); ?>
 										<?php endif; ?>
 										<span class="sortable-handler<?php echo $iconClass; ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" class="hidden" name="order[]" size="5" value="<?php echo $item->ordering; ?>">
diff --git a/administrator/components/com_finder/Service/HTML/Filter.php b/administrator/components/com_finder/Service/HTML/Filter.php
index 34f96ec15b16c..c7b043939d1a2 100644
--- a/administrator/components/com_finder/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/Service/HTML/Filter.php
@@ -183,7 +183,7 @@ public function slider($options = array())
 			// Populate the toggle button.
 			// @todo Remove jQuery
 			$html .= '<button class="btn btn-secondary" type="button" onclick="jQuery(\'[id=&quot;tax-'
-				. $bk . '&quot;]\').each(function(){this.click();});"><span class="fa fa-square" aria-hidden="true"></span> '
+				. $bk . '&quot;]\').each(function(){this.click();});"><span class="fas fa-square" aria-hidden="true"></span> '
 				. Text::_('JGLOBAL_SELECTION_INVERT') . '</button><hr>';
 
 			// Populate the group with nodes.
diff --git a/administrator/components/com_finder/View/Filters/HtmlView.php b/administrator/components/com_finder/View/Filters/HtmlView.php
index 86c63f09f98db..7f0db06f8e3bb 100644
--- a/administrator/components/com_finder/View/Filters/HtmlView.php
+++ b/administrator/components/com_finder/View/Filters/HtmlView.php
@@ -133,7 +133,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_finder/View/Index/HtmlView.php b/administrator/components/com_finder/View/Index/HtmlView.php
index 56acf2b0a8b09..55cf21b78f014 100644
--- a/administrator/components/com_finder/View/Index/HtmlView.php
+++ b/administrator/components/com_finder/View/Index/HtmlView.php
@@ -175,7 +175,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_finder/View/Maps/HtmlView.php b/administrator/components/com_finder/View/Maps/HtmlView.php
index 861072c4eb6d6..4c065b894c47f 100644
--- a/administrator/components/com_finder/View/Maps/HtmlView.php
+++ b/administrator/components/com_finder/View/Maps/HtmlView.php
@@ -133,7 +133,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php
index f2d5c55e1961a..0e250393ec10e 100644
--- a/administrator/components/com_finder/tmpl/filter/edit.php
+++ b/administrator/components/com_finder/tmpl/filter/edit.php
@@ -45,7 +45,7 @@
 							<?php echo $this->form->renderField('map_count'); ?>
 						</div>
 						<button class="btn btn-secondary filter-toggle-all" type="button">
-							<span class="fa fa-square" aria-hidden="true"></span> <?php echo Text::_('JGLOBAL_SELECTION_INVERT'); ?></button>
+							<span class="fas fa-square" aria-hidden="true"></span> <?php echo Text::_('JGLOBAL_SELECTION_INVERT'); ?></button>
 
 						<button class="btn btn-secondary float-right" type="button" id="expandAccordion"><?php echo Text::_('COM_FINDER_FILTER_SHOW_ALL'); ?></button>
 						<hr>
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index 0223da8250c28..528e52488c002 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -30,7 +30,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index 5ef2f7c5c80cf..329df3b99aa9a 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -32,7 +32,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php
index 65cce9dec5126..462a5c2776a17 100644
--- a/administrator/components/com_finder/tmpl/maps/default.php
+++ b/administrator/components/com_finder/tmpl/maps/default.php
@@ -31,7 +31,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('COM_FINDER_MAPS_NO_CONTENT'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php
index 9373c38c3ed05..5593d811b00bc 100644
--- a/administrator/components/com_finder/tmpl/searches/default.php
+++ b/administrator/components/com_finder/tmpl/searches/default.php
@@ -27,7 +27,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_installer/View/Updatesites/HtmlView.php b/administrator/components/com_installer/View/Updatesites/HtmlView.php
index bac334d767209..de106e78d6201 100644
--- a/administrator/components/com_installer/View/Updatesites/HtmlView.php
+++ b/administrator/components/com_installer/View/Updatesites/HtmlView.php
@@ -113,7 +113,7 @@ protected function addToolbar(): void
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php
index 4deda5c36aca3..b36d461b0ec67 100644
--- a/administrator/components/com_installer/tmpl/database/default.php
+++ b/administrator/components/com_installer/tmpl/database/default.php
@@ -29,7 +29,7 @@
 						<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 						<?php if (empty($this->changeSet)) : ?>
 							<div class="alert alert-info">
-								<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+								<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 								<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 							</div>
 						<?php else : ?>
diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php
index b188b72e4abf2..4830bf61d6b60 100644
--- a/administrator/components/com_installer/tmpl/discover/default.php
+++ b/administrator/components/com_installer/tmpl/discover/default.php
@@ -33,11 +33,11 @@
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 					<?php if (empty($this->items)) : ?>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
 						</div>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 						</div>
 					<?php else : ?>
diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php
index 2d84fe87e670c..2e59d2c4b337e 100644
--- a/administrator/components/com_installer/tmpl/languages/default.php
+++ b/administrator/components/com_installer/tmpl/languages/default.php
@@ -28,7 +28,7 @@
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 					<?php if (empty($this->items)) : ?>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 						</div>
 					<?php else : ?>
@@ -79,7 +79,7 @@
 										<?php // Display a Note if language pack version is not equal to Joomla version ?>
 										<?php if (strpos($language->version, $minorVersion) !== 0 || strpos($language->version, $currentShortVersion) !== 0) : ?>
 											<span class="badge badge-warning"><?php echo $language->version; ?></span>
-											<span class="fa fa-info-circle" aria-hidden="true" tabindex="0"></span>
+											<span class="fas fa-info-circle" aria-hidden="true" tabindex="0"></span>
 											<div role="tooltip" class="text-left" id="tip<?php echo $language->code; ?>">
 											<?php echo Text::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>
 											</div>
diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php
index e1580b3f0aa8c..4190c9dc00c1d 100644
--- a/administrator/components/com_installer/tmpl/manage/default.php
+++ b/administrator/components/com_installer/tmpl/manage/default.php
@@ -34,7 +34,7 @@
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 					<?php if (empty($this->items)) : ?>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 						</div>
 					<?php else : ?>
diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php
index 8f5a466c0449e..7d3f2ef46221a 100644
--- a/administrator/components/com_installer/tmpl/update/default.php
+++ b/administrator/components/com_installer/tmpl/update/default.php
@@ -34,7 +34,7 @@
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 					<?php if (empty($this->items)) : ?>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?>
 						</div>
 					<?php else : ?>
@@ -82,7 +82,7 @@
 								<tr class="row<?php echo $i % 2; ?>">
 									<td class="text-center">
 										<?php if($item->isMissingDownloadKey): ?>
-										<span class="fa fa-ban"></span>
+										<span class="fas fa-ban"></span>
 										<?php else: ?>
 										<?php echo HTMLHelper::_('grid.id', $i, $item->update_id); ?>
 										<?php endif; ?>
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php
index 1eda4523984c0..136f87ef25b6e 100644
--- a/administrator/components/com_installer/tmpl/updatesites/default.php
+++ b/administrator/components/com_installer/tmpl/updatesites/default.php
@@ -32,7 +32,7 @@
 					<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 					<?php if (empty($this->items)) : ?>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 						</div>
 					<?php else : ?>
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
index 5f2734482d923..65d80c7609acf 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
@@ -21,7 +21,7 @@
 	</legend>
 	<div>
 		<div class="alert alert-success">
-			<span class="fa fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
+			<span class="fas fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
 			<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE', JVERSION); ?>
 		</div>
 	</div>
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
index b8fdf4dd66c15..6d356a676c739 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
@@ -19,13 +19,13 @@
 		<?php echo Text::_('COM_JOOMLAUPDATE_UPDATE_CHECK'); ?>
 	</legend>
 	<p class="alert alert-info">
-		<span class="fa fa-info-circle" aria-hidden="true"></span>
+		<span class="fas fa-info-circle" aria-hidden="true"></span>
 		<span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
 		<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES'); ?>
 	</p>
 	<p><?php echo Text::sprintf($this->langKey, $this->updateSourceKey); ?></p>
 	<p class="alert alert-success">
-		<span class="fa fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
+		<span class="fas fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
 		<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE', '&#x200E;' . JVERSION); ?>
 	</p>
 	<?php if (is_object($this->updateInfo['object']) && ($this->updateInfo['object'] instanceof Update)) : ?>
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
index ee8dbbee1a60f..1c4703a421959 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
@@ -22,7 +22,7 @@
 ?>
 
 <div class="alert alert-info">
-	<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+	<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 	<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO', 'https://downloads.joomla.org/latest'); ?>
 </div>
 
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php b/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
index cfde008d64cf1..643c61579f248 100644
--- a/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
+++ b/administrator/components/com_joomlaupdate/tmpl/update/finaliseconfirm.php
@@ -41,7 +41,7 @@
 					<input name="username" tabindex="1" id="mod-login-username" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_USERNAME'); ?>" size="15" autofocus="true">
 					<span class="input-group-append">
 						<span class="input-group-text">
-							<span class="fa fa-user" aria-hidden="true"></span>
+							<span class="fas fa-user" aria-hidden="true"></span>
 							<label for="mod-login-username" class="sr-only">
 								<?php echo Text::_('JGLOBAL_USERNAME'); ?>
 							</label>
@@ -56,7 +56,7 @@
 					<input name="passwd" tabindex="2" id="mod-login-password" type="password" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>" size="15">
 					<span class="input-group-append">
 						<span class="input-group-text">
-							<span class="fa fa-lock" aria-hidden="true"></span>
+							<span class="fas fa-lock" aria-hidden="true"></span>
 							<label for="mod-login-password" class="sr-only">
 								<?php echo Text::_('JGLOBAL_PASSWORD'); ?>
 							</label>
@@ -72,7 +72,7 @@
 						<input name="secretkey" autocomplete="off" tabindex="3" id="mod-login-secretkey" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" size="15">
 						<span class="input-group-append">
 							<span class="input-group-text" title="<?php echo Text::_('JGLOBAL_SECRETKEY_HELP'); ?>">
-								<span class="fa fa-star" aria-hidden="true"></span>
+								<span class="fas fa-star" aria-hidden="true"></span>
 								<label for="mod-login-secretkey" class="sr-only">
 									<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>
 								</label>
diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
index 85f65cbd3cb04..a95fd5a91fac5 100644
--- a/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
+++ b/administrator/components/com_joomlaupdate/tmpl/upload/captive.php
@@ -41,7 +41,7 @@
 					<input name="username" tabindex="1" id="mod-login-username" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_USERNAME'); ?>" size="15" autofocus="true">
 					<span class="input-group-append">
 						<span class="input-group-text">
-							<span class="fa fa-user" aria-hidden="true"></span>
+							<span class="fas fa-user" aria-hidden="true"></span>
 							<label for="mod-login-username" class="sr-only">
 								<?php echo Text::_('JGLOBAL_USERNAME'); ?>
 							</label>
@@ -56,7 +56,7 @@
 					<input name="passwd" tabindex="2" id="mod-login-password" type="password" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>" size="15">
 					<span class="input-group-append">
 						<span class="input-group-text">
-							<span class="fa fa-lock" aria-hidden="true"></span>
+							<span class="fas fa-lock" aria-hidden="true"></span>
 							<label for="mod-login-password" class="sr-only">
 								<?php echo Text::_('JGLOBAL_PASSWORD'); ?>
 							</label>
@@ -72,7 +72,7 @@
 						<input name="secretkey" autocomplete="off" tabindex="3" id="mod-login-secretkey" type="text" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>" size="15">
 						<span class="input-group-append">
 							<span class="input-group-text" title="<?php echo Text::_('JGLOBAL_SECRETKEY_HELP'); ?>">
-								<span class="fa fa-star" aria-hidden="true"></span>
+								<span class="fas fa-star" aria-hidden="true"></span>
 								<label for="mod-login-secretkey" class="sr-only">
 									<?php echo Text::_('JGLOBAL_SECRETKEY'); ?>
 								</label>
diff --git a/administrator/components/com_languages/View/Languages/HtmlView.php b/administrator/components/com_languages/View/Languages/HtmlView.php
index b5adc64decbf9..f743bc333edb8 100644
--- a/administrator/components/com_languages/View/Languages/HtmlView.php
+++ b/administrator/components/com_languages/View/Languages/HtmlView.php
@@ -115,7 +115,7 @@ protected function addToolbar(): void
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php
index 59850d462ba55..327fb68dc58b7 100644
--- a/administrator/components/com_languages/tmpl/installed/default.php
+++ b/administrator/components/com_languages/tmpl/installed/default.php
@@ -28,7 +28,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->rows)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php
index 811cdb5410045..76c2f05a0a17b 100644
--- a/administrator/components/com_languages/tmpl/languages/default.php
+++ b/administrator/components/com_languages/tmpl/languages/default.php
@@ -37,7 +37,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -103,7 +103,7 @@
 											$disableClassName = 'inactive';
 										endif; ?>
 										<span class="sortable-handler <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
 									<?php else : ?>
diff --git a/administrator/components/com_languages/tmpl/multilangstatus/default.php b/administrator/components/com_languages/tmpl/multilangstatus/default.php
index 103805ca38877..bad61d67badf6 100644
--- a/administrator/components/com_languages/tmpl/multilangstatus/default.php
+++ b/administrator/components/com_languages/tmpl/multilangstatus/default.php
@@ -23,13 +23,13 @@
 	<?php if (!$this->language_filter && $this->switchers == 0) : ?>
 		<?php if ($this->homes == 1) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_NONE'); ?>
 			</div>
 		<?php else : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_USELESS_HOMES'); ?>
 			</div>
@@ -37,7 +37,7 @@
 	<?php else : ?>
 		<?php if (!in_array($this->default_lang, $content_languages)) : ?>
 			<div class="alert alert-error">
-				<span class="fa fa-exclamation" aria-hidden="true"></span>
+				<span class="fas fa-exclamation" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
 				<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE', $this->default_lang); ?>
 			</div>
@@ -45,7 +45,7 @@
 			<?php foreach ($this->contentlangs as $contentlang) : ?>
 				<?php if ($contentlang->lang_code == $this->default_lang && $contentlang->published != 1) : ?>
 					<div class="alert alert-error">
-						<span class="fa fa-exclamation" aria-hidden="true"></span>
+						<span class="fas fa-exclamation" aria-hidden="true"></span>
 						<span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
 						<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_DEFAULT_CONTENT_LANGUAGE', $this->default_lang); ?>
 					</div>
@@ -54,7 +54,7 @@
 		<?php endif; ?>
 		<?php if ($this->defaultHome == true) : ?>
 			<div class="alert alert-warning">
-				<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+				<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED'); ?>
 			</div>
@@ -63,7 +63,7 @@
 			<?php // Displays error when Site language and Content language are published but Home page is unpublished, trashed or missing. ?>
 			<?php if ($status->lang_code && $status->published == 1 && $status->home_published != 1) : ?>
 				<div class="alert alert-warning">
-					<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+					<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_HOME_UNPUBLISHED', $status->lang_code, $status->lang_code); ?>
 				</div>
@@ -71,7 +71,7 @@
 			<?php // Displays error when both Content Language and Home page are unpublished. ?>
 			<?php if ($status->lang_code && $status->published == 0 && $status->home_published != 1) : ?>
 				<div class="alert alert-warning">
-					<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+					<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_HOME_UNPUBLISHED', $status->lang_code, $status->lang_code); ?>
 				</div>
@@ -79,14 +79,14 @@
 		<?php endforeach; ?>
 		<?php if ($notice_disabled) : ?>
 			<div class="alert alert-warning">
-				<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+				<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER_DISABLED'); ?>
 			</div>
 		<?php endif; ?>
 		<?php if ($notice_switchers) : ?>
 			<div class="alert alert-warning">
-				<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+				<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 				<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED'); ?>
 			</div>
@@ -94,21 +94,21 @@
 		<?php foreach ($this->contentlangs as $contentlang) : ?>
 			<?php if (array_key_exists($contentlang->lang_code, $this->homepages) && (!array_key_exists($contentlang->lang_code, $this->site_langs) || $contentlang->published != 1)) : ?>
 				<div class="alert alert-warning">
-					<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+					<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE', $contentlang->lang_code); ?>
 				</div>
 			<?php endif; ?>
 			<?php if (!array_key_exists($contentlang->lang_code, $this->site_langs)) : ?>
 				<div class="alert alert-warning">
-					<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+					<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG', $contentlang->lang_code); ?>
 				</div>
 			<?php endif; ?>
 			<?php if ($contentlang->published == -2) : ?>
 				<div class="alert alert-warning">
-					<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+					<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_TRASHED', $contentlang->lang_code); ?>
 				</div>
@@ -132,7 +132,7 @@
 		<?php foreach ($sitelangs as $sitelang) : ?>
 			<?php if (!in_array($sitelang, $content_languages) && in_array($sitelang, $home_pages)) : ?>
 				<div class="alert alert-warning">
-					<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+					<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 					<?php echo Text::sprintf('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_MISSING', $sitelang); ?>
 				</div>
@@ -221,7 +221,7 @@
 					<?php // Published Site languages ?>
 					<?php if ($status->element) : ?>
 							<td class="text-center">
-								<span class="fa fa-check" aria-hidden="true"></span>
+								<span class="fas fa-check" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 							</td>
 					<?php else : ?>
@@ -232,32 +232,32 @@
 					<?php // Published Content languages ?>
 						<td class="text-center">
 							<?php if ($status->lang_code && $status->published == 1) : ?>
-								<span class="fa fa-check" aria-hidden="true"></span>
+								<span class="fas fa-check" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 							<?php elseif ($status->lang_code && $status->published == 0) : ?>
-								<span class="fa fa-times" aria-hidden="true"></span>
+								<span class="fas fa-times" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							<?php elseif ($status->lang_code && $status->published == -2) : ?>
-								<span class="fa fa-trash" aria-hidden="true"></span>
+								<span class="fas fa-trash" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							<?php else : ?>
-								<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+								<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							<?php endif; ?>
 						</td>
 					<?php // Published Home pages ?>
 						<td class="text-center">
 							<?php if ($status->home_published == 1) : ?>
-								<span class="fa fa-check" aria-hidden="true"></span>
+								<span class="fas fa-check" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 							<?php elseif ($status->home_published == 0) : ?>
-								<span class="fa fa-times" aria-hidden="true"></span>
+								<span class="fas fa-times" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('JNO'); ?></span>
 							<?php elseif ($status->home_published == -2) : ?>
-								<span class="fa fa-trash" aria-hidden="true"></span>
+								<span class="fas fa-trash" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							<?php else : ?>
-								<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+								<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							<?php endif; ?>
 						</td>
@@ -270,27 +270,27 @@
 								<?php echo $contentlang->lang_code; ?>
 							</th>
 							<td class="text-center">
-								<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+								<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							</td>
 							<td class="text-center">
 								<?php if ($contentlang->published == 1) : ?>
-									<span class="fa fa-check" aria-hidden="true"></span>
+									<span class="fas fa-check" aria-hidden="true"></span>
 									<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 								<?php elseif ($contentlang->published == 0 && array_key_exists($contentlang->lang_code, $this->homepages)) : ?>
-									<span class="fa fa-times" aria-hidden="true"></span>
+									<span class="fas fa-times" aria-hidden="true"></span>
 									<span class="sr-only"><?php echo Text::_('JNO'); ?></span>
 								<?php elseif ($contentlang->published == -2 && array_key_exists($contentlang->lang_code, $this->homepages)) : ?>
-									<span class="fa fa-trash" aria-hidden="true"></span>
+									<span class="fas fa-trash" aria-hidden="true"></span>
 									<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 								<?php endif; ?>
 							</td>
 							<td class="text-center">
 								<?php if (!array_key_exists($contentlang->lang_code, $this->homepages)) : ?>
-									<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+									<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 									<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 								<?php else : ?>
-									<span class="fa fa-check" aria-hidden="true"></span>
+									<span class="fas fa-check" aria-hidden="true"></span>
 									<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 								<?php endif; ?>
 							</td>
@@ -305,15 +305,15 @@
 								<?php echo $sitelang; ?>
 							</th>
 							<td class="text-center">
-								<span class="fa fa-check" aria-hidden="true"></span>
+								<span class="fas fa-check" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 							</td>
 							<td class="text-center">
-								<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
+								<span class="fas fa-exclamation-triangle" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 							</td>
 							<td class="text-center">
-								<span class="fa fa-check" aria-hidden="true"></span>
+								<span class="fas fa-check" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::_('JYES'); ?></span>
 							</td>
 						</tr>
diff --git a/administrator/components/com_languages/tmpl/override/edit.php b/administrator/components/com_languages/tmpl/override/edit.php
index 617dd3b2f9626..cfbe017d2eff8 100644
--- a/administrator/components/com_languages/tmpl/override/edit.php
+++ b/administrator/components/com_languages/tmpl/override/edit.php
@@ -51,7 +51,7 @@
 				<legend><?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND'); ?></legend>
 				<div>
 				<div class="alert alert-info">
-					<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+					<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 					<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP'); ?>
 				</div>
 				<?php echo $this->form->renderField('searchtype'); ?>
@@ -68,7 +68,7 @@
 								</button>
 							</span>
 							<span id="refresh-status" class="help-block">
-								<span class="fa fa-sync fa-spin" aria-hidden="true"></span>
+								<span class="fas fa-sync fa-spin" aria-hidden="true"></span>
 								<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_REFRESHING'); ?>
 							</span>
 						</div>
@@ -79,10 +79,10 @@
 
 			<fieldset id="results-container" class="adminform">
 				<legend><?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_RESULTS_LEGEND'); ?></legend>
-				<div id="overrider-spinner" class="overrider-spinner text-center" data-search-string-expired="<?php echo $expired; ?>"><span class="fa fa-spinner fa-spin" aria-hidden="true"></span></div>
+				<div id="overrider-spinner" class="overrider-spinner text-center" data-search-string-expired="<?php echo $expired; ?>"><span class="fas fa-spinner fa-spin" aria-hidden="true"></span></div>
 				<span id="more-results" class="mt-2">
 					<button type="button" id="more-results-button" class="btn btn-secondary">
-						<span id="overrider-spinner-btn" class="overrider-spinner-btn fa fa-spinner fa-spin" aria-hidden="true"></span>
+						<span id="overrider-spinner-btn" class="overrider-spinner-btn fas fa-spinner fa-spin" aria-hidden="true"></span>
 						<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_MORE_RESULTS'); ?>
 					</button>
 				</span>
diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php
index 3500a836b50b9..223dcfd36ac9f 100644
--- a/administrator/components/com_languages/tmpl/overrides/default.php
+++ b/administrator/components/com_languages/tmpl/overrides/default.php
@@ -35,7 +35,7 @@
 				<div class="clearfix"></div>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_media/layouts/toolbar/create-folder.php b/administrator/components/com_media/layouts/toolbar/create-folder.php
index 4368a1948e0b6..87fd64763b170 100644
--- a/administrator/components/com_media/layouts/toolbar/create-folder.php
+++ b/administrator/components/com_media/layouts/toolbar/create-folder.php
@@ -19,7 +19,7 @@
 ?>
 <joomla-toolbar-button>
 	<button class="btn btn-sm btn-info" onclick="MediaManager.Event.fire('onClickCreateFolder');">
-		<span class="icon-folder-close" aria-hidden="true"></span>
+		<span class="fas fa-folder" aria-hidden="true"></span>
 		<?php echo $title; ?>
 	</button>
 </joomla-toolbar-button>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/browser.vue b/administrator/components/com_media/resources/scripts/components/browser/browser.vue
index d0faa9ac1d141..485c7389fbfc2 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/browser.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/browser.vue
@@ -8,7 +8,7 @@
             :style="mediaBrowserStyles"
             ref="browserItems">
             <div class="media-dragoutline">
-                <span class="fa fa-cloud-upload upload-icon" aria-hidden="true"></span>
+                <span class="fas fa-cloud-upload upload-icon" aria-hidden="true"></span>
                 <p>{{ translate('COM_MEDIA_DROP_FILE') }}</p>
             </div>
             <table v-if="listView === 'table'" class="table media-browser-table">
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
index 205678acadfe8..5139201f70d22 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
@@ -4,7 +4,7 @@
              @dblclick.stop.prevent="onPreviewDblClick()">
             <div class="file-background">
                 <div class="folder-icon">
-                    <span class="fa fa-folder"></span>
+                    <span class="fas fa-folder"></span>
                 </div>
             </div>
         </div>
@@ -21,7 +21,7 @@
               :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')" @keyup.enter="openActions()"
                @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
                @keyup.down="openActions()" @keyup.up="openLastActions()">
-                <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
+                <span class="image-browser-action fas fa-ellipsis-h" aria-hidden="true"
                       @click.stop="openActions()"></span>
             </button>
             <div v-if="showActions" class="media-browser-actions-list">
@@ -31,7 +31,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.space="openRenameModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionDelete.focus()">
-                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                            <span class="image-browser-action fas fa-text-width" aria-hidden="true"
                                   @click.stop="openRenameModal()"></span>
                         </button>
                     </li>
@@ -40,7 +40,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.space="openConfirmDeleteModal()"
                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                            @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionRename.focus()">
-                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                            <span class="image-browser-action fas fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
                         </button>
                     </li>
                 </ul>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
index 0bbd3882f100c..023ee200330e5 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
@@ -3,7 +3,7 @@
         <div class="media-browser-item-preview">
             <div class="file-background">
                 <div class="file-icon">
-                    <span class="fa fa-file-alt"></span>
+                    <span class="fas fa-file-alt"></span>
                 </div>
             </div>
         </div>
@@ -20,7 +20,7 @@
               :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')" @keyup.enter="openActions()"
                @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
                @keyup.down="openActions()" @keyup.up="openLastActions()">
-                <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
+                <span class="image-browser-action fas fa-ellipsis-h" aria-hidden="true"
                       @click.stop="openActions()"></span>
             </button>
             <div v-if="showActions" class="media-browser-actions-list">
@@ -29,7 +29,7 @@
                         <button type="button" class="action-download" ref="actionDownload" @keyup.enter="download()"
                            :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')" @keyup.space="download()"
                             @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionRename.focus()">
-                            <span class="image-browser-action fa fa-download" aria-hidden="true"
+                            <span class="image-browser-action fas fa-download" aria-hidden="true"
                                   @click.stop="download()"></span>
                         </button>
                     </li>
@@ -38,7 +38,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.enter="openRenameModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="$refs.actionDownload.focus()" @keyup.down="$refs.actionUrl.focus()">
-                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                            <span class="image-browser-action fas fa-text-width" aria-hidden="true"
                                   @click.stop="openRenameModal()"></span>
                         </button>
                     </li>
@@ -47,7 +47,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_SHARE')" @keyup.enter="openShareUrlModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionDelete.focus()">
-                            <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
+                            <span class="image-browser-action fas fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
                         </button>
                     </li>
                     <li>
@@ -55,7 +55,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.enter="openConfirmDeleteModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="$refs.actionUrl.focus()" @keyup.down="$refs.actionDownload.focus()">
-                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                            <span class="image-browser-action fas fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
                         </button>
                     </li>
                 </ul>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
index 949256c2448a8..369b57c9a74dc 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
@@ -18,7 +18,7 @@
                :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')" @keyup.enter="openActions()"
                @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
                @keyup.down="openActions()" @keyup.up="openLastActions()">
-                <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
+                <span class="image-browser-action fas fa-ellipsis-h" aria-hidden="true"
                       @click.stop="openActions()"></span>
             </button>
             <div v-if="showActions" class="media-browser-actions-list">
@@ -28,7 +28,7 @@
                             :aria-label="translate('COM_MEDIA_ACTION_PREVIEW')" @keyup.space="openPreview()"
                             @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                             @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionDownload.focus()">
-                            <span class="image-browser-action fa fa-search-plus" aria-hidden="true"
+                            <span class="image-browser-action fas fa-search-plus" aria-hidden="true"
                                   @click.stop="openPreview()"></span>
                         </button>
                     </li>
@@ -37,7 +37,7 @@
                             :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')" @keyup.space="download()"
                             @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                             @keyup.up="$refs.actionPreview.focus()" @keyup.down="$refs.actionRename.focus()">
-                            <span class="image-browser-action fa fa-download" aria-hidden="true"
+                            <span class="image-browser-action fas fa-download" aria-hidden="true"
                                   @click.stop="download()"></span>
                         </button>
                     </li>
@@ -46,7 +46,7 @@
                             :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.space="openRenameModal()"
                             @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                             @keyup.up="$refs.actionDownload.focus()" @keyup.down="canEdit ? $refs.actionEdit.focus() : $refs.actionShare.focus()">
-                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                            <span class="image-browser-action fas fa-text-width" aria-hidden="true"
                                   @click.stop="openRenameModal()"></span>
                         </button>
                     </li>
@@ -55,7 +55,7 @@
                             :aria-label="translate('COM_MEDIA_ACTION_EDIT')" @keyup.enter="editItem()" @keyup.space="editItem()"
                             @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                             @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionShare.focus()">
-                            <span class="image-browser-action fa fa-pencil-alt" aria-hidden="true" @click.stop="editItem()"></span>
+                            <span class="image-browser-action fas fa-pencil-alt" aria-hidden="true" @click.stop="editItem()"></span>
                         </button>
                     </li>
                     <li>
@@ -63,7 +63,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_SHARE')" @keyup.space="openShareUrlModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="canEdit ? $refs.actionEdit.focus() : $refs.actionRename.focus()" @keyup.down="$refs.actionDelete.focus()">
-                            <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
+                            <span class="image-browser-action fas fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
                         </button>
                     </li>
                     <li>
@@ -71,7 +71,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.space="openConfirmDeleteModal()"
                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                            @keyup.up="$refs.actionShare.focus()" @keyup.down="$refs.actionPreview.focus()">
-                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                            <span class="image-browser-action fas fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
                         </button>
                     </li>
                 </ul>
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
index 173a6966f5f15..fc19184b55d89 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
@@ -3,7 +3,7 @@
         <div class="media-browser-item-preview">
             <div class="file-background">
                 <div class="file-icon">
-                    <span class="fa fa-file-alt"></span>
+                    <span class="fas fa-file-alt"></span>
                 </div>
             </div>
         </div>
@@ -19,7 +19,7 @@
               :aria-label="translate('COM_MEDIA_OPEN_ITEM_ACTIONS')"
                @focus="focused(true)" @blur="focused(false)" @keyup.space="openActions()"
                @keyup.down="openActions()" @keyup.up="openLastActions()">
-                <span class="image-browser-action fa fa-ellipsis-h" aria-hidden="true"
+                <span class="image-browser-action fas fa-ellipsis-h" aria-hidden="true"
                       @click.stop="openActions()"></span>
             </button>
             <div v-if="showActions" class="media-browser-actions-list">
@@ -29,7 +29,7 @@
                            :aria-label="translate('COM_MEDIA_ACTION_PREVIEW')" @keyup.space="openPreview()"
                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                            @keyup.up="$refs.actionDelete.focus()" @keyup.down="$refs.actionDownload.focus()">
-                            <span class="image-browser-action fa fa-search-plus" aria-hidden="true"
+                            <span class="image-browser-action fas fa-search-plus" aria-hidden="true"
                                   @click.stop="openPreview()"></span>
                         </button>
                     </li>
@@ -38,7 +38,7 @@
                            :aria-label="translate('COM_MEDIA_ACTION_DOWNLOAD')" @keyup.space="download()"
                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                            @keyup.up="$refs.actionPreview.focus()" @keyup.down="$refs.actionRename.focus()">
-                            <span class="image-browser-action fa fa-download" aria-hidden="true"
+                            <span class="image-browser-action fas fa-download" aria-hidden="true"
                                   @click.stop="download()"></span>
                         </button>
                     </li>
@@ -47,7 +47,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_RENAME')" @keyup.space="openRenameModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="$refs.actionDownload.focus()" @keyup.down="$refs.actionShare.focus()">
-                            <span class="image-browser-action fa fa-text-width" aria-hidden="true"
+                            <span class="image-browser-action fas fa-text-width" aria-hidden="true"
                                   @click.stop="openRenameModal()"></span>
                         </button>
                     </li>
@@ -56,7 +56,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_SHARE')" @keyup.space="openShareUrlModal()"
                           @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                           @keyup.up="$refs.actionRename.focus()" @keyup.down="$refs.actionDelete.focus()">
-                            <span class="image-browser-action fa fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
+                            <span class="image-browser-action fas fa-link" aria-hidden="true" @click.stop="openShareUrlModal()"></span>
                         </button>
                     </li>
                     <li>
@@ -64,7 +64,7 @@
                           :aria-label="translate('COM_MEDIA_ACTION_DELETE')" @keyup.space="openConfirmDeleteModal()"
                            @focus="focused(true)" @blur="focused(false)" @keyup.esc="hideActions()"
                            @keyup.up="$refs.actionShare.focus()" @keyup.down="$refs.actionPreview.focus()">
-                            <span class="image-browser-action fa fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
+                            <span class="image-browser-action fas fa-trash" aria-hidden="true" @click.stop="openConfirmDeleteModal()"></span>
                         </button>
                     </li>
                 </ul>
diff --git a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue b/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
index 4d9959292335d..9588ee019dc85 100644
--- a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
+++ b/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
@@ -4,7 +4,7 @@
             <span class="infobar-close" @click="hideInfoBar()">×</span>
             <h2>{{ item.name }}</h2>
             <div v-if="item.path === '/'" class="text-center">
-                <span class="fa fa-file placeholder-icon"></span>
+                <span class="fas fa-file placeholder-icon"></span>
                 Select file or folder to view its details.
             </div>
             <dl v-else>
@@ -73,4 +73,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
index 3776cff347c8f..0765ee2032b92 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
@@ -8,7 +8,7 @@
             </video>
         </div>
         <button type="button" slot="backdrop-close" @click="close()" class="media-preview-close">
-            <span class="fa fa-times"></span>
+            <span class="fas fa-times"></span>
         </button>
     </media-modal>
 </template>
diff --git a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
index 463f8b3646bcf..408785cff47ce 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
@@ -4,7 +4,7 @@
         <div slot="body">
             <div class="desc">
                 {{ translate('COM_MEDIA_SHARE_DESC') }}
-                
+
                 <template v-if="!url">
                     <div class="control">
                         <button class="btn btn-success btn-block" type="button" @click="generateUrl">{{ translate('COM_MEDIA_ACTION_SHARE') }}</button>
@@ -16,10 +16,10 @@
                             <input id="url" ref="urlText" readonly v-model="url" class="form-control input-xxlarge" placeholder="URL" autocomplete="off">
                             <span class="input-group-append">
                                 <button class="btn btn-secondary" type="button" @click="copyToClipboard" :title="translate('COM_MEDIA_SHARE_COPY')">
-                                    <span class="fa fa-clipboard" aria-hidden="true"></span>
+                                    <span class="fas fa-clipboard" aria-hidden="true"></span>
                                 </button>
                             </span>
-                        </span>     
+                        </span>
                     </div>
                 </template>
             </div>
diff --git a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue b/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
index fb0c583972216..fd1c2ab19cf93 100644
--- a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
+++ b/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
@@ -17,16 +17,16 @@
             <button type="button" class="media-toolbar-icon media-toolbar-decrease-grid-size"
                v-if="isGridView"
                :class="{disabled: isGridSize('xs')}"
-               @click.stop.prevent="decreaseGridSize()" 
+               @click.stop.prevent="decreaseGridSize()"
                :aria-label="translate('COM_MEDIA_DECREASE_GRID')">
-                <span class="fa fa-search-minus" aria-hidden="true"></span>
+                <span class="fas fa-search-minus" aria-hidden="true"></span>
             </button>
             <button type="button" class="media-toolbar-icon media-toolbar-increase-grid-size"
                v-if="isGridView"
                :class="{disabled: isGridSize('xl')}"
-               @click.stop.prevent="increaseGridSize()" 
+               @click.stop.prevent="increaseGridSize()"
                :aria-label="translate('COM_MEDIA_INCREASE_GRID')">
-                <span class="fa fa-search-plus" aria-hidden="true"></span>
+                <span class="fas fa-search-plus" aria-hidden="true"></span>
             </button>
             <button type="button" href="#" class="media-toolbar-icon media-toolbar-list-view"
                @click.stop.prevent="changeListView()"
@@ -36,7 +36,7 @@
             <button type="button" href="#" class="media-toolbar-icon media-toolbar-info"
                @click.stop.prevent="toggleInfoBar"
                :aria-label="translate('COM_MEDIA_TOGGLE_INFO')">
-                <span class="fa fa-info" aria-hidden="true"></span>
+                <span class="fas fa-info" aria-hidden="true"></span>
             </button>
         </div>
     </div>
@@ -49,10 +49,10 @@
         name: 'media-toolbar',
         computed: {
             toggleListViewBtnIcon() {
-                return (this.isGridView) ? 'fa fa-list' : 'fa fa-th';
+                return (this.isGridView) ? 'fas fa-list' : 'fas fa-th';
             },
             toggleSelectAllBtnIcon() {
-                return (this.allItemsSelected) ? 'fa fa-check-square' : 'fa fa-square'
+                return (this.allItemsSelected) ? 'fas fa-check-square' : 'fas fa-square'
             },
             isLoading() {
                 return this.$store.state.isLoading;
diff --git a/administrator/components/com_media/resources/scripts/components/tree/item.vue b/administrator/components/com_media/resources/scripts/components/tree/item.vue
index 29229799821d2..cc7619238dd9d 100644
--- a/administrator/components/com_media/resources/scripts/components/tree/item.vue
+++ b/administrator/components/com_media/resources/scripts/components/tree/item.vue
@@ -53,7 +53,7 @@
             },
             iconClass() {
                 return {
-                    fa: true,
+                    fas: true,
                     'fa-folder': !this.isOpen,
                     'fa-folder-open': this.isOpen,
                 }
diff --git a/administrator/components/com_media/resources/styles/components/_media-infobar.scss b/administrator/components/com_media/resources/styles/components/_media-infobar.scss
index 444d3f7dd8712..a67570ee972e0 100644
--- a/administrator/components/com_media/resources/styles/components/_media-infobar.scss
+++ b/administrator/components/com_media/resources/styles/components/_media-infobar.scss
@@ -55,7 +55,7 @@
   }
 }
 
-.placeholder-icon.fa {
+.placeholder-icon.fas {
   display: block;
   width: 4rem;
   height: 4rem;
diff --git a/administrator/components/com_menus/View/Items/HtmlView.php b/administrator/components/com_menus/View/Items/HtmlView.php
index 7688be3c7428e..3a2cc62e51342 100644
--- a/administrator/components/com_menus/View/Items/HtmlView.php
+++ b/administrator/components/com_menus/View/Items/HtmlView.php
@@ -347,7 +347,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_menus/tmpl/item/edit_container.php b/administrator/components/com_menus/tmpl/item/edit_container.php
index fd4428c70d5b8..78beeb1c1a43a 100644
--- a/administrator/components/com_menus/tmpl/item/edit_container.php
+++ b/administrator/components/com_menus/tmpl/item/edit_container.php
@@ -43,7 +43,7 @@
 
 		<hr>
 		<div class="alert alert-info">
-			<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+			<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 			<?php echo Text::_('COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_DESC'); ?>
 		</div>
 			<?php if (count($menuLinks)) : ?>
diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
index b3892d9bb6da5..09a09d4600726 100644
--- a/administrator/components/com_menus/tmpl/items/default.php
+++ b/administrator/components/com_menus/tmpl/items/default.php
@@ -152,7 +152,7 @@
 										}
 										?>
 										<span class="sortable-handler<?php echo $iconClass ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" class="hidden" name="order[]" size="5"
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index d48d7b7da672b..4afaf5e53113a 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -49,7 +49,7 @@
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php
index 6093e2ec25b18..93681479fd403 100644
--- a/administrator/components/com_menus/tmpl/menus/default.php
+++ b/administrator/components/com_menus/tmpl/menus/default.php
@@ -44,7 +44,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -112,7 +112,7 @@
 								<td class="text-center btns">
 									<?php if ($canManageItems) : ?>
 										<a href="<?php echo Route::_('index.php?option=com_menus&view=items&menutype=' . $item->menutype); ?>">
-											<span class="fa fa-list" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('COM_MENUS_MENUS'); ?></span>
+											<span class="fas fa-list" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('COM_MENUS_MENUS'); ?></span>
 										</a>
 									<?php endif; ?>
 								</td>
diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php
index df058c191478a..fe084b862a856 100644
--- a/administrator/components/com_messages/tmpl/messages/default.php
+++ b/administrator/components/com_messages/tmpl/messages/default.php
@@ -26,7 +26,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_modules/View/Modules/HtmlView.php b/administrator/components/com_modules/View/Modules/HtmlView.php
index c0debd59b8861..36f5c243c38c1 100644
--- a/administrator/components/com_modules/View/Modules/HtmlView.php
+++ b/administrator/components/com_modules/View/Modules/HtmlView.php
@@ -162,7 +162,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
index d05c5b935faed..bb936d8a9a3c3 100644
--- a/administrator/components/com_modules/tmpl/module/edit.php
+++ b/administrator/components/com_modules/tmpl/module/edit.php
@@ -116,7 +116,7 @@
 							<?php endif; ?>
 						<?php else : ?>
 							<div class="alert alert-danger">
-								<span class="fa fa-exclamation-triangle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
+								<span class="fas fa-exclamation-triangle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
 								<?php echo Text::_('COM_MODULES_ERR_XML'); ?>
 							</div>
 						<?php endif; ?>
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index 6557f29d417ad..710ea0f0ddb38 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -109,7 +109,7 @@
 							}
 							?>
 							<span class="sortable-handler<?php echo $iconClass; ?>">
-								<span class="fa fa-ellipsis-v"></span>
+								<span class="fas fa-ellipsis-v"></span>
 							</span>
 							<?php if ($canChange && $saveOrder) : ?>
 								<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
index 9dee97fa986d5..4649b47cd2fd2 100644
--- a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
@@ -135,7 +135,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index d72451ca2afda..f5e7fb01b7f55 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -39,7 +39,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -111,7 +111,7 @@
 									}
 									?>
 									<span class="sortable-handler<?php echo $iconClass ?>">
-										<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+										<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 									</span>
 									<?php if ($canChange && $saveOrder) : ?>
 										<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
index 8b4aa93f2da0e..2cdbfd05fc5e7 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -33,7 +33,7 @@
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_plugins/View/Plugins/HtmlView.php b/administrator/components/com_plugins/View/Plugins/HtmlView.php
index 76c72fc56ddf6..4b09e6cf243fd 100644
--- a/administrator/components/com_plugins/View/Plugins/HtmlView.php
+++ b/administrator/components/com_plugins/View/Plugins/HtmlView.php
@@ -107,7 +107,7 @@ protected function addToolbar()
 		$dropdown = $toolbar->dropdownButton('status-group')
 			->text('JTOOLBAR_CHANGE_STATUS')
 			->toggleSplit(false)
-			->icon('fa fa-ellipsis-h')
+			->icon('fas fa-ellipsis-h')
 			->buttonClass('btn btn-action')
 			->listCheck(true);
 
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php
index f181d92af0945..880440c319903 100644
--- a/administrator/components/com_plugins/tmpl/plugin/edit.php
+++ b/administrator/components/com_plugins/tmpl/plugin/edit.php
@@ -97,7 +97,7 @@
 							<?php endif; ?>
 							<?php else : ?>
 								<div class="alert alert-danger">
-								<span class="fa fa-exclamation-triangle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
+								<span class="fas fa-exclamation-triangle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('ERROR'); ?></span>
 									<?php echo Text::_('COM_PLUGINS_XML_ERR'); ?>
 								</div>
 							<?php endif; ?>
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index 81988c463721d..0c22b771a7e8c 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.php
@@ -34,7 +34,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
@@ -94,7 +94,7 @@
 							}
 							?>
 							<span class="sortable-handler<?php echo $iconClass; ?>">
-								<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+								<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 							</span>
 							<?php if ($canChange && $saveOrder) : ?>
 								<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_privacy/tmpl/capabilities/default.php b/administrator/components/com_privacy/tmpl/capabilities/default.php
index 4edac1a972349..a6e7562f6dbe0 100644
--- a/administrator/components/com_privacy/tmpl/capabilities/default.php
+++ b/administrator/components/com_privacy/tmpl/capabilities/default.php
@@ -21,7 +21,7 @@
 	</div>
 	<?php if (empty($this->capabilities)) : ?>
 		<div class="alert alert-info">
-			<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+			<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 			<?php echo Text::_('COM_PRIVACY_MSG_CAPABILITIES_NO_CAPABILITIES'); ?>
 		</div>
 	<?php else : ?>
@@ -30,7 +30,7 @@
 			<summary><?php echo $extension; ?></summary>
 				<?php if (empty($capabilities)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('COM_PRIVACY_MSG_EXTENSION_NO_CAPABILITIES'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
index 1836108e7c4fc..89cb74f486a07 100644
--- a/administrator/components/com_privacy/tmpl/consents/default.php
+++ b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -37,7 +37,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_privacy/tmpl/request/default.php b/administrator/components/com_privacy/tmpl/request/default.php
index 91ad2efe690f3..f23adb533b4fa 100644
--- a/administrator/components/com_privacy/tmpl/request/default.php
+++ b/administrator/components/com_privacy/tmpl/request/default.php
@@ -48,7 +48,7 @@
 				<div class="card-body">
 					<?php if (empty($this->actionlogs)) : ?>
 						<div class="alert alert-info">
-							<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+							<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 							<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 						</div>
 					<?php else : ?>
diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php
index 6e2d8507e88cd..ab4c5336e82ad 100644
--- a/administrator/components/com_privacy/tmpl/requests/default.php
+++ b/administrator/components/com_privacy/tmpl/requests/default.php
@@ -35,7 +35,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_redirect/View/Links/HtmlView.php b/administrator/components/com_redirect/View/Links/HtmlView.php
index a4e8f1b82d47c..3231e0be15fbe 100644
--- a/administrator/components/com_redirect/View/Links/HtmlView.php
+++ b/administrator/components/com_redirect/View/Links/HtmlView.php
@@ -156,7 +156,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index a5c098876f830..f0b94d8b07d97 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.php
@@ -53,7 +53,7 @@
 
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_tags/View/Tags/HtmlView.php b/administrator/components/com_tags/View/Tags/HtmlView.php
index 1aa507c64eed9..e40c111222ba0 100644
--- a/administrator/components/com_tags/View/Tags/HtmlView.php
+++ b/administrator/components/com_tags/View/Tags/HtmlView.php
@@ -134,7 +134,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php
index f88c0c6cccbf1..59c9fc72caa60 100644
--- a/administrator/components/com_tags/tmpl/tags/default.php
+++ b/administrator/components/com_tags/tmpl/tags/default.php
@@ -65,7 +65,7 @@
 		?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
@@ -174,7 +174,7 @@
 								}
 								?>
 								<span class="sortable-handler<?php echo $iconClass ?>">
-									<span class="fa fa-ellipsis-v"></span>
+									<span class="fas fa-ellipsis-v"></span>
 								</span>
 								<?php if ($canChange && $saveOrder) : ?>
 									<input type="text" class="hidden" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>">
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 6660d6ae436c6..f3e6f9ce6a5a6 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -145,10 +145,10 @@
 					<?php foreach ($this->archive as $file) : ?>
 						<li>
 							<?php if (substr($file, -1) === DIRECTORY_SEPARATOR) : ?>
-								<span class="fa fa-folder fa-fw" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+								<span class="fas fa-folder fa-fw" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
 							<?php endif; ?>
 							<?php if (substr($file, -1) != DIRECTORY_SEPARATOR) : ?>
-								<span class="fa fa-file fa-fw" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+								<span class="fas fa-file fa-fw" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
 							<?php endif; ?>
 						</li>
 					<?php endforeach; ?>
@@ -246,7 +246,7 @@
 										. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
 								?>
 								<a href="<?php echo Route::_($overrideLinkUrl); ?>">
-									<span class="fa fa-copy" aria-hidden="true"></span>&nbsp;<?php echo $module->name; ?>
+									<span class="fas fa-copy" aria-hidden="true"></span>&nbsp;<?php echo $module->name; ?>
 								</a>
 							</li>
 						<?php endforeach; ?>
@@ -261,7 +261,7 @@
 						<?php foreach ($this->overridesList['components'] as $key => $value) : ?>
 							<li class="component-folder">
 								<a href="#" class="component-folder-url">
-									<span class="fa fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
+									<span class="fas fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
 								</a>
 								<ul class="list-unstyled">
 									<?php foreach ($value as $view) : ?>
@@ -271,7 +271,7 @@
 													. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
 											?>
 											<a class="component-file-url" href="<?php echo Route::_($overrideLinkUrl); ?>">
-												<span class="fa fa-copy" aria-hidden="true"></span>&nbsp;<?php echo $view->name; ?>
+												<span class="fas fa-copy" aria-hidden="true"></span>&nbsp;<?php echo $view->name; ?>
 											</a>
 										</li>
 									<?php endforeach; ?>
@@ -289,7 +289,7 @@
 						<?php foreach ($this->overridesList['plugins'] as $key => $group) : ?>
 							<li class="plugin-folder">
 								<a href="#" class="plugin-folder-url">
-									<span class="fa fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
+									<span class="fas fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
 								</a>
 								<ul class="list-unstyled">
 									<?php foreach ($group as $plugin) : ?>
@@ -299,7 +299,7 @@
 												. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
 											?>
 											<a class="plugin-file-url" href="<?php echo Route::_($overrideLinkUrl); ?>">
-												<span class="fa fa-copy" aria-hidden="true"></span> <?php echo $plugin->name; ?>
+												<span class="fas fa-copy" aria-hidden="true"></span> <?php echo $plugin->name; ?>
 											</a>
 										</li>
 									<?php endforeach; ?>
@@ -317,7 +317,7 @@
 						<?php foreach ($this->overridesList['layouts'] as $key => $value) : ?>
 						<li class="layout-folder">
 							<a href="#" class="layout-folder-url">
-								<span class="fa fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
+								<span class="fas fa-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
 							</a>
 							<ul class="list-unstyled">
 								<?php foreach ($value as $layout) : ?>
@@ -327,7 +327,7 @@
 												. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
 										?>
 										<a href="<?php echo Route::_($overrideLinkUrl); ?>">
-											<span class="fa fa-copy" aria-hidden="true"></span>&nbsp;<?php echo $layout->name; ?>
+											<span class="fas fa-copy" aria-hidden="true"></span>&nbsp;<?php echo $layout->name; ?>
 										</a>
 									</li>
 								<?php endforeach; ?>
diff --git a/administrator/components/com_templates/tmpl/template/default_folders.php b/administrator/components/com_templates/tmpl/template/default_folders.php
index 8eae7efaa5829..9e9185d016691 100644
--- a/administrator/components/com_templates/tmpl/template/default_folders.php
+++ b/administrator/components/com_templates/tmpl/template/default_folders.php
@@ -16,7 +16,7 @@
 		<?php if (is_array($value)) : ?>
 			<li class="folder-select">
 				<a class="folder-url" data-id="<?php echo base64_encode($key); ?>" href="">
-					<span class="fa fa-folder fa-fw" aria-hidden="true"></span>
+					<span class="fas fa-folder fa-fw" aria-hidden="true"></span>
 					<?php $explodeArray = explode('/', $key); echo $this->escape(end($explodeArray)); ?>
 				</a>
 				<?php echo $this->folderTree($value); ?>
diff --git a/administrator/components/com_templates/tmpl/template/default_tree.php b/administrator/components/com_templates/tmpl/template/default_tree.php
index 7ecb7c37f2d5c..e27b8d3a38b43 100644
--- a/administrator/components/com_templates/tmpl/template/default_tree.php
+++ b/administrator/components/com_templates/tmpl/template/default_tree.php
@@ -51,7 +51,7 @@
 			?>
 			<li class="<?php echo $class; ?>">
 				<a class="folder-url" href="">
-					<span class="fa fa-folder fa-fw" aria-hidden="true"></span>&nbsp;<?php $explodeArray = explode('/', $key); echo $this->escape(end($explodeArray)); ?>
+					<span class="fas fa-folder fa-fw" aria-hidden="true"></span>&nbsp;<?php $explodeArray = explode('/', $key); echo $this->escape(end($explodeArray)); ?>
 				</a>
 				<?php echo $this->directoryTree($value); ?>
 			</li>
@@ -59,7 +59,7 @@
 		<?php if (is_object($value)) : ?>
 			<li>
 				<a class="file" href='<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $this->id . '&file=' . $value->id); ?>'>
-					<span class="fa fa-file-alt fa-fw" aria-hidden="true"></span>&nbsp;<?php echo $this->escape($value->name); ?>
+					<span class="fas fa-file-alt fa-fw" aria-hidden="true"></span>&nbsp;<?php echo $this->escape($value->name); ?>
 				</a>
 			</li>
 		<?php endif; ?>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 955c1421f74a5..2d0dafe1a27b9 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -81,7 +81,7 @@
 					<?php echo HTMLHelper::_('form.token'); ?>
 				<?php else : ?>
 					<div class="alert alert-success">
-						<span class="fa fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
+						<span class="fas fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
 						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_UPTODATE'); ?>
 					</div>
 				<?php endif; ?>
diff --git a/administrator/components/com_users/Service/HTML/Users.php b/administrator/components/com_users/Service/HTML/Users.php
index 7ba69cb50b37d..1233db945a4ff 100644
--- a/administrator/components/com_users/Service/HTML/Users.php
+++ b/administrator/components/com_users/Service/HTML/Users.php
@@ -64,7 +64,7 @@ public function addNote($userId)
 		$title = Text::_('COM_USERS_ADD_NOTE');
 
 		return '<a href="' . Route::_('index.php?option=com_users&task=note.add&u_id=' . (int) $userId)
-			. '" class="btn btn-secondary btn-sm"><span class="fa fa-plus" aria-hidden="true">'
+			. '" class="btn btn-secondary btn-sm"><span class="fas fa-plus" aria-hidden="true">'
 			. '</span> ' . $title . '</a>';
 	}
 
@@ -88,7 +88,7 @@ public function filterNotes($count, $userId)
 		$title = Text::_('COM_USERS_FILTER_NOTES');
 
 		return '<a href="' . Route::_('index.php?option=com_users&view=notes&filter[search]=uid:' . (int) $userId)
-			. '" class="dropdown-item"><span class="fa fa-list" aria-hidden="true"></span> ' . $title . '</a>';
+			. '" class="dropdown-item"><span class="fas fa-list" aria-hidden="true"></span> ' . $title . '</a>';
 	}
 
 	/**
@@ -111,7 +111,7 @@ public function notes($count, $userId)
 		$title = Text::plural('COM_USERS_N_USER_NOTES', $count);
 
 		return '<button  type="button" data-target="#userModal_' . (int) $userId . '" id="modal-' . (int) $userId
-			. '" data-toggle="modal" class="dropdown-item"><span class="fa fa-eye" aria-hidden="true"></span> ' . $title . '</button>';
+			. '" data-toggle="modal" class="dropdown-item"><span class="fas fa-eye" aria-hidden="true"></span> ' . $title . '</button>';
 	}
 
 	/**
diff --git a/administrator/components/com_users/View/Notes/HtmlView.php b/administrator/components/com_users/View/Notes/HtmlView.php
index 32f78dad7d104..a98e7828d43c7 100644
--- a/administrator/components/com_users/View/Notes/HtmlView.php
+++ b/administrator/components/com_users/View/Notes/HtmlView.php
@@ -137,7 +137,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_users/View/Users/HtmlView.php b/administrator/components/com_users/View/Users/HtmlView.php
index 40f37b27cbc91..4860376b80ab3 100644
--- a/administrator/components/com_users/View/Users/HtmlView.php
+++ b/administrator/components/com_users/View/Users/HtmlView.php
@@ -138,7 +138,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php
index fd139edb10972..0d7c2a0af7760 100644
--- a/administrator/components/com_users/tmpl/groups/default.php
+++ b/administrator/components/com_users/tmpl/groups/default.php
@@ -33,7 +33,7 @@
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -94,7 +94,7 @@
 								</th>
 								<td class="text-center btns">
 									<a href="<?php echo Route::_('index.php?option=com_users&view=debuggroup&group_id=' . (int) $item->id); ?>">
-										<span class="fa fa-list" aria-hidden="true"></span>
+										<span class="fas fa-list" aria-hidden="true"></span>
 										<span class="sr-only"><?php echo Text::_('COM_USERS_DEBUG_PERMISSIONS'); ?></span>
 									</a>
 								</td>
diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php
index 559f9ef153f4a..9fd5601222d51 100644
--- a/administrator/components/com_users/tmpl/levels/default.php
+++ b/administrator/components/com_users/tmpl/levels/default.php
@@ -39,7 +39,7 @@
 
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -103,7 +103,7 @@
 									}
 									?>
 									<span class="sortable-handler<?php echo $iconClass ?>">
-										<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+										<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 									</span>
 									<?php if ($canChange && $saveOrder) : ?>
 										<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php
index 84c5bcd1a889d..27b14b5105dcf 100644
--- a/administrator/components/com_users/tmpl/notes/default.php
+++ b/administrator/components/com_users/tmpl/notes/default.php
@@ -30,7 +30,7 @@
 
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
index f1cdd483c44f8..928e576883028 100644
--- a/administrator/components/com_users/tmpl/user/edit.php
+++ b/administrator/components/com_users/tmpl/user/edit.php
@@ -87,12 +87,12 @@
 			<?php echo Text::_('COM_USERS_USER_OTEPS'); ?>
 		</legend>
 		<div class="alert alert-info">
-			<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+			<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 			<?php echo Text::_('COM_USERS_USER_OTEPS_DESC'); ?>
 		</div>
 		<?php if (empty($this->otpConfig->otep)) : ?>
 			<div class="alert alert-warning">
-				<span class="fa fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
+				<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 				<?php echo Text::_('COM_USERS_USER_OTEPS_WAIT_DESC'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index 872600c8bfcec..e229c92e862a1 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -36,7 +36,7 @@
 				?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else : ?>
@@ -132,7 +132,7 @@
 								</th>
 								<td class="text-center btns d-none d-md-table-cell">
 									<a href="<?php echo Route::_('index.php?option=com_users&view=debuguser&user_id=' . (int) $item->id); ?>">
-										<span class="fa fa-list" aria-hidden="true"></span>
+										<span class="fas fa-list" aria-hidden="true"></span>
 										<span class="sr-only"><?php echo Text::_('COM_USERS_DEBUG_PERMISSIONS'); ?></span>
 									</a>
 								</td>
diff --git a/administrator/components/com_users/tmpl/users/modal.php b/administrator/components/com_users/tmpl/users/modal.php
index ca4344f2c18de..ebbf60d6c2822 100644
--- a/administrator/components/com_users/tmpl/users/modal.php
+++ b/administrator/components/com_users/tmpl/users/modal.php
@@ -38,7 +38,7 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-info">
-				<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+				<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 				<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 			</div>
 		<?php else : ?>
diff --git a/administrator/components/com_workflow/View/Stages/HtmlView.php b/administrator/components/com_workflow/View/Stages/HtmlView.php
index 3134a602d9f8a..fdb49a3d0119b 100644
--- a/administrator/components/com_workflow/View/Stages/HtmlView.php
+++ b/administrator/components/com_workflow/View/Stages/HtmlView.php
@@ -178,7 +178,7 @@ protected function addToolbar()
 				$dropdown = $toolbar->dropdownButton('status-group')
 					->text('JTOOLBAR_CHANGE_STATUS')
 					->toggleSplit(false)
-					->icon('fa fa-ellipsis-h')
+					->icon('fas fa-ellipsis-h')
 					->buttonClass('btn btn-action')
 					->listCheck(true);
 
diff --git a/administrator/components/com_workflow/View/Transitions/HtmlView.php b/administrator/components/com_workflow/View/Transitions/HtmlView.php
index 5b352afb2bd86..1db555961ae0b 100644
--- a/administrator/components/com_workflow/View/Transitions/HtmlView.php
+++ b/administrator/components/com_workflow/View/Transitions/HtmlView.php
@@ -166,7 +166,7 @@ protected function addToolbar()
 				$dropdown = $toolbar->dropdownButton('status-group')
 					->text('JTOOLBAR_CHANGE_STATUS')
 					->toggleSplit(false)
-					->icon('fa fa-ellipsis-h')
+					->icon('fas fa-ellipsis-h')
 					->buttonClass('btn btn-action')
 					->listCheck(true);
 
diff --git a/administrator/components/com_workflow/View/Workflows/HtmlView.php b/administrator/components/com_workflow/View/Workflows/HtmlView.php
index 13a1b7c316fe4..0948bf4a146a5 100644
--- a/administrator/components/com_workflow/View/Workflows/HtmlView.php
+++ b/administrator/components/com_workflow/View/Workflows/HtmlView.php
@@ -136,7 +136,7 @@ protected function addToolbar()
 			$dropdown = $toolbar->dropdownButton('status-group')
 				->text('JTOOLBAR_CHANGE_STATUS')
 				->toggleSplit(false)
-				->icon('fa fa-ellipsis-h')
+				->icon('fas fa-ellipsis-h')
 				->buttonClass('btn btn-action')
 				->listCheck(true);
 
diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php
index d6ef1130051c4..7bb3b46c7719c 100644
--- a/administrator/components/com_workflow/tmpl/stages/default.php
+++ b/administrator/components/com_workflow/tmpl/stages/default.php
@@ -50,7 +50,7 @@
 				?>
 				<?php if (empty($this->stages)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else: ?>
@@ -108,7 +108,7 @@
 										}
 										?>
 										<span class="sortable-handler<?php echo $iconClass ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index 03d39cd020b24..af7d6107a2b3e 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -50,7 +50,7 @@
 				?>
 				<?php if (empty($this->transitions)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else: ?>
@@ -107,7 +107,7 @@
 										}
 										?>
 										<span class="sortable-handler<?php echo $iconClass ?>">
-											<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+											<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 										</span>
 										<?php if ($canChange && $saveOrder) : ?>
 											<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php
index 9600829caf869..1643b19a61de4 100644
--- a/administrator/components/com_workflow/tmpl/workflows/default.php
+++ b/administrator/components/com_workflow/tmpl/workflows/default.php
@@ -57,7 +57,7 @@
 				?>
 				<?php if (empty($this->workflows)) : ?>
 					<div class="alert alert-info">
-						<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+						<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 						<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 					</div>
 				<?php else: ?>
@@ -122,7 +122,7 @@
 									}
 									?>
 									<span class="sortable-handler<?php echo $iconClass ?>">
-										<span class="fa fa-ellipsis-v" aria-hidden="true"></span>
+										<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
 									</span>
 									<?php if ($canChange && $saveOrder) : ?>
 										<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
diff --git a/administrator/modules/mod_frontend/tmpl/default.php b/administrator/modules/mod_frontend/tmpl/default.php
index 55fd02331d883..32a5031c5eaf7 100644
--- a/administrator/modules/mod_frontend/tmpl/default.php
+++ b/administrator/modules/mod_frontend/tmpl/default.php
@@ -18,7 +18,7 @@
 		title="<?php echo Text::sprintf('MOD_FRONTEND_PREVIEW', $sitename); ?>"
 		target="_blank">
 		<div class="d-flex align-items-end mx-auto">
-			<span class="fa fa-external-link-alt" aria-hidden="true"></span>
+			<span class="fas fa-external-link-alt" aria-hidden="true"></span>
 		</div>
 		<div class="align-items-center tiny">
 			<?php echo HTMLHelper::_('string.truncate', $sitename, 28, false, false); ?>
diff --git a/administrator/modules/mod_menu/Menu/CssMenu.php b/administrator/modules/mod_menu/Menu/CssMenu.php
index 6cb17dbe9bd1a..6219a5f8300df 100644
--- a/administrator/modules/mod_menu/Menu/CssMenu.php
+++ b/administrator/modules/mod_menu/Menu/CssMenu.php
@@ -533,7 +533,7 @@ public function getIconClass($node)
 			$class = preg_replace('#\.\.[^A-Za-z0-9\.\_\- ]#', '', $class);
 		}
 
-		$html = 'fa fa-' . $class . ' fa-fw';
+		$html = 'fas fa-' . $class . ' fa-fw';
 
 		return $html;
 	}
diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
index b4f8bc99ff926..4b956ed0513f2 100644
--- a/administrator/modules/mod_menu/tmpl/default_submenu.php
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -93,7 +93,7 @@
 // Get the menu icon
 $icon      = $this->getIconClass($current);
 $iconClass = ($icon != '' && $current->level == 1) ? '<span class="' . $icon . '" aria-hidden="true"></span>' : '';
-$ajax      = $current->ajaxbadge ? '<span class="menu-badge"><span class="fa fa-spin fa-spinner mt-1 system-counter" data-url="' . $current->ajaxbadge . '"></span></span>' : '';
+$ajax      = $current->ajaxbadge ? '<span class="menu-badge"><span class="fas fa-spin fa-spinner mt-1 system-counter" data-url="' . $current->ajaxbadge . '"></span></span>' : '';
 $iconImage = $current->icon;
 $homeImage = '';
 
@@ -161,7 +161,7 @@
 	if (!$permission || $user->authorise($permission, $scope))
 	{
 		echo '<span class="menu-quicktask"><a href="' . $link . '">';
-		echo '<span class="fa fa-' . $icon . '" title="' . htmlentities(Text::_($title)) . '" aria-hidden="true"></span>';
+		echo '<span class="fas fa-' . $icon . '" title="' . htmlentities(Text::_($title)) . '" aria-hidden="true"></span>';
 		echo '<span class="sr-only">' . Text::_($title) . '</span>';
 		echo '</a></span>';
 	}
@@ -172,7 +172,7 @@
 	$titleDashboard = Text::sprintf('MOD_MENU_DASHBOARD_LINK', Text::_($current->title));
 	echo '<span class="menu-dashboard"><a href="'
 		. Route::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $current->dashboard) . '">'
-		. '<span class="fa fa-th-large" title="' . $titleDashboard . '" aria-hidden="true"></span>'
+		. '<span class="fas fa-th-large" title="' . $titleDashboard . '" aria-hidden="true"></span>'
 		. '<span class="sr-only">' . $titleDashboard . '</span>'
 		. '</a></span>';
 }
diff --git a/administrator/modules/mod_messages/tmpl/default.php b/administrator/modules/mod_messages/tmpl/default.php
index 00bda51a06202..dad2f9e05450f 100644
--- a/administrator/modules/mod_messages/tmpl/default.php
+++ b/administrator/modules/mod_messages/tmpl/default.php
@@ -21,7 +21,7 @@
 <div class="header-item-content">
 	<a class="d-flex align-items-stretch <?php echo ($hideLinks ? 'disabled' : 'dropdown-toggle'); ?>" <?php echo ($hideLinks ? '' : 'href="' . Route::_($route) . '"'); ?> title="<?php echo Text::_('MOD_MESSAGES_PRIVATE_MESSAGES'); ?>">
 		<div class="d-flex align-items-end mx-auto">
-			<span class="fa fa-envelope" aria-hidden="true"></span>
+			<span class="fas fa-envelope" aria-hidden="true"></span>
 		</div>
 		<div class="tiny">
 			<?php echo Text::_('MOD_MESSAGES_PRIVATE_MESSAGES'); ?>
diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php
index 625e466dbc4f6..8adce43171b15 100644
--- a/administrator/modules/mod_multilangstatus/tmpl/default.php
+++ b/administrator/modules/mod_multilangstatus/tmpl/default.php
@@ -20,7 +20,7 @@
 <div class="header-item-content multilanguage">
 	<a class="d-flex align-items-stretch" href="#multiLangModal" title="<?php echo Text::_('MOD_MULTILANGSTATUS'); ?>" data-toggle="modal" role="button">
 		<div class="d-flex align-items-end mx-auto">
-			<span class="fa fa-language" aria-hidden="true"></span>
+			<span class="fas fa-language" aria-hidden="true"></span>
 		</div>
 		<div class="tiny">
 			<?php echo Text::_('MOD_MULTILANGSTATUS'); ?>
diff --git a/administrator/modules/mod_post_installation_messages/tmpl/default.php b/administrator/modules/mod_post_installation_messages/tmpl/default.php
index 4207defc7bdca..928821fee28ad 100644
--- a/administrator/modules/mod_post_installation_messages/tmpl/default.php
+++ b/administrator/modules/mod_post_installation_messages/tmpl/default.php
@@ -23,12 +23,12 @@
 		<button class="dropdown-toggle d-flex flex-column align-items-stretch <?php echo ($hideLinks ? 'disabled' : ''); ?>" data-toggle="dropdown" type="button" <?php echo ($hideLinks ? 'disabled' : ''); ?>
 			title="<?php echo Text::_('MOD_POST_INSTALLATION_MESSAGES'); ?>">
 			<div class="d-flex align-items-end mx-auto">
-				<span class="fa fa-bell" aria-hidden="true"></span>
+				<span class="fas fa-bell" aria-hidden="true"></span>
 			</div>
 			<div class="tiny">
 				<?php echo Text::_('MOD_POST_INSTALLATION_MESSAGES'); ?>
 			</div>
-			<span class="fa fa-angle-down" aria-hidden="true"></span>
+			<span class="fas fa-angle-down" aria-hidden="true"></span>
 			<?php if (count($messages) > 0) : ?>
 				<span class="badge badge-pill badge-danger"><?php echo count($messages); ?></span>
 			<?php endif; ?>
diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php
index 398f06728d28f..58b2611f40fee 100644
--- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php
+++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php
@@ -66,7 +66,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_users'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-users',
+					'image'   => 'fas fa-users',
 					'link'    => Route::_('index.php?option=com_users&view=users'),
 					'linkadd' => Route::_('index.php?option=com_users&task=user.add'),
 					'name'    => 'MOD_QUICKICON_USER_MANAGER',
@@ -85,7 +85,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_menuitems'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-list',
+					'image'   => 'fas fa-list',
 					'link'    => Route::_('index.php?option=com_menus&view=items&menutype='),
 					'linkadd' => Route::_('index.php?option=com_menus&task=item.add'),
 					'name'    => 'MOD_QUICKICON_MENUITEMS_MANAGER',
@@ -104,7 +104,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_articles'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-file-alt',
+					'image'   => 'fas fa-file-alt',
 					'link'    => Route::_('index.php?option=com_content&view=articles'),
 					'linkadd' => Route::_('index.php?option=com_content&task=article.add'),
 					'name'    => 'MOD_QUICKICON_ARTICLE_MANAGER',
@@ -123,7 +123,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_categories'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-folder-open',
+					'image'   => 'fas fa-folder-open',
 					'link'    => Route::_('index.php?option=com_categories&view=categories&extension=com_content'),
 					'linkadd' => Route::_('index.php?option=com_categories&task=category.add'),
 					'name'    => 'MOD_QUICKICON_CATEGORY_MANAGER',
@@ -142,7 +142,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_media'))
 			{
 				self::$buttons[$key][] = [
-					'image'  => 'fa fa-images',
+					'image'  => 'fas fa-images',
 					'link'   => Route::_('index.php?option=com_media'),
 					'name'   => 'MOD_QUICKICON_MEDIA_MANAGER',
 					'access' => array('core.manage', 'com_media'),
@@ -153,7 +153,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_modules'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-cube',
+					'image'   => 'fas fa-cube',
 					'link'    => Route::_('index.php?option=com_modules&view=modules&client_id=0'),
 					'linkadd' => Route::_('index.php?option=com_modules&view=select&client_id=0'),
 					'name'    => 'MOD_QUICKICON_MODULE_MANAGER',
@@ -172,7 +172,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_plugins'))
 			{
 				$tmp = [
-					'image'  => 'fa fa-plug',
+					'image'  => 'fas fa-plug',
 					'link'   => Route::_('index.php?option=com_plugins'),
 					'name'   => 'MOD_QUICKICON_PLUGIN_MANAGER',
 					'access' => array('core.manage', 'com_plugins'),
@@ -190,7 +190,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_templates'))
 			{
 				self::$buttons[$key][] = [
-					'image'  => 'fa fa-paint-brush',
+					'image'  => 'fas fa-paint-brush',
 					'link'   => Route::_('index.php?option=com_templates&view=styles&client_id=0'),
 					'name'   => 'MOD_QUICKICON_TEMPLATES',
 					'access' => array('core.admin', 'com_templates'),
@@ -201,7 +201,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_checkin'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-unlock-alt',
+					'image'   => 'fas fa-unlock-alt',
 					'link'    => Route::_('index.php?option=com_checkin'),
 					'name'    => 'MOD_QUICKICON_CHECKINS',
 					'access'  => array('core.admin', 'com_checkin'),
@@ -219,7 +219,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_cache'))
 			{
 				$tmp = [
-					'image'   => 'fa fa-cloud',
+					'image'   => 'fas fa-cloud',
 					'link'    => Route::_('index.php?option=com_cache'),
 					'name'    => 'MOD_QUICKICON_CACHE',
 					'access'  => array('core.admin', 'com_cache'),
@@ -237,7 +237,7 @@ public static function &getButtons(Registry $params, CMSApplication $application
 			if ($params->get('show_global'))
 			{
 				self::$buttons[$key][] = [
-					'image'  => 'fa fa-cog',
+					'image'  => 'fas fa-cog',
 					'link'   => Route::_('index.php?option=com_config'),
 					'name'   => 'MOD_QUICKICON_GLOBAL_CONFIGURATION',
 					'access' => array('core.manage', 'com_config', 'core.admin', 'com_config'),
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index 31a2be5b6101b..b7379e07c51c4 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -34,7 +34,7 @@
 					name="header_icon"
 					type="text"
 					label="MOD_QUICKICON_HEADER_ICON_LABEL"
-					hint="fa fa-crosshairs"
+					hint="fas fa-crosshairs"
 					default=""
 				/>
 				<field
diff --git a/administrator/modules/mod_sampledata/tmpl/default.php b/administrator/modules/mod_sampledata/tmpl/default.php
index 3a341eda65599..9cc6b7cebdc68 100644
--- a/administrator/modules/mod_sampledata/tmpl/default.php
+++ b/administrator/modules/mod_sampledata/tmpl/default.php
@@ -34,11 +34,11 @@
 			<li class="list-group-item sampledata-<?php echo $item->name; ?>">
 				<div class="d-flex justify-content-between align-items-center">
 					<div class="mr-2">
-						<span class="fa fa-<?php echo $item->icon; ?>" aria-hidden="true"></span>
+						<span class="fas fa-<?php echo $item->icon; ?>" aria-hidden="true"></span>
 						<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
 					</div>
 					<button type="button" class="btn btn-secondary btn-sm apply-sample-data" data-type="<?php echo $item->name; ?>" data-steps="<?php echo $item->steps; ?>">
-						<span class="fa fa-upload" aria-hidden="true"></span> <?php echo Text::_('JLIB_INSTALLER_INSTALL'); ?>
+						<span class="fas fa-upload" aria-hidden="true"></span> <?php echo Text::_('JLIB_INSTALLER_INSTALL'); ?>
 						<span class="sr-only"><?php echo $item->title; ?></span>
 					</button>
 				</div>
@@ -58,7 +58,7 @@
 	</ul>
 <?php else : ?>
 	<div class="alert alert-warning">
-		<span class="fa fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
+		<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 		<?php echo Text::_('MOD_SAMPLEDATA_NOTAVAILABLE'); ?>
 	</div>
 <?php endif; ?>
diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php
index 871b1f98bfb34..b7921e4ceb242 100644
--- a/administrator/modules/mod_stats_admin/tmpl/default.php
+++ b/administrator/modules/mod_stats_admin/tmpl/default.php
@@ -31,7 +31,7 @@
 <ul class="list-group list-group-flush stats-module">
 	<?php foreach ($list as $item) : ?>
 		<li class="list-group-item">
-			<span class="mr-2 fa fa-<?php echo $item->icon; ?> fa-fw" aria-hidden="true"></span> <?php echo $item->title; ?>
+			<span class="mr-2 fas fa-<?php echo $item->icon; ?> fa-fw" aria-hidden="true"></span> <?php echo $item->title; ?>
 
 			<?php if(isset($item->link)) : ?>
 				<a class="btn btn-info btn-sm js-revert" href="<?php echo $item->link; ?>"><?php echo $item->data; ?></a>
diff --git a/administrator/modules/mod_submenu/tmpl/default.php b/administrator/modules/mod_submenu/tmpl/default.php
index 0089a2fee69bd..add16541e95ac 100644
--- a/administrator/modules/mod_submenu/tmpl/default.php
+++ b/administrator/modules/mod_submenu/tmpl/default.php
@@ -19,7 +19,7 @@
 	<?php if ($child->hasChildren()) : ?>
 		<div class="card">
 			<h2 class="card-header">
-				<?php if ($child->icon) : ?><span class="fa fa-<?php echo $child->icon; ?>" aria-hidden="true"></span><?php endif; ?>
+				<?php if ($child->icon) : ?><span class="fas fa-<?php echo $child->icon; ?>" aria-hidden="true"></span><?php endif; ?>
 				<?php echo Text::_($child->title); ?>
 			</h2>
 			<ul class="list-group list-group-flush">
@@ -40,7 +40,7 @@
 								<?php echo ($params->get('menu_text', 1)) ? htmlspecialchars(Text::_($item->title), ENT_QUOTES, 'UTF-8') . $item->iconImage : ''; ?>
 								<?php if ($item->ajaxbadge) : ?>
 									<span class="menu-badge">
-										<span class="fa fa-spin fa-spinner mt-1 system-counter" data-url="<?php echo $item->ajaxbadge; ?>"></span>
+										<span class="fas fa-spin fa-spinner mt-1 system-counter" data-url="<?php echo $item->ajaxbadge; ?>"></span>
 									</span>
 								<?php endif; ?>
 							</a>
@@ -63,7 +63,7 @@
 										$sronly = Text::_($item->title) . ' - ' . $title;
 										?>
 										<a href="<?php echo $link; ?>">
-											<span class="fa fa-<?php echo $icon; ?> fa-xs" title="<?php echo htmlentities($title); ?>" aria-hidden="true"></span>
+											<span class="fas fa-<?php echo $icon; ?> fa-xs" title="<?php echo htmlentities($title); ?>" aria-hidden="true"></span>
 											<span class="sr-only"><?php echo htmlentities($sronly); ?></span>
 										</a>
 									</span>
@@ -72,7 +72,7 @@
 							<?php if ($item->dashboard) : ?>
 								<span class="menu-dashboard">
 									<a href="<?php echo Route::_('index.php?option=com_cpanel&view=cpanel&dashboard=' . $item->dashboard); ?>">
-										<span class="fa fa-th-large" title="<?php echo htmlentities(Text::_('MOD_MENU_DASHBOARD_LINK')); ?>"></span>
+										<span class="fas fa-th-large" title="<?php echo htmlentities(Text::_('MOD_MENU_DASHBOARD_LINK')); ?>"></span>
 									</a>
 								</span>
 							<?php endif; ?>
diff --git a/administrator/modules/mod_user/tmpl/default.php b/administrator/modules/mod_user/tmpl/default.php
index 5393831ee64eb..84dd8ea925068 100644
--- a/administrator/modules/mod_user/tmpl/default.php
+++ b/administrator/modules/mod_user/tmpl/default.php
@@ -24,29 +24,29 @@
 	<button class="dropdown-toggle d-flex flex-column align-items-stretch <?php echo ($hideLinks ? 'disabled' : ''); ?>" data-toggle="dropdown" type="button" <?php echo ($hideLinks ? 'disabled' : ''); ?>
 		title="<?php echo Text::_('MOD_USER_MENU'); ?>">
 		<div class="d-flex align-items-end mx-auto">
-			<span class="fa fa-user-circle" aria-hidden="true"></span>
+			<span class="fas fa-user-circle" aria-hidden="true"></span>
 		</div>
 		<div class="tiny">
 			<?php echo Text::_('MOD_USER_MENU'); ?>
 		</div>
-		<span class="fa fa-angle-down" aria-hidden="true"></span>
+		<span class="fas fa-angle-down" aria-hidden="true"></span>
 	</button>
 	<div class="dropdown-menu dropdown-menu-right">
 		<div class="dropdown-header"><?php echo $user->name; ?></div>
 		<?php $uri   = Uri::getInstance(); ?>
 		<?php $route = 'index.php?option=com_users&task=user.edit&id=' . $user->id . '&return=' . base64_encode($uri); ?>
 		<a class="dropdown-item" href="<?php echo Route::_($route); ?>">
-			<span class="fa fa-fw fa-user" aria-hidden="true"></span>
+			<span class="fas fa-fw fa-user" aria-hidden="true"></span>
 			<?php echo Text::_('MOD_USER_EDIT_ACCOUNT'); ?>
 		</a>
 		<?php $route = 'index.php?option=com_users&task=user.edit&id=' . $user->id . '&return=' . base64_encode($uri); ?>
 		<a class="dropdown-item" href="<?php echo Route::_($route); ?>">
-			<span class="fa fa-fw fa-universal-access" aria-hidden="true"></span>
+			<span class="fas fa-fw fa-universal-access" aria-hidden="true"></span>
 			<?php echo Text::_('MOD_USER_ACCESSIBILITY_SETTINGS'); ?>
 		</a>
 		<?php $route = 'index.php?option=com_login&task=logout&amp;' . Session::getFormToken() . '=1'; ?>
 		<a class="dropdown-item" href="<?php echo Route::_($route); ?>">
-			<span class="fa fa-fw fa-power-off" aria-hidden="true"></span>
+			<span class="fas fa-fw fa-power-off" aria-hidden="true"></span>
 			<?php echo Text::_('JLOGOUT'); ?>
 		</a>
 	</div>
diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
index f4a77b1941b2a..79ac20634a2f4 100644
--- a/administrator/templates/atum/error_full.php
+++ b/administrator/templates/atum/error_full.php
@@ -171,7 +171,7 @@
 					<?php endif; ?>
 					<p>
 						<a href="<?php echo $this->baseurl; ?>" class="btn btn-secondary">
-							<span class="fa fa-dashboard" aria-hidden="true"></span>
+							<span class="fas fa-dashboard" aria-hidden="true"></span>
 							<?php echo Text::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a>
 					</p>
 				</div>
diff --git a/administrator/templates/atum/html/layouts/chromes/body.php b/administrator/templates/atum/html/layouts/chromes/body.php
index 6e15183fe36fd..92cf87cc18a0e 100644
--- a/administrator/templates/atum/html/layouts/chromes/body.php
+++ b/administrator/templates/atum/html/layouts/chromes/body.php
@@ -41,7 +41,7 @@
 				<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
 				<div class="module-actions dropdown">
 					<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
-						<span class="fa fa-cog" aria-hidden="true"></span>
+						<span class="fas fa-cog" aria-hidden="true"></span>
 						<span class="sr-only"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
 					</button>
 					<div class="dropdown-menu dropdown-menu-<?php echo $dropdownPosition; ?>" aria-labelledby="dropdownMenuButton-<?php echo $id; ?>">
diff --git a/administrator/templates/atum/html/layouts/chromes/well.php b/administrator/templates/atum/html/layouts/chromes/well.php
index cf03b48bc982b..ad86de7e11a5f 100644
--- a/administrator/templates/atum/html/layouts/chromes/well.php
+++ b/administrator/templates/atum/html/layouts/chromes/well.php
@@ -51,7 +51,7 @@
 						<?php $dropdownPosition = Factory::getLanguage()->isRTL() ? 'left' : 'right'; ?>
 						<div class="module-actions dropdown">
 							<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn" id="dropdownMenuButton-<?php echo $id; ?>">
-								<span class="fa fa-cog" aria-hidden="true"></span>
+								<span class="fas fa-cog" aria-hidden="true"></span>
 								<span class="sr-only"><?php echo Text::sprintf('JACTION_EDIT_MODULE', $module->title); ?></span>
 							</button>
 							<div class="dropdown-menu dropdown-menu-<?php echo $dropdownPosition; ?>" aria-labelledby="dropdownMenuButton-<?php echo $id; ?>">
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index 23eab61eac586..f2a1cf921e41f 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -136,7 +136,7 @@
 			<div id="sidebarmenu">
 				<div class="sidebar-toggle">
 					<a id="menu-collapse" href="#" aria-label="<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>">
-						<span id="menu-collapse-icon" class="fa fa-toggle-off fa-fw" aria-hidden="true"></span>
+						<span id="menu-collapse-icon" class="fas fa-toggle-off fa-fw" aria-hidden="true"></span>
 						<span class="sidebar-item-title"><?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?></span>
 					</a>
 				</div>
diff --git a/administrator/templates/atum/scss/blocks/_header.scss b/administrator/templates/atum/scss/blocks/_header.scss
index f9e2f16a6c480..04666bf9b5750 100644
--- a/administrator/templates/atum/scss/blocks/_header.scss
+++ b/administrator/templates/atum/scss/blocks/_header.scss
@@ -159,7 +159,7 @@
     }
   }
 
-  .fa,
+  .fas,
   .fab {
     font-size: 1.2rem;
     vertical-align: middle;
@@ -215,7 +215,7 @@
       text-align: right;
     }
 
-    .fa {
+    .fas {
       [dir=ltr] & {
         margin-right: $dropdown-item-padding-x;
       }
@@ -276,7 +276,7 @@
       height: 100%;
       border: 0;
 
-      .fa {
+      .fas {
         margin: auto;
       }
 
diff --git a/administrator/templates/atum/scss/blocks/_quickicons.scss b/administrator/templates/atum/scss/blocks/_quickicons.scss
index 86a06268820c0..8c090405a31f8 100644
--- a/administrator/templates/atum/scss/blocks/_quickicons.scss
+++ b/administrator/templates/atum/scss/blocks/_quickicons.scss
@@ -18,7 +18,7 @@
       background: var(--atum-bg-dark);
     }
 
-    .fa,
+    .fas,
     .fab {
       font-size: $quickicon-icon-size;
       margin: 0 auto;
@@ -127,7 +127,7 @@
 
         &.big {
 
-          .fa,
+          .fas,
           .fab {
             font-size: $quickicon-icon-size-big;
           }
@@ -169,7 +169,7 @@
       border: 1px solid lighten($danger-txt, 30%);
       color: $danger-txt;
 
-      .fa,
+      .fas,
       .fab {
         color: $danger-txt;
       }
@@ -178,7 +178,7 @@
         background: var(--danger);
         color: var(--white);
 
-        .fa,
+        .fas,
         .fab {
           &::before {
             color: var(--white);
@@ -191,7 +191,7 @@
       color: $success-txt;
       border: 1px solid lighten($success-txt, 20%);
 
-      .fa,
+      .fas,
       .fab {
         color: var(--success);
       }
@@ -200,7 +200,7 @@
         background: var(--success);
         color: var(--white);
 
-        .fa,
+        .fas,
         .fab {
           &::before {
             color: var(--white);
diff --git a/administrator/templates/atum/scss/blocks/_sidebar.scss b/administrator/templates/atum/scss/blocks/_sidebar.scss
index 7531d246e2250..44e713af66ee4 100644
--- a/administrator/templates/atum/scss/blocks/_sidebar.scss
+++ b/administrator/templates/atum/scss/blocks/_sidebar.scss
@@ -150,7 +150,7 @@
         display: inline-block;
         height: 100%;
 
-        > .fa {
+        > .fas {
           display: flex;
           padding: 1rem;
           align-items: center;
@@ -161,7 +161,7 @@
         &.mm-active {
           background-color: var(--atum-bg-dark-70);
 
-          .fa {
+          .fas {
             color: var(--atum-contrast);
           }
         }
@@ -190,7 +190,7 @@
     }
   }
 
-  span.fa {
+  span.fas {
     padding: 1rem 0;
   }
 
@@ -420,7 +420,7 @@
   }
 
   // Parent icons
-  .fa {
+  .fas {
     position: relative;
     display: inline-block;
     margin: 0 0.6rem;
@@ -436,7 +436,7 @@
   }
 }
 
-.sidebar-toggle .fa {
+.sidebar-toggle .fas {
   position: relative;
   top: -1px;
   display: inline-block;
@@ -449,7 +449,7 @@
 // Sidebar Closed
 .closed {
 
-  .main-nav span.fa {
+  .main-nav span.fas {
     transform: scale(1.3);
     transition: all .2s ease-in-out;
   }
diff --git a/administrator/templates/atum/scss/pages/_com_cpanel.scss b/administrator/templates/atum/scss/pages/_com_cpanel.scss
index 0258d8a21c0f2..e7afb4c097b5a 100644
--- a/administrator/templates/atum/scss/pages/_com_cpanel.scss
+++ b/administrator/templates/atum/scss/pages/_com_cpanel.scss
@@ -135,7 +135,7 @@
 
       .cpanel-add-module-icon {
 
-        .fa {
+        .fas {
           opacity: 0.3;
         }
       }
@@ -152,7 +152,7 @@
       right: 0;
       bottom: 0;
 
-      .fa {
+      .fas {
         transition: all .3s ease-in;
         font-size: 7rem;
         transform: translateX(-100%);
@@ -166,7 +166,7 @@
     background: var(--toolbar-bg);
   }
 
-  .list-group-item a > span.fa {
+  .list-group-item a > span.fas {
     background: var(--atum-link-color);
     color: rgba(255, 255, 255, .9);
     display: block;
diff --git a/administrator/templates/atum/scss/system/searchtools/searchtools.scss b/administrator/templates/atum/scss/system/searchtools/searchtools.scss
index 1f5310450a732..917a382a4a156 100644
--- a/administrator/templates/atum/scss/system/searchtools/searchtools.scss
+++ b/administrator/templates/atum/scss/system/searchtools/searchtools.scss
@@ -274,7 +274,7 @@
       .js-stools-btn-filter {
         border-right: 1px solid var(--border);
 
-        .fa {
+        .fas {
           margin-left: 0.25rem;
         }
       }
diff --git a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
index 4c0baeaa0629f..3c599762e7cab 100644
--- a/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
+++ b/administrator/templates/atum/scss/vendor/bootstrap/_table.scss
@@ -68,7 +68,8 @@
       margin-bottom: 0;
     }
 
-    .inactive .fa,
+    .inactive .fas,
+    .inactive .fab,
     .inactive [class^=icon-] {
       color: $gray-400;
     }
diff --git a/build/media_source/legacy/js/frontediting.es5.js b/build/media_source/legacy/js/frontediting.es5.js
index 346ab31131dc3..667e75ce27d05 100644
--- a/build/media_source/legacy/js/frontediting.es5.js
+++ b/build/media_source/legacy/js/frontediting.es5.js
@@ -24,7 +24,7 @@
 
 				// Add editing button with tooltip:
 				self.addClass('jmodinside')
-					.prepend('<a class="btn btn-link jmodedit" href="#" target="' + moduleTarget + '"><span class="fa fa-edit"></span></a>')
+					.prepend('<a class="btn btn-link jmodedit" href="#" target="' + moduleTarget + '"><span class="fas fa-edit"></span></a>')
 					.children(":first").attr('href', moduleEditUrl).attr('title', moduleTip)
 					.tooltip({container: $('.jmodedit').parent(), html: true, placement: 'auto'});
 			},
@@ -55,7 +55,7 @@
 				// Get tooltip for menu items from enclosing module
 				var menuEditTip = enclosingModuleDiv.data('jmenuedittip').replace('%s', itemids[1]);
 
-				var content = $('<div><a class="btn jfedit-menu" href="#" target="_blank"><span class="fa fa-edit"></span></a></div>');
+				var content = $('<div><a class="btn jfedit-menu" href="#" target="_blank"><span class="fas fa-edit"></span></a></div>');
 				content.children('a.jfedit-menu').prop('href', menuitemEditUrl).prop('title', menuEditTip);
 
 				if (activePopover) {
diff --git a/build/media_source/templates/atum/js/template.es6.js b/build/media_source/templates/atum/js/template.es6.js
index e91ce616ffc18..18be6427ee013 100644
--- a/build/media_source/templates/atum/js/template.es6.js
+++ b/build/media_source/templates/atum/js/template.es6.js
@@ -170,7 +170,7 @@
         headerMoreBtn.setAttribute('type', 'button');
         headerMoreBtn.setAttribute('title', 'More Elements');
         const spanFa = document.createElement('span');
-        spanFa.className = 'fa fa-ellipsis-h';
+        spanFa.className = 'fas fa-ellipsis-h';
         spanFa.setAttribute('aria-hidden', 'true');
         const headerMoreMenu = document.createElement('div');
         headerMoreMenu.className = 'header-more-menu d-flex flex-wrap';
diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index 8bcb9e372d2dd..922508f39b510 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -23,13 +23,13 @@
 	<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
 		<div class="btn-group mr-2">
 			<button type="button" class="btn btn-primary" data-submit-task="config.apply">
-				<span class="fa fa-check" aria-hidden="true"></span>
+				<span class="fas fa-check" aria-hidden="true"></span>
 				<?php echo Text::_('JSAVE') ?>
 			</button>
 		</div>
 		<div class="btn-group">
 			<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
-				<span class="fa fa-times" aria-hidden="true"></span>
+				<span class="fas fa-times" aria-hidden="true"></span>
 				<?php echo Text::_('JCANCEL') ?>
 			</button>
 		</div>
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index 7b9b7cf456ebd..938285599de5b 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -49,19 +49,19 @@
 			<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
 				<div class="btn-group mr-2">
 					<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
-						<span class="fa fa-check" aria-hidden="true"></span>
+						<span class="fas fa-check" aria-hidden="true"></span>
 						<?php echo Text::_('JAPPLY') ?>
 					</button>
 				</div>
 				<div class="btn-group mr-2">
 					<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
-						<span class="fa fa-check" aria-hidden="true"></span>
+						<span class="fas fa-check" aria-hidden="true"></span>
 						<?php echo Text::_('JSAVE') ?>
 					</button>
 				</div>
 				<div class="btn-group">
 					<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
-						<span class="fa fa-times" aria-hidden="true"></span>
+						<span class="fas fa-times" aria-hidden="true"></span>
 						<?php echo Text::_('JCANCEL') ?>
 					</button>
 				</div>
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index ab2744d718228..ef29c11e95a1d 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -26,13 +26,13 @@
 	<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
 		<div class="btn-group mr-2">
 			<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
-				<span class="fa fa-check" aria-hidden="true"></span>
+				<span class="fas fa-check" aria-hidden="true"></span>
 				<?php echo Text::_('JSAVE') ?>
 			</button>
 		</div>
 		<div class="btn-group">
 			<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
-				<span class="fa fa-times" aria-hidden="true"></span>
+				<span class="fas fa-times" aria-hidden="true"></span>
 				<?php echo Text::_('JCANCEL') ?>
 			</button>
 		</div>
diff --git a/components/com_content/tmpl/form/edit.php b/components/com_content/tmpl/form/edit.php
index a4d418fed066e..ae2da60cbe4a1 100644
--- a/components/com_content/tmpl/form/edit.php
+++ b/components/com_content/tmpl/form/edit.php
@@ -155,11 +155,11 @@
 		</fieldset>
 		<div class="mb-2">
 			<button type="button" class="btn btn-primary" data-submit-task="article.save">
-				<span class="fa fa-check" aria-hidden="true"></span>
+				<span class="fas fa-check" aria-hidden="true"></span>
 				<?php echo Text::_('JSAVE'); ?>
 			</button>
 			<button type="button" class="btn btn-danger" data-submit-task="article.cancel">
-				<span class="fa fa-times" aria-hidden="true"></span>
+				<span class="fas fa-times" aria-hidden="true"></span>
 				<?php echo Text::_('JCANCEL'); ?>
 			</button>
 			<?php if ($params->get('save_history', 0) && $this->item->id) : ?>
diff --git a/components/com_finder/tmpl/search/default_form.php b/components/com_finder/tmpl/search/default_form.php
index d91061590ca4f..43b276b0cf6f5 100644
--- a/components/com_finder/tmpl/search/default_form.php
+++ b/components/com_finder/tmpl/search/default_form.php
@@ -41,18 +41,18 @@
 				<span class="input-group-append">
 				<?php if ($this->escape($this->query->input) != '' || $this->params->get('allow_empty_query')) : ?>
 					<button name="Search" type="submit" class="btn btn-primary">
-						<span class="fa fa-search icon-white" aria-hidden="true"></span>
+						<span class="fas fa-search icon-white" aria-hidden="true"></span>
 						<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>
 					</button>
 				<?php else : ?>
 					<button name="Search" type="submit" class="btn btn-primary disabled">
-						<span class="fa fa-search icon-white" aria-hidden="true"></span>
+						<span class="fas fa-search icon-white" aria-hidden="true"></span>
 						<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>
 					</button>
 				<?php endif; ?>
 				<?php if ($this->params->get('show_advanced', 1)) : ?>
 					<a href="#advancedSearch" data-toggle="collapse" class="btn btn-secondary">
-						<span class="fa fa-search-plus" aria-hidden="true"></span>
+						<span class="fas fa-search-plus" aria-hidden="true"></span>
 						<?php echo Text::_('COM_FINDER_ADVANCED_SEARCH_TOGGLE'); ?></a>
 				<?php endif; ?>
 				</span>
diff --git a/components/com_privacy/tmpl/request/default.php b/components/com_privacy/tmpl/request/default.php
index 927f0f64b43b1..d198a505e3323 100644
--- a/components/com_privacy/tmpl/request/default.php
+++ b/components/com_privacy/tmpl/request/default.php
@@ -49,7 +49,7 @@
 		</form>
 	<?php else : ?>
 		<div class="alert alert-warning">
-			<span class="fa fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
+			<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 			<?php echo Text::_('COM_PRIVACY_WARNING_CANNOT_CREATE_REQUEST_WHEN_SENDMAIL_DISABLED'); ?>
 		</div>
 	<?php endif; ?>
diff --git a/components/com_tags/tmpl/tag/default_items.php b/components/com_tags/tmpl/tag/default_items.php
index 93e267b413059..3117edbaebb6b 100644
--- a/components/com_tags/tmpl/tag/default_items.php
+++ b/components/com_tags/tmpl/tag/default_items.php
@@ -40,10 +40,10 @@
 					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="form-control" title="<?php echo Text::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo Text::_('COM_TAGS_TITLE_FILTER_LABEL'); ?>">
 					<span class="input-group-append">
 						<button type="submit" name="filter-search-button" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>" class="btn btn-secondary">
-							<span class="fa fa-search" aria-hidden="true"></span>
+							<span class="fas fa-search" aria-hidden="true"></span>
 						</button>
 						<button type="reset" name="filter-clear-button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>" class="btn btn-secondary">
-							<span class="fa fa-times" aria-hidden="true"></span>
+							<span class="fas fa-times" aria-hidden="true"></span>
 						</button>
 					</span>
 				</div>
diff --git a/components/com_tags/tmpl/tag/list_items.php b/components/com_tags/tmpl/tag/list_items.php
index 1d612f72093dc..5ce330549be08 100644
--- a/components/com_tags/tmpl/tag/list_items.php
+++ b/components/com_tags/tmpl/tag/list_items.php
@@ -32,10 +32,10 @@
 					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="form-control" title="<?php echo Text::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo Text::_('COM_TAGS_TITLE_FILTER_LABEL'); ?>">
 					<span class="input-group-append">
 						<button type="submit" name="filter-search-button" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>" class="btn btn-secondary">
-							<span class="fa fa-search" aria-hidden="true"></span>
+							<span class="fas fa-search" aria-hidden="true"></span>
 						</button>
 						<button type="reset" name="filter-clear-button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>" class="btn btn-secondary">
-							<span class="fa fa-times" aria-hidden="true"></span>
+							<span class="fas fa-times" aria-hidden="true"></span>
 						</button>
 					</span>
 				</div>
diff --git a/components/com_tags/tmpl/tags/default_items.php b/components/com_tags/tmpl/tags/default_items.php
index a4a49c26352d6..2f41ddfccf6e0 100644
--- a/components/com_tags/tmpl/tags/default_items.php
+++ b/components/com_tags/tmpl/tags/default_items.php
@@ -59,10 +59,10 @@
 						<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="form-control" title="<?php echo Text::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo Text::_('COM_TAGS_TITLE_FILTER_LABEL'); ?>">
 						<span class="input-group-append">
 							<button type="submit" name="filter-search-button" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>" class="btn btn-secondary">
-								<span class="fa fa-search" aria-hidden="true"></span>
+								<span class="fas fa-search" aria-hidden="true"></span>
 							</button>
 							<button type="reset" name="filter-clear-button" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>" class="btn btn-secondary">
-								<span class="fa fa-times" aria-hidden="true"></span>
+								<span class="fas fa-times" aria-hidden="true"></span>
 							</button>
 						</span>
 					</div>
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 01261bcc93dea..d6000836e9831 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -105,12 +105,12 @@
 					<?php echo Text::_('COM_USERS_PROFILE_OTEPS'); ?>
 				</legend>
 				<div class="alert alert-info">
-					<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+					<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 					<?php echo Text::_('COM_USERS_PROFILE_OTEPS_DESC'); ?>
 				</div>
 				<?php if (empty($this->otpConfig->otep)) : ?>
 					<div class="alert alert-warning">
-						<span class="fa fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
+						<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 						<?php echo Text::_('COM_USERS_PROFILE_OTEPS_WAIT_DESC'); ?>
 					</div>
 				<?php else : ?>
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 16a299d9730d9..f0cb30931cf1f 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1473,7 +1473,7 @@ INSERT INTO `#__modules` (`id`, `asset_id`, `title`, `note`, `content`, `orderin
 (3, 41, 'Popular Articles', '', '', 3, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
 (4, 42, 'Recently Added Articles', '', '', 4, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
 (8, 43, 'Toolbar', '', '', 1, 'toolbar', 0, NULL, NULL, NULL, 1, 'mod_toolbar', 3, 1, '', 1, '*'),
-(9, 44, 'Update Checks', '', '', 3, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '{"context":"update_quickicon","header_icon":"fa fa-sync","show_jupdate":"1","show_eupdate":"1","show_oupdate":"1","show_privacy":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}', 1, '*'),
+(9, 44, 'Update Checks', '', '', 3, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '{"context":"update_quickicon","header_icon":"fas fa-sync","show_jupdate":"1","show_eupdate":"1","show_oupdate":"1","show_privacy":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}', 1, '*'),
 (10, 45, 'Logged-in Users', '', '', 2, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
 (12, 46, 'Admin Menu', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
 (15, 49, 'Title', '', '', 1, 'title', 0, NULL, NULL, NULL, 1, 'mod_title', 3, 1, '', 1, '*'),
@@ -1497,9 +1497,9 @@ INSERT INTO `#__modules` (`id`, `asset_id`, `title`, `note`, `content`, `orderin
 (100, 78, 'Messages', '', '', 4, 'status', 0, NULL, NULL, NULL, 1, 'mod_messages', 3, 1, '', 1, '*'),
 (101, 79, 'Post Install Messages', '', '', 3, 'status', 0, NULL, NULL, NULL, 1, 'mod_post_installation_messages', 3, 1, '', 1, '*'),
 (102, 80, 'User Status', '', '', 6, 'status', 0, NULL, NULL, NULL, 1, 'mod_user', 3, 1, '', 1, '*'),
-(103, 70, 'Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fa fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
-(104, 71, 'System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fa fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
-(105, 82, '3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fa fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
+(103, 70, 'Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fas fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
+(104, 71, 'System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fas fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
+(105, 82, '3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fas fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
 (106, 83, 'Help Dashboard', '', '', 1, 'cpanel-help', 0, NULL, NULL, NULL, 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"help","layout":"_:default","moduleclass_sfx":"","style":"System-none","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*'),
 (107, 84, 'Privacy Requests', '', '', 1, 'cpanel-privacy', 0, NULL, NULL, NULL, 1, 'mod_privacy_dashboard', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"cachemode":"static","style":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*'),
 (108, 85, 'Privacy Status', '', '', 1, 'cpanel-privacy', 0, NULL, NULL, NULL, 1, 'mod_privacy_status', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"cachemode":"static","style":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*');
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 7d716fcc91df8..d68ab1fd25e8c 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -1471,7 +1471,7 @@ INSERT INTO "#__modules" ("id", "asset_id", "title", "note", "content", "orderin
 (3, 41, 'Popular Articles', '', '', 3, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
 (4, 42, 'Recently Added Articles', '', '', 4, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
 (8, 43, 'Toolbar', '', '', 1, 'toolbar', 0, NULL, NULL, NULL, 1, 'mod_toolbar', 3, 1, '', 1, '*'),
-(9, 44, 'Update Checks', '', '', 3, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '{"context":"update_quickicon","header_icon":"fa fa-sync","show_jupdate":"1","show_eupdate":"1","show_oupdate":"1","show_privacy":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}', 1, '*'),
+(9, 44, 'Update Checks', '', '', 3, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 3, 1, '{"context":"update_quickicon","header_icon":"fas fa-sync","show_jupdate":"1","show_eupdate":"1","show_oupdate":"1","show_privacy":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"12","header_tag":"h3","header_class":""}', 1, '*'),
 (10, 45, 'Logged-in Users', '', '', 2, 'cpanel', 0, NULL, NULL, NULL, 1, 'mod_logged', 3, 1, '{"count":"5","name":"1","layout":"_:default","moduleclass_sfx":"","cache":"0", "bootstrap_size": "6"}', 1, '*'),
 (12, 46, 'Admin Menu', '', '', 1, 'menu', 0, NULL, NULL, NULL, 1, 'mod_menu', 3, 1, '{"layout":"","moduleclass_sfx":"","shownew":"1","showhelp":"1","cache":"0"}', 1, '*'),
 (15, 49, 'Title', '', '', 1, 'title', 0, NULL, NULL, NULL, 1, 'mod_title', 3, 1, '', 1, '*'),
@@ -1495,9 +1495,9 @@ INSERT INTO "#__modules" ("id", "asset_id", "title", "note", "content", "orderin
 (100, 78, 'Messages', '', '', 4, 'status', 0, NULL, NULL, NULL, 1, 'mod_messages', 3, 1, '', 1, '*'),
 (101, 79, 'Post Install Messages', '', '', 3, 'status', 0, NULL, NULL, NULL, 1, 'mod_post_installation_messages', 3, 1, '', 1, '*'),
 (102, 80, 'User Status', '', '', 6, 'status', 0, NULL, NULL, NULL, 1, 'mod_user', 3, 1, '', 1, '*'),
-(103, 70, 'Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fa fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
-(104, 71, 'System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fa fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
-(105, 82, '3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fa fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
+(103, 70, 'Site', '', '', 1, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"site_quickicon","header_icon":"fas fa-desktop","show_users":"1","show_articles":"1","show_categories":"1","show_media":"1","show_menuItems":"1","show_modules":"1","show_plugins":"1","show_templates":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
+(104, 71, 'System', '', '', 2, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"system_quickicon","header_icon":"fas fa-wrench","show_global":"1","show_checkin":"1","show_cache":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
+(105, 82, '3rd Party', '', '', 4, 'icon', 0, NULL, NULL, NULL, 1, 'mod_quickicon', 1, 1, '{"context":"mod_quickicon","header_icon":"fas fa-boxes","load_plugins":"1","layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"style":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":""}', 1, '*'),
 (106, 83, 'Help Dashboard', '', '', 1, 'cpanel-help', 0, NULL, NULL, NULL, 1, 'mod_submenu', 1, 0, '{"menutype":"*","preset":"help","layout":"_:default","moduleclass_sfx":"","style":"System-none","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*'),
 (107, 84, 'Privacy Requests', '', '', 1, 'cpanel-privacy', 0, NULL, NULL, NULL, 1, 'mod_privacy_dashboard', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"cachemode":"static","style":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*'),
 (108, 85, 'Privacy Status', '', '', 1, 'cpanel-privacy', 0, NULL, NULL, NULL, 1, 'mod_privacy_status', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":1,"cache_time":900,"cachemode":"static","style":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":""}', 1, '*');
diff --git a/installation/template/error.php b/installation/template/error.php
index bb88fe3814233..5b6a205ee04bb 100644
--- a/installation/template/error.php
+++ b/installation/template/error.php
@@ -46,7 +46,7 @@
 				</div>
 				<div class="j-header-help">
 					<a href="https://docs.joomla.org/Special:MyLanguage/J4.x:Installing_Joomla">
-						<span class="fa fa-lightbulb" aria-hidden="true"></span>
+						<span class="fas fa-lightbulb" aria-hidden="true"></span>
 						<span class="sr-only"><?php echo Text::_('INSTL_HELP_LINK'); ?></span>
 					</a>
 				</div>
@@ -62,12 +62,12 @@
 				<div class="container-installation flex">
 					<div class="j-install-step active">
 						<div class="j-install-step-header">
-							<span class="fa fa-exclamation" aria-hidden="true"></span> <?php echo Text::_('INSTL_ERROR'); ?>
+							<span class="fas fa-exclamation" aria-hidden="true"></span> <?php echo Text::_('INSTL_ERROR'); ?>
 						</div>
 						<div class="j-install-step-form">
 							<div class="alert preinstall-alert">
 								<div class="alert-icon">
-									<span class="alert-icon fa fa-exclamation-triangle" aria-hidden="true"></span>
+									<span class="alert-icon fas fa-exclamation-triangle" aria-hidden="true"></span>
 								</div>
 								<div class="alert-text">
 									<h2><?php echo Text::_('JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST'); ?></h2>
diff --git a/installation/template/index.php b/installation/template/index.php
index 903d2459ef790..315340796ccfd 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -74,7 +74,7 @@
 					</div>
 					<div class="d-flex flex-wrap align-items-center mx-auto">
 						<h1 class="h2 mx-1 d-flex align-items-baseline">
-							<span class="fa fa-cogs d-none d-md-block mx-2 alig-items-center" aria-hidden="true"></span>
+							<span class="fas fa-cogs d-none d-md-block mx-2 alig-items-center" aria-hidden="true"></span>
 							<?php echo Text::_('INSTL_PAGE_TITLE'); ?>
 						</h1>
 						<span class="small mx-1">
@@ -83,7 +83,7 @@
 					</div>
 					<div class="m-2 d-flex align-items-center">
 						<a href="https://docs.joomla.org/Special:MyLanguage/J4.x:Installing_Joomla" target="_blank">
-							<span class="fa fa-question" aria-hidden="true"></span>
+							<span class="fas fa-question" aria-hidden="true"></span>
 							<span class="sr-only"><?php echo Text::_('INSTL_HELP_LINK'); ?></span>
 						</a>
 					</div>
diff --git a/installation/template/scss/template-rtl.scss b/installation/template/scss/template-rtl.scss
index 8f7c18e56e90f..e83a91f093deb 100644
--- a/installation/template/scss/template-rtl.scss
+++ b/installation/template/scss/template-rtl.scss
@@ -74,7 +74,7 @@ textarea.noResize {
   content: "";
 }
 
-.j-install-last-step .fa {
+.j-install-last-step .fas {
   display: inline;
 }
 
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index 4cb0105fae333..37dad60610f39 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -127,7 +127,7 @@ body {
   font-size: 3rem;
   opacity: .6;
 
-  .fa {
+  .fas {
     width: 100%;
     text-align: center;
   }
diff --git a/installation/tmpl/preinstall/default.php b/installation/tmpl/preinstall/default.php
index 6c7ea79d5e67e..8881df34119b5 100644
--- a/installation/tmpl/preinstall/default.php
+++ b/installation/tmpl/preinstall/default.php
@@ -18,14 +18,14 @@
 			<div class="col-md-12 mb-4">
 				<div class="j-install-step active">
 					<div class="j-install-step-header">
-						<span class="fa fa-check" aria-hidden="true"></span> <?php echo Text::_('INSTL_PRECHECK_TITLE'); ?>
+						<span class="fas fa-check" aria-hidden="true"></span> <?php echo Text::_('INSTL_PRECHECK_TITLE'); ?>
 					</div>
 					<div class="j-install-step-form">
 						<?php foreach ($this->options as $option) : ?>
 							<?php if ($option->state === 'JNO' || $option->state === false) : ?>
 								<div class="alert preinstall-alert">
 									<div class="alert-icon">
-										<span class="alert-icon fa fa-exclamation-triangle" aria-hidden="true"></span>
+										<span class="alert-icon fas fa-exclamation-triangle" aria-hidden="true"></span>
 									</div>
 									<div class="alert-text">
 										<strong><?php echo $option->label; ?></strong>
@@ -36,8 +36,8 @@
 						<?php endforeach; ?>
 					</div>
 				</div>
-				
-						
+
+
 				<?php if ($option->state === false && preg_match('$configuration.php$', $option->label)) : ?>
 					<div id="ftpOptions" class="ftp-options mb-4 hidden">
 						<form action="index.php" method="post" id="ftpForm" class="form-validate">
diff --git a/installation/tmpl/remove/default.php b/installation/tmpl/remove/default.php
index eda7ca7cf9c5b..7b04cf44c1a84 100644
--- a/installation/tmpl/remove/default.php
+++ b/installation/tmpl/remove/default.php
@@ -18,13 +18,13 @@
 
 	<fieldset id="installCongrat" class="j-install-step active">
 		<legend class="j-install-step-header">
-			<span class="fa fa-trophy" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_CONGRAT'); ?>
+			<span class="fas fa-trophy" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_CONGRAT'); ?>
 		</legend>
 		<div class="j-install-step-form" id="customInstallation">
 			<h2><?php echo Text::_('INSTL_COMPLETE_TITLE'); ?></h2>
 			<p><?php echo Text::_('INSTL_COMPLETE_DESC'); ?></p>
 			<div class="form-group">
-				<button class="btn btn-primary btn-block" id="installAddFeatures"><?php echo Text::_('INSTL_COMPLETE_ADD_PRECONFIG'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
+				<button class="btn btn-primary btn-block" id="installAddFeatures"><?php echo Text::_('INSTL_COMPLETE_ADD_PRECONFIG'); ?> <span class="fas fa-chevron-right" aria-hidden="true"></span></button>
 			</div>
 		</div>
 	</fieldset>
@@ -92,15 +92,15 @@
 				<?php echo HTMLHelper::_('form.token'); ?>
 
 				<div class="form-group j-install-last-step">
-					<a class="btn btn-primary btn-block" href="<?php echo Uri::root(); ?>" title="<?php echo Text::_('JSITE'); ?>"><span class="fa fa-eye" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_SITE_BTN'); ?></a>
-					<a class="btn btn-primary btn-block" href="<?php echo Uri::root(); ?>administrator/" title="<?php echo Text::_('JADMINISTRATOR'); ?>"><span class="fa fa-lock" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_ADMIN_BTN'); ?></a>
+					<a class="btn btn-primary btn-block" href="<?php echo Uri::root(); ?>" title="<?php echo Text::_('JSITE'); ?>"><span class="fas fa-eye" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_SITE_BTN'); ?></a>
+					<a class="btn btn-primary btn-block" href="<?php echo Uri::root(); ?>administrator/" title="<?php echo Text::_('JADMINISTRATOR'); ?>"><span class="fas fa-lock" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_ADMIN_BTN'); ?></a>
 				</div>
 			</div>
 		</div>
 
 		<fieldset id="installLanguages" class="j-install-step">
 			<legend class="j-install-step-header">
-				<span class="fa fa-commenting-o" aria-hidden="true"></span> <?php echo Text::_('INSTL_LANGUAGES'); ?>
+				<span class="far fa-comment-dots" aria-hidden="true"></span> <?php echo Text::_('INSTL_LANGUAGES'); ?>
 			</legend>
 			<div class="j-install-step-form">
 				<?php if (!$this->items) : ?>
@@ -109,7 +109,7 @@
 					<a href="#"
 							class="btn btn-primary"
 							onclick="return Install.goToPage('remove');">
-						<span class="fa fa-arrow-left icon-white" aria-hidden="true"></span>
+						<span class="fas fa-arrow-left icon-white" aria-hidden="true"></span>
 						<?php echo Text::_('INSTL_LANGUAGES_WARNING_BACK_BUTTON'); ?>
 					</a>
 				</p>
diff --git a/installation/tmpl/setup/default.php b/installation/tmpl/setup/default.php
index 9d75d82167999..e9b016f02e4e7 100644
--- a/installation/tmpl/setup/default.php
+++ b/installation/tmpl/setup/default.php
@@ -19,7 +19,7 @@
 	<form action="index.php" method="post" id="languageForm" class="lang-select">
 		<fieldset class="j-install-step active">
 			<legend class="j-install-step-header">
-				<span class="fa fa-language" aria-hidden="true"></span> <?php echo Text::_('INSTL_SELECT_INSTALL_LANG'); ?>
+				<span class="fas fa-language" aria-hidden="true"></span> <?php echo Text::_('INSTL_SELECT_INSTALL_LANG'); ?>
 			</legend>
 			<div class="j-install-step-form">
 				<div class="form-group">
@@ -35,7 +35,7 @@
 	<form action="index.php" method="post" id="adminForm" class="form-validate">
 		<fieldset id="installStep1" class="j-install-step active">
 			<legend class="j-install-step-header">
-				<span class="fa fa-cog" aria-hidden="true"></span> <?php echo Text::_('INSTL_SETUP_SITE_NAME'); ?>
+				<span class="fas fa-cog" aria-hidden="true"></span> <?php echo Text::_('INSTL_SETUP_SITE_NAME'); ?>
 			</legend>
 			<div class="j-install-step-form">
 				<div class="form-group">
@@ -43,13 +43,13 @@
 					<?php echo $this->form->getInput('site_name'); ?>
 				</div>
 				<div class="form-group">
-					<button class="btn btn-primary btn-block" id="step1"><?php echo Text::_('INSTL_SETUP_LOGIN_DATA'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
+					<button class="btn btn-primary btn-block" id="step1"><?php echo Text::_('INSTL_SETUP_LOGIN_DATA'); ?> <span class="fas fa-chevron-right" aria-hidden="true"></span></button>
 				</div>
 			</div>
 		</fieldset>
 		<fieldset id="installStep2" class="j-install-step">
 			<legend class="j-install-step-header">
-				<span class="fa fa-lock" aria-hidden="true"></span> <?php echo Text::_('INSTL_LOGIN_DATA'); ?>
+				<span class="fas fa-lock" aria-hidden="true"></span> <?php echo Text::_('INSTL_LOGIN_DATA'); ?>
 			</legend>
 			<div class="j-install-step-form">
 				<div class="form-group">
@@ -69,13 +69,13 @@
 					<?php echo $this->form->getInput('admin_email'); ?>
 				</div>
 				<div class="form-group">
-					<button class="btn btn-primary btn-block" id="step2"><?php echo Text::_('INSTL_CONNECT_DB'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
+					<button class="btn btn-primary btn-block" id="step2"><?php echo Text::_('INSTL_CONNECT_DB'); ?> <span class="fas fa-chevron-right" aria-hidden="true"></span></button>
 				</div>
 			</div>
 		</fieldset>
 		<fieldset id="installStep3" class="j-install-step" >
 			<legend class="j-install-step-header">
-				<span class="fa fa-database" aria-hidden="true"></span> <?php echo Text::_('INSTL_DATABASE'); ?>
+				<span class="fas fa-database" aria-hidden="true"></span> <?php echo Text::_('INSTL_DATABASE'); ?>
 			</legend>
 			<div class="j-install-step-form">
 				<div class="form-group">
@@ -113,7 +113,7 @@
 					<?php echo $this->form->getInput('db_old'); ?>
 				</div>
 				<div class="form-group">
-					<button class="btn btn-primary btn-block" id="setupButton"><?php echo Text::_('INSTL_INSTALL_JOOMLA'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
+					<button class="btn btn-primary btn-block" id="setupButton"><?php echo Text::_('INSTL_INSTALL_JOOMLA'); ?> <span class="fas fa-chevron-right" aria-hidden="true"></span></button>
 				</div>
 			</div>
 		</fieldset>
diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php
index df977b85611ff..fa7a0e13348a7 100644
--- a/layouts/joomla/content/icons.php
+++ b/layouts/joomla/content/icons.php
@@ -23,7 +23,7 @@
 		<div class="btn-group float-right">
 			<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton-<?php echo $articleId; ?>" aria-label="<?php echo Text::_('JUSER_TOOLS'); ?>"
 				data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="fa fa-cog" aria-hidden="true"></span>
+				<span class="fas fa-cog" aria-hidden="true"></span>
 			</button>
 			<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<?php echo $articleId; ?>">
 				<?php echo HTMLHelper::_('icon.edit', $displayData['item'], $displayData['params']); ?>
diff --git a/layouts/joomla/content/icons/create.php b/layouts/joomla/content/icons/create.php
index 3e6831df9660f..16f2df8a41323 100644
--- a/layouts/joomla/content/icons/create.php
+++ b/layouts/joomla/content/icons/create.php
@@ -20,7 +20,7 @@
 	<?php if ($legacy) : ?>
 		<?php echo HTMLHelper::_('image', 'system/new.png', Text::_('JNEW'), null, true); ?>
 	<?php else : ?>
-		<span class="fa fa-plus" aria-hidden="true"></span>
+		<span class="fas fa-plus" aria-hidden="true"></span>
 		<?php echo Text::_('JNEW'); ?>
 	<?php endif; ?>
 <?php else : ?>
diff --git a/layouts/joomla/content/icons/edit.php b/layouts/joomla/content/icons/edit.php
index cb0c7805debb3..448c1208612f0 100644
--- a/layouts/joomla/content/icons/edit.php
+++ b/layouts/joomla/content/icons/edit.php
@@ -45,6 +45,6 @@
 <?php if ($legacy) : ?>
 	<?php echo HTMLHelper::_('image', 'system/' . $icon, Text::_('JGLOBAL_EDIT'), null, true); ?>
 <?php else : ?>
-	<span class="hasTooltip fa fa-<?php echo $icon; ?>" title="<?php echo HTMLHelper::tooltipText(Text::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
+	<span class="hasTooltip fas fa-<?php echo $icon; ?>" title="<?php echo HTMLHelper::tooltipText(Text::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
 	<?php echo Text::_('JGLOBAL_EDIT'); ?>
 <?php endif; ?>
diff --git a/layouts/joomla/content/icons/edit_lock.php b/layouts/joomla/content/icons/edit_lock.php
index 841a502b529f7..2c4710b23fad9 100644
--- a/layouts/joomla/content/icons/edit_lock.php
+++ b/layouts/joomla/content/icons/edit_lock.php
@@ -22,6 +22,6 @@
 	</span>
 	<?php echo Text::_('JLIB_HTML_CHECKED_OUT'); ?>
 <?php else : ?>
-	<span class="hasTooltip fa fa-lock" title="<?php echo HTMLHelper::tooltipText($tooltip . '', 0); ?>"></span>
+	<span class="hasTooltip fas fa-lock" title="<?php echo HTMLHelper::tooltipText($tooltip . '', 0); ?>"></span>
 	<?php echo Text::_('JLIB_HTML_CHECKED_OUT'); ?>
 <?php endif; ?>
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 7a0e69bcba33e..6c527c61eafb5 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
-	<span class="fa fa-user" aria-hidden="true"></span>
+	<span class="fas fa-user" aria-hidden="true"></span>
 	<?php $author = ($displayData['item']->created_by_alias ?: $displayData['item']->author); ?>
 	<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index 8fecccf51232a..2063a3fbcdf9a 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -15,7 +15,7 @@
 
 ?>
 <dd class="category-name">
-	<span class="fa fa-folder-open" aria-hidden="true"></span>
+	<span class="fas fa-folder-open" aria-hidden="true"></span>
 	<?php $title = $this->escape($displayData['item']->category_title); ?>
 	<?php if ($displayData['params']->get('link_category') && !empty($displayData['item']->catid)) : ?>
 		<?php $url = '<a href="' . Route::_(
diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php
index d311643712789..e1ee3befbfac3 100644
--- a/layouts/joomla/content/info_block/create_date.php
+++ b/layouts/joomla/content/info_block/create_date.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="create">
-	<span class="fa fa-calendar" aria-hidden="true"></span>
+	<span class="fas fa-calendar" aria-hidden="true"></span>
 	<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
 		<?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $displayData['item']->created, Text::_('DATE_FORMAT_LC3'))); ?>
 	</time>
diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php
index dfc5a75730a15..b095ecdde3018 100644
--- a/layouts/joomla/content/info_block/hits.php
+++ b/layouts/joomla/content/info_block/hits.php
@@ -13,7 +13,7 @@
 
 ?>
 <dd class="hits">
-	<span class="fa fa-eye" aria-hidden="true"></span>
+	<span class="fas fa-eye" aria-hidden="true"></span>
 	<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>">
 	<?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
 </dd>
diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php
index dad96b8ef7382..3ec1c05bc39d5 100644
--- a/layouts/joomla/content/info_block/modify_date.php
+++ b/layouts/joomla/content/info_block/modify_date.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="modified">
-	<span class="fa fa-calendar" aria-hidden="true"></span>
+	<span class="fas fa-calendar" aria-hidden="true"></span>
 	<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
 		<?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $displayData['item']->modified, Text::_('DATE_FORMAT_LC3'))); ?>
 	</time>
diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php
index d395afb315720..1b6fd55d6e0f7 100644
--- a/layouts/joomla/content/info_block/publish_date.php
+++ b/layouts/joomla/content/info_block/publish_date.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="published">
-	<span class="fa fa-calendar" aria-hidden="true"></span>
+	<span class="fas fa-calendar" aria-hidden="true"></span>
 	<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
 		<?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $displayData['item']->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
 	</time>
diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
index 78ceec1d11ffd..5d0e5da4927bd 100644
--- a/layouts/joomla/content/readmore.php
+++ b/layouts/joomla/content/readmore.php
@@ -22,12 +22,12 @@
 	<?php if (!$params->get('access-view')) : ?>
 		<a class="btn btn-secondary" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo Text::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
 			<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<?php echo '<span class="fa fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
+			<?php echo '<span class="fas fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
 			<?php echo Text::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
 		</a>
 	<?php elseif ($readmore = $item->alternative_readmore) : ?>
 		<a class="btn btn-secondary" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<?php echo '<span class="fa fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
+			<?php echo '<span class="fas fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
 			<?php echo $readmore; ?>
 			<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
 				<?php echo HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
@@ -35,12 +35,12 @@
 		</a>
 	<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
 		<a class="btn btn-secondary" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo Text::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<?php echo '<span class="fa fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
+			<?php echo '<span class="fas fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
 			<?php echo Text::sprintf('COM_CONTENT_READ_MORE_TITLE'); ?>
 		</a>
 	<?php else : ?>
 		<a class="btn btn-secondary" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo Text::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<?php echo '<span class="fa fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
+			<?php echo '<span class="fas fa-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
 			<?php echo Text::_('COM_CONTENT_READ_MORE'); ?>
 			<?php echo HTMLHelper::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
 		</a>
diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php
index 7ff0db119aed9..d190eab4d590c 100644
--- a/layouts/joomla/edit/metadata.php
+++ b/layouts/joomla/edit/metadata.php
@@ -20,7 +20,7 @@
 <?php foreach ($fieldSets as $name => $fieldSet) : ?>
 	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
 		<div class="alert alert-info">
-			<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+			<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 			<?php echo $this->escape(Text::_($fieldSet->description)); ?>
 		</div>
 	<?php endif; ?>
diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php
index edaf5c848a016..f8a59a807d2b9 100644
--- a/layouts/joomla/form/field/calendar.php
+++ b/layouts/joomla/form/field/calendar.php
@@ -132,7 +132,7 @@
 				<?php echo isset($minYear) && strlen($minYear) ? 'data-min-year="' . $minYear . '"' : ''; ?>
 				<?php echo isset($maxYear) && strlen($maxYear) ? 'data-max-year="' . $maxYear . '"' : ''; ?>
 				title="<?php echo Text::_('JLIB_HTML_BEHAVIOR_OPEN_CALENDAR'); ?>"
-			><span class="fa fa-calendar" aria-hidden="true"></span></button>
+			><span class="fas fa-calendar" aria-hidden="true"></span></button>
 		</span>
 		<?php if (!$readonly && !$disabled) : ?>
 	</div>
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index b0bfce3742eaf..0b7eb1e315303 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -64,6 +64,6 @@
 
 ?>
 <button type="button" onclick="document.getElementById('versionsModal').open()" class="btn btn-secondary" data-toggle="modal">
-	<span class="fa fa-code-branch" aria-hidden="true"></span>
+	<span class="fas fa-code-branch" aria-hidden="true"></span>
 	<?php echo $label; ?>
 </button>
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index 31dc6d00888d8..80fcc4664ca2a 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -155,7 +155,7 @@
 		<?php if ($disabled != true) : ?>
 			<div class="input-group-append">
 				<button type="button" class="btn btn-secondary button-select"><?php echo Text::_("JLIB_FORM_BUTTON_SELECT"); ?></button>
-				<button type="button" class="btn btn-secondary button-clear"><span class="fa fa-times" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_("JLIB_FORM_BUTTON_CLEAR"); ?></span></button>
+				<button type="button" class="btn btn-secondary button-clear"><span class="fas fa-times" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_("JLIB_FORM_BUTTON_CLEAR"); ?></span></button>
 			</div>
 		<?php endif; ?>
 	</div>
diff --git a/layouts/joomla/form/field/rules.php b/layouts/joomla/form/field/rules.php
index 6f248711d617e..948329208b1c6 100644
--- a/layouts/joomla/form/field/rules.php
+++ b/layouts/joomla/form/field/rules.php
@@ -175,7 +175,7 @@ class="custom-select novalidate"
 									if ($isSuperUserGroup)
 									{
 										$result['class'] = 'badge badge-success';
-										$result['text']  = '<span class="fa fa-lock icon-white" aria-hidden="true"></span>' . Text::_('JLIB_RULES_ALLOWED_ADMIN');
+										$result['text']  = '<span class="fas fa-lock icon-white" aria-hidden="true"></span>' . Text::_('JLIB_RULES_ALLOWED_ADMIN');
 									}
 									else
 									{
@@ -232,7 +232,7 @@ class="custom-select novalidate"
 										elseif ($inheritedGroupParentAssetRule === false || $inheritedParentGroupRule === false)
 										{
 											$result['class'] = 'badge badge-danger';
-											$result['text']  = '<span class="fa fa-lock icon-white" aria-hidden="true"></span>'. Text::_('JLIB_RULES_NOT_ALLOWED_LOCKED');
+											$result['text']  = '<span class="fas fa-lock icon-white" aria-hidden="true"></span>'. Text::_('JLIB_RULES_NOT_ALLOWED_LOCKED');
 										}
 									}
 									?>
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index e900690de9c0a..0ea80212304d7 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -47,7 +47,7 @@
 
 		if ($fieldset->description)
 		{
-			$table_head .= '<span class="fa fa-info-circle" aria-hidden="true" tabindex="0"></span><div role="tooltip" id="tip-' . $field->id . '">' . Text::_($field->description) . '</div>';
+			$table_head .= '<span class="fas fa-info-circle" aria-hidden="true" tabindex="0"></span><div role="tooltip" id="tip-' . $field->id . '">' . Text::_($field->description) . '</div>';
 		}
 
 		$table_head .= '</th>';
@@ -62,7 +62,7 @@
 
 		if ($field->description)
 		{
-			$table_head .= '<span class="fa fa-info-circle" aria-hidden="true" tabindex="0"></span><div role="tooltip" id="tip-' . $field->id . '">' . Text::_($field->description) . '</div>';
+			$table_head .= '<span class="fas fa-info-circle" aria-hidden="true" tabindex="0"></span><div role="tooltip" id="tip-' . $field->id . '">' . Text::_($field->description) . '</div>';
 		}
 
 		$table_head .= '</th>';
@@ -94,7 +94,7 @@
 							<?php if (!empty($buttons['add'])) : ?>
 								<div class="btn-group">
 									<button type="button" class="group-add btn btn-sm btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
-										<span class="fa fa-plus" aria-hidden="true"></span>
+										<span class="fas fa-plus" aria-hidden="true"></span>
 									</button>
 								</div>
 							<?php endif; ?>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
index acb0773c31cab..d421fd79111bd 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
@@ -36,17 +36,17 @@
 		<div class="btn-group">
 			<?php if (!empty($buttons['add'])) : ?>
 				<button type="button" class="group-add btn btn-sm btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
-					<span class="fa fa-plus" aria-hidden="true"></span>
+					<span class="fas fa-plus" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 			<?php if (!empty($buttons['remove'])) : ?>
 				<button type="button" class="group-remove btn btn-sm btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>">
-					<span class="fa fa-minus" aria-hidden="true"></span>
+					<span class="fas fa-minus" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 			<?php if (!empty($buttons['move'])) : ?>
 				<button type="button" class="group-move btn btn-sm btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>">
-					<span class="fa fa-arrows-alt" aria-hidden="true"></span>
+					<span class="fas fa-arrows-alt" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 		</div>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php
index 6c9817f7263bf..fe61146d586ef 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -34,17 +34,17 @@
 		<div class="btn-group">
 			<?php if (!empty($buttons['add'])) : ?>
 				<button type="button" class="group-add btn btn-sm btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
-					<span class="fa fa-plus" aria-hidden="true"></span>
+					<span class="fas fa-plus" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 			<?php if (!empty($buttons['remove'])) : ?>
 				<button type="button" class="group-remove btn btn-sm btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>">
-					<span class="fa fa-minus" aria-hidden="true"></span>
+					<span class="fas fa-minus" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 			<?php if (!empty($buttons['move'])) : ?>
 				<button type="button" class="group-move btn btn-sm btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>">
-					<span class="fa fa-arrows-alt" aria-hidden="true"></span>
+					<span class="fas fa-arrows-alt" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 		</div>
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index 2eeccb910919a..eda34f3b53df8 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -48,7 +48,7 @@
 			<div class="btn-toolbar">
 				<div class="btn-group">
 					<a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>" tabindex="0">
-						<span class="fa fa-plus icon-white" aria-hidden="true"></span> </a>
+						<span class="fas fa-plus icon-white" aria-hidden="true"></span> </a>
 				</div>
 			</div>
 			<?php endif; ?>
diff --git a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
index aaf7541ea9d2e..b81feb9e4a24a 100644
--- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -26,9 +26,9 @@
 	<?php if (!empty($buttons)) : ?>
 	<div class="btn-toolbar text-right">
 		<div class="btn-group">
-			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>" tabindex="0"><span class="fa fa-plus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
-			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-sm button btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>" tabindex="0"><span class="fa fa-minus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
-			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-sm button btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="fa fa-arrows-alt icon-white" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>" tabindex="0"><span class="fas fa-plus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-sm button btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>" tabindex="0"><span class="fas fa-minus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-sm button btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="fas fa-arrows-alt icon-white" aria-hidden="true"></span> </a><?php endif; ?>
 		</div>
 	</div>
 	<?php endif; ?>
diff --git a/layouts/joomla/form/field/subform/repeatable/section.php b/layouts/joomla/form/field/subform/repeatable/section.php
index ca376f4e70398..1d061aaa460bb 100644
--- a/layouts/joomla/form/field/subform/repeatable/section.php
+++ b/layouts/joomla/form/field/subform/repeatable/section.php
@@ -27,9 +27,9 @@
 	<?php if (!empty($buttons)) : ?>
 	<div class="btn-toolbar text-right">
 		<div class="btn-group">
-			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>" tabindex="0"><span class="fa fa-plus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
-			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-sm button btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>" tabindex="0"><span class="fa fa-minus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
-			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-sm button btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="fa fa-arrows-alt icon-white" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>" tabindex="0"><span class="fas fa-plus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-sm button btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>" tabindex="0"><span class="fas fa-minus icon-white" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-sm button btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="fas fa-arrows-alt icon-white" aria-hidden="true"></span> </a><?php endif; ?>
 		</div>
 	</div>
 	<?php endif; ?>
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index 2f06074285001..a9c7c59f483a0 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -114,7 +114,7 @@
 		<?php if (!$readonly) : ?>
 			<span class="input-group-append">
 				<button type="button" class="btn btn-primary button-select" title="<?php echo Text::_('JLIB_FORM_CHANGE_USER'); ?>">
-					<span class="fa fa-user icon-white" aria-hidden="true"></span>
+					<span class="fas fa-user icon-white" aria-hidden="true"></span>
 					<span class="sr-only"><?php echo Text::_('JLIB_FORM_CHANGE_USER'); ?></span>
 				</button>
 			</span>
diff --git a/layouts/joomla/pagination/link.php b/layouts/joomla/pagination/link.php
index 449fdb283c3ba..11c2795f5d478 100644
--- a/layouts/joomla/pagination/link.php
+++ b/layouts/joomla/pagination/link.php
@@ -20,26 +20,26 @@
 {
 	// Check for "Start" item
 	case Text::_('JLIB_HTML_START') :
-		$icon = 'fa fa-angle-double-left';
+		$icon = 'fas fa-angle-double-left';
 		$aria = Text::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
 		break;
 
 	// Check for "Prev" item
 	case $item->text === Text::_('JPREV') :
 		$item->text = Text::_('JPREVIOUS');
-		$icon = 'fa fa-angle-left';
+		$icon = 'fas fa-angle-left';
 		$aria =Text::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
 		break;
 
 	// Check for "Next" item
 	case Text::_('JNEXT') :
-		$icon = 'fa fa-angle-right';
+		$icon = 'fas fa-angle-right';
 		$aria = Text::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
 		break;
 
 	// Check for "End" item
 	case Text::_('JLIB_HTML_END') :
-		$icon = 'fa fa-angle-double-right';
+		$icon = 'fas fa-angle-double-right';
 		$aria = Text::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
 		break;
 
diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php
index 5cbf59b9159bc..640bc9774d14c 100644
--- a/layouts/joomla/quickicons/icon.php
+++ b/layouts/joomla/quickicons/icon.php
@@ -56,9 +56,9 @@
 		<li class="quickicon-group col mb-3 d-flex">
 		<ul class="list-unstyled d-flex w-100">
 			<li class="quickicon flex-grow-1">
-	<?php else: ?>		
+	<?php else: ?>
 		<li class="quickicon quickicon-single col mb-3">
-	<?php endif; ?>	
+	<?php endif; ?>
 
 		<a <?php echo $id . $class; ?> href="<?php echo $displayData['link']; ?>"<?php echo $target . $onclick . $title; ?>>
 			<?php if (isset($displayData['image'])): ?>
@@ -68,7 +68,7 @@
 			<?php endif; ?>
 			<?php if (isset($displayData['ajaxurl'])) : ?>
 				<div class="quickicon-amount" <?php echo $dataUrl ?> aria-hidden="true">
-					<span class="fa fa-spinner" aria-hidden="true"></span>
+					<span class="fas fa-spinner" aria-hidden="true"></span>
 				</div>
 				<div class="quickicon-sr-desc sr-only"></div>
 			<?php endif; ?>
@@ -90,7 +90,7 @@
 	if (isset($displayData['linkadd'])): ?>
 		<li class="btn-block quickicon-linkadd j-links-link d-flex">
 			<a class="d-flex align-items-center" href="<?php echo $displayData['linkadd']; ?>" title="<?php echo Text::_($displayData['name'] . '_ADD'); ?>">
-				<span class="fa fa-plus" aria-hidden="true"></span>
+				<span class="fas fa-plus" aria-hidden="true"></span>
 			</a>
 		</li>
 	</ul>
diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php
index 1e5a35d59a3c3..987c580d6adf9 100644
--- a/layouts/joomla/searchtools/default/bar.php
+++ b/layouts/joomla/searchtools/default/bar.php
@@ -48,7 +48,7 @@
 				<?php endif; ?>
 				<span class="input-group-append">
 					<button type="submit" class="btn btn-primary" aria-label="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
-						<span class="fa fa-search" aria-hidden="true"></span>
+						<span class="fas fa-search" aria-hidden="true"></span>
 					</button>
 				</span>
 			</div>
@@ -57,7 +57,7 @@
 			<?php if ($filterButton) : ?>
 				<button type="button" class="btn btn-primary js-stools-btn-filter">
 					<?php echo Text::_('JFILTER_OPTIONS'); ?>
-					<span class="fa fa-angle-down" aria-hidden="true"></span>
+					<span class="fas fa-angle-down" aria-hidden="true"></span>
 				</button>
 			<?php endif; ?>
 			<button type="button" class="btn btn-primary js-stools-btn-clear mr-2">
diff --git a/layouts/joomla/searchtools/default/noitems.php b/layouts/joomla/searchtools/default/noitems.php
index 36dfa44cae8ee..d48f1e6a402bb 100644
--- a/layouts/joomla/searchtools/default/noitems.php
+++ b/layouts/joomla/searchtools/default/noitems.php
@@ -14,6 +14,6 @@
 $data = $displayData;
 ?>
 <div class="alert alert-info">
-	<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+	<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 	<?php echo $data['options']['noResultsText']; ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index ffc2a6a7d550d..e1671af844896 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -24,6 +24,6 @@
 $alert = "Joomla.renderMessages(" . $message . ")";
 ?>
 <button<?php echo $id; ?> type="button" data-toggle="modal" onclick="if (document.adminForm.boxchecked.value==0){<?php echo $alert; ?>}else{document.getElementById('collapseModal').open(); return true;}" class="btn btn-primary">
-	<span class="fa fa-square" aria-hidden="true"></span>
+	<span class="fas fa-square" aria-hidden="true"></span>
 	<?php echo $title; ?>
 </button>
diff --git a/layouts/joomla/toolbar/modal.php b/layouts/joomla/toolbar/modal.php
index 1f05e0639a26f..4561c2b171cdf 100644
--- a/layouts/joomla/toolbar/modal.php
+++ b/layouts/joomla/toolbar/modal.php
@@ -29,7 +29,7 @@
 $selector = $displayData['selector'];
 $id       = isset($displayData['id']) ? $displayData['id'] : '';
 $class    = isset($displayData['class']) ? $displayData['class'] : 'btn btn-secondary';
-$icon     = isset($displayData['icon']) ? $displayData['icon'] : 'fa fa-download';
+$icon     = isset($displayData['icon']) ? $displayData['icon'] : 'fas fa-download';
 $text     = isset($displayData['text']) ? $displayData['text'] : '';
 ?>
 
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index db889ad7082a9..fe971722ac3e0 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -59,7 +59,7 @@ class="btn btn-sm btn-primary"
 		type="button"
 		onclick="document.getElementById('versionsModal').open()"
 		data-toggle="modal">
-		<span class="fa fa-code-branch" aria-hidden="true"></span>
+		<span class="fas fa-code-branch" aria-hidden="true"></span>
 		<?php echo $title; ?>
 	</button>
-</joomla-toolbar-button>
\ No newline at end of file
+</joomla-toolbar-button>
diff --git a/libraries/src/Toolbar/Button/HelpButton.php b/libraries/src/Toolbar/Button/HelpButton.php
index 36e5ac3be1cfe..0a25376e63333 100644
--- a/libraries/src/Toolbar/Button/HelpButton.php
+++ b/libraries/src/Toolbar/Button/HelpButton.php
@@ -41,7 +41,7 @@ class HelpButton extends BasicButton
 	protected function prepareOptions(array &$options)
 	{
 		$options['text'] = $options['text'] ?: 'JTOOLBAR_HELP';
-		$options['icon'] = $options['icon'] ?? 'fa fa-question';
+		$options['icon'] = $options['icon'] ?? 'fas fa-question';
 		$options['button_class'] = $options['button_class'] ?? 'btn btn-info';
 		$options['onclick'] = $options['onclick'] ?? $this->_getCommand();
 
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 85f0c899c5e22..a0437c70946f1 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -20,7 +20,7 @@
 			</li>
 		<?php else : ?>
 			<li class="mod-breadcrumbs__divider float-left">
-				<span class="divider fa fa-location" aria-hidden="true"></span>
+				<span class="divider fas fa-location" aria-hidden="true"></span>
 			</li>
 		<?php endif; ?>
 
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index a516e363c842f..fdc3aa39cab6b 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -33,7 +33,7 @@
 	$output .= '<div class="mod-finder__search input-group">';
 	$output .= $input;
 	$output .= '<span class="input-group-append">';
-	$output .= '<button class="btn btn-primary" type="submit"><span class="fa fa-search icon-white" aria-hidden="true"></span> ' . Text::_('JSEARCH_FILTER_SUBMIT') . '</button>';
+	$output .= '<button class="btn btn-primary" type="submit"><span class="fas fa-search icon-white" aria-hidden="true"></span> ' . Text::_('JSEARCH_FILTER_SUBMIT') . '</button>';
 	$output .= '</span>';
 	$output .= '</div>';
 }
diff --git a/modules/mod_tags_popular/tmpl/cloud.php b/modules/mod_tags_popular/tmpl/cloud.php
index a05f7134247a9..e5e84ff259f08 100644
--- a/modules/mod_tags_popular/tmpl/cloud.php
+++ b/modules/mod_tags_popular/tmpl/cloud.php
@@ -21,7 +21,7 @@
 <?php
 if (!count($list)) : ?>
 	<div class="alert alert-info">
-		<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+		<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 		<?php echo Text::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?>
 	</div>
 <?php else :
diff --git a/modules/mod_tags_popular/tmpl/default.php b/modules/mod_tags_popular/tmpl/default.php
index e0fa37f9018d4..64638575666fc 100644
--- a/modules/mod_tags_popular/tmpl/default.php
+++ b/modules/mod_tags_popular/tmpl/default.php
@@ -17,7 +17,7 @@
 <div class="mod-tagspopular tagspopular">
 <?php if (!count($list)) : ?>
 	<div class="alert alert-info">
-		<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+		<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 		<?php echo Text::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?>
 	</div>
 <?php else : ?>
diff --git a/plugins/quickicon/downloadkey/downloadkey.php b/plugins/quickicon/downloadkey/downloadkey.php
index d9a248720bd35..c6e481dd14827 100644
--- a/plugins/quickicon/downloadkey/downloadkey.php
+++ b/plugins/quickicon/downloadkey/downloadkey.php
@@ -67,7 +67,7 @@ public function onGetIcons($context)
 
 		$iconDefinition = [
 			'link'  => 'index.php?option=com_installer&view=updatesites&filter[supported]=1',
-			'image' => 'fa fa-key',
+			'image' => 'fas fa-key',
 			'icon'  => '',
 			'text'  => Text::_('PLG_QUICKICON_DOWNLOADKEY_OK'),
 			'class' => 'success',
diff --git a/plugins/quickicon/extensionupdate/extensionupdate.php b/plugins/quickicon/extensionupdate/extensionupdate.php
index cbe7e41d928c4..a46a6408c4db6 100644
--- a/plugins/quickicon/extensionupdate/extensionupdate.php
+++ b/plugins/quickicon/extensionupdate/extensionupdate.php
@@ -80,7 +80,7 @@ public function onGetIcons($context)
 		return array(
 			array(
 				'link'  => 'index.php?option=com_installer&view=update&task=update.find&' . $token,
-				'image' => 'fa fa-star',
+				'image' => 'fas fa-star',
 				'icon'  => '',
 				'text'  => Text::_('PLG_QUICKICON_EXTENSIONUPDATE_CHECKING'),
 				'id'    => 'plg_quickicon_extensionupdate',
diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php
index ae6e2b5a67127..b709f4867396e 100644
--- a/plugins/quickicon/overridecheck/overridecheck.php
+++ b/plugins/quickicon/overridecheck/overridecheck.php
@@ -86,7 +86,7 @@ public function onGetIcons($context)
 		return array(
 			array(
 				'link'  => 'index.php?option=com_templates&view=templates',
-				'image' => 'fa fa-file',
+				'image' => 'fas fa-file',
 				'icon'  => '',
 				'text'  => Text::_('PLG_QUICKICON_OVERRIDECHECK_CHECKING'),
 				'id'    => 'plg_quickicon_overridecheck',
diff --git a/plugins/quickicon/privacycheck/privacycheck.php b/plugins/quickicon/privacycheck/privacycheck.php
index f33647ba95e09..49fed47966777 100644
--- a/plugins/quickicon/privacycheck/privacycheck.php
+++ b/plugins/quickicon/privacycheck/privacycheck.php
@@ -75,7 +75,7 @@ public function onGetIcons($context)
 		return array(
 			array(
 				'link'  => $privacy . '&view=requests&filter[status]=1&list[fullordering]=a.requested_at ASC',
-				'image' => 'fa fa-users',
+				'image' => 'fas fa-users',
 				'icon'  => '',
 				'text'  => Text::_('PLG_QUICKICON_PRIVACYCHECK_CHECKING'),
 				'id'    => 'plg_quickicon_privacycheck',
diff --git a/plugins/twofactorauth/totp/tmpl/form.php b/plugins/twofactorauth/totp/tmpl/form.php
index 4cb3fbe136d85..4c623681cb35d 100644
--- a/plugins/twofactorauth/totp/tmpl/form.php
+++ b/plugins/twofactorauth/totp/tmpl/form.php
@@ -58,7 +58,7 @@
 		</li>
 	</ul>
 	<div class="alert alert-warning">
-		<span class="fa fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
+		<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 		<?php echo Text::_('PLG_TWOFACTORAUTH_TOTP_STEP1_WARN'); ?>
 	</div>
 </fieldset>
@@ -101,7 +101,7 @@
 	</div>
 
 	<div class="alert alert-info">
-		<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
+		<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
 		<?php echo Text::_('PLG_TWOFACTORAUTH_TOTP_STEP2_RESET'); ?>
 	</div>
 </fieldset>
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 886455987961d..6bbcc9810c903 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -90,7 +90,7 @@
 
 			<?php if ($this->countModules('menu') || $this->countModules('search')) : ?>
 				<button class="navbar-toggler navbar-toggler-right" type="button" aria-hidden="true" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="<?php echo Text::_('TPL_CASSIOPEIA_TOGGLE'); ?>">
-					<span class="fa fa-bars"></span>
+					<span class="fas fa-bars"></span>
 				</button>
 				<div class="collapse navbar-collapse" id="navbar">
 					<jdoc:include type="modules" name="menu" style="none" />
@@ -150,7 +150,7 @@
 						<li><?php echo Text::_('JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE'); ?></li>
 					</ul>
 					<p><?php echo Text::_('JERROR_LAYOUT_GO_TO_THE_HOME_PAGE'); ?></p>
-					<p><a href="<?php echo $this->baseurl; ?>/index.php" class="btn btn-secondary"><span class="fa fa-home" aria-hidden="true"></span> <?php echo Text::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></p>
+					<p><a href="<?php echo $this->baseurl; ?>/index.php" class="btn btn-secondary"><span class="fas fa-home" aria-hidden="true"></span> <?php echo Text::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></p>
 					<hr>
 					<p><?php echo Text::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?></p>
 					<blockquote>
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index bb9c2a052f2b3..e48977882225a 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -104,7 +104,7 @@
 
 				<?php if ($this->countModules('menu') || $this->countModules('search')) : ?>
 					<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="<?php echo Text::_('TPL_CASSIOPEIA_TOGGLE'); ?>">
-						<span class="fa fa-bars" aria-hidden="true"></span>
+						<span class="fas fa-bars" aria-hidden="true"></span>
 					</button>
 					<div class="collapse navbar-collapse" id="navbar">
 						<jdoc:include type="modules" name="menu" style="none" />
diff --git a/templates/cassiopeia/scss/blocks/_header.scss b/templates/cassiopeia/scss/blocks/_header.scss
index 5e0b4992f085b..9267d2de4e3f5 100644
--- a/templates/cassiopeia/scss/blocks/_header.scss
+++ b/templates/cassiopeia/scss/blocks/_header.scss
@@ -117,7 +117,7 @@
     cursor: default;
     border: 1px solid $white-offset;
 
-    .fa {
+    .fas {
       font-size: 24px;
     }
   }