diff --git a/layouts/joomla/searchtools/default.php b/layouts/joomla/searchtools/default.php
index 1f86345836b33..5d9341d1b5679 100644
--- a/layouts/joomla/searchtools/default.php
+++ b/layouts/joomla/searchtools/default.php
@@ -9,6 +9,11 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+
 $data = $displayData;
 
 // Receive overridable options
@@ -51,7 +56,7 @@
 		$noResults = $data['view']->filterForm->getFieldAttribute('search', 'noresults', '', 'filter');
 		if (!empty($noResults))
 		{
-			$noResultsText = JText::_($noResults);
+			$noResultsText = Text::_($noResults);
 		}
 	}
 }
@@ -60,7 +65,7 @@
 $customOptions = array(
 	'filtersHidden'       => isset($data['options']['filtersHidden']) && $data['options']['filtersHidden'] ? $data['options']['filtersHidden'] : $hideActiveFilters,
 	'filterButton'        => isset($data['options']['filterButton']) && $data['options']['filterButton'] ? $data['options']['filterButton'] : $showFilterButton,
-	'defaultLimit'        => $data['options']['defaultLimit'] ?? JFactory::getApplication()->get('list_limit', 20),
+	'defaultLimit'        => $data['options']['defaultLimit'] ?? Factory::getApplication()->get('list_limit', 20),
 	'searchFieldSelector' => '#filter_search',
 	'selectorFieldName'   => $selectorFieldName,
 	'showSelector'        => $showSelector,
@@ -77,13 +82,13 @@
 $filtersActiveClass = $hideActiveFilters ? '' : ' js-stools-container-filters-visible';
 
 // Load search tools
-JHtml::_('searchtools.form', $data['options']['formSelector'], $data['options']);
+HTMLHelper::_('searchtools.form', $data['options']['formSelector'], $data['options']);
 ?>
 <div class="js-stools clearfix">
 	<div class="clearfix">
 		<?php if ($data['options']['showSelector']) : ?>
 		<div class="js-stools-container-selector">
-			<?php echo JLayoutHelper::render('joomla.searchtools.default.selector', $data); ?>
+			<?php echo LayoutHelper::render('joomla.searchtools.default.selector', $data); ?>
 		</div>
 		<?php endif; ?>
 		<div class="js-stools-container-bar">
diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php
index 0db7dc56be0df..4d64b670a92e5 100644
--- a/layouts/joomla/searchtools/default/bar.php
+++ b/layouts/joomla/searchtools/default/bar.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\Registry\Registry;
 
 $data = $displayData;
@@ -32,9 +34,9 @@
 	<?php if ($searchButton) : ?>
 		<label for="filter_search" class="sr-only">
 			<?php if (isset($filters['filter_search']->label)) : ?>
-				<?php echo JText::_($filters['filter_search']->label); ?>
+				<?php echo Text::_($filters['filter_search']->label); ?>
 			<?php else : ?>
-				<?php echo JText::_('JSEARCH_FILTER'); ?>
+				<?php echo Text::_('JSEARCH_FILTER'); ?>
 			<?php endif; ?>
 		</label>
 		<div class="btn-toolbar" role="toolbar">
@@ -42,18 +44,19 @@
 				<div class="input-group">
 					<?php echo $filters['filter_search']->input; ?>
 					<span class="input-group-append">
-						<button type="submit" class="btn btn-secondary hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>"  aria-label="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+						<button type="submit" class="btn btn-secondary hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>"  aria-label="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>">
 							<span class="fa fa-search" aria-hidden="true"></span>
 						</button>
-						<button type="button" class="btn btn-secondary hasTooltip js-stools-btn-clear" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>">
-							<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
+						<button type="button" class="btn btn-secondary hasTooltip js-stools-btn-clear" title="<?php echo HTMLHelper::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>">
+							<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>
 						</button>
 					</span>
 				</div>
 			</div>
 			<div class="btn-group">
 				<button type="button" class="btn btn-secondary hasTooltip js-stools-btn-filter">
-					<?php echo JText::_('JTABLE_OPTIONS'); ?> <span class="fa fa-caret-down"></span>
+					<?php echo Text::_('JTABLE_OPTIONS'); ?>
+					<span class="fa fa-caret-down" aria-hidden="true"></span>
 				</button>
 			</div>
 		</div>
diff --git a/layouts/joomla/searchtools/default/filters.php b/layouts/joomla/searchtools/default/filters.php
index fbee1e40bd775..25ed8b0780a37 100644
--- a/layouts/joomla/searchtools/default/filters.php
+++ b/layouts/joomla/searchtools/default/filters.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+
 $data = $displayData;
 
 // Load the form filters
@@ -19,9 +22,9 @@
 		<?php if ($fieldName !== 'filter_search') : ?>
 			<?php $dataShowOn = ''; ?>
 			<?php if ($field->showon) : ?>
-				<?php JHtml::_('jquery.framework'); ?>
-				<?php JHtml::_('script', 'system/cms.min.js', array('version' => 'auto', 'relative' => true)); ?>
-				<?php $dataShowOn = " data-showon='" . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . "'"; ?>
+				<?php HTMLHelper::_('jquery.framework'); ?>
+				<?php HTMLHelper::_('script', 'system/cms.min.js', array('version' => 'auto', 'relative' => true)); ?>
+				<?php $dataShowOn = " data-showon='" . json_encode(FormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . "'"; ?>
 			<?php endif; ?>
 			<div class="js-stools-field-filter"<?php echo $dataShowOn; ?>>
 				<?php echo $field->input; ?>
diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php
index 9296526ee4ec5..e63e247964d78 100644
--- a/layouts/joomla/searchtools/grid/sort.php
+++ b/layouts/joomla/searchtools/grid/sort.php
@@ -9,15 +9,24 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 $data = $displayData;
 
-$title = htmlspecialchars(JText::_($data->tip ?: $data->title));
-JHtml::_('bootstrap.popover');
+$title = htmlspecialchars(Text::_($data->tip ?: $data->title));
+HTMLHelper::_('bootstrap.popover');
 ?>
 <a href="#" onclick="return false;" class="js-stools-column-order hasPopover"
-   data-order="<?php echo $data->order; ?>" data-direction="<?php echo strtoupper($data->direction); ?>" data-name="<?php echo JText::_($data->title); ?>"
-   title="<?php echo $title; ?>" data-content="<?php echo htmlspecialchars(JText::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN')); ?>" data-placement="top">
-<?php if (!empty($data->icon)) : ?><span class="<?php echo $data->icon; ?>"></span><?php endif; ?>
-<?php if (!empty($data->title)) : ?><?php echo JText::_($data->title); ?><?php endif; ?>
-<?php if ($data->order == $data->selected) : ?><span class="<?php echo $data->orderIcon; ?>"></span><?php endif; ?>
+   data-order="<?php echo $data->order; ?>" data-direction="<?php echo strtoupper($data->direction); ?>" data-name="<?php echo Text::_($data->title); ?>"
+   title="<?php echo $title; ?>" data-content="<?php echo htmlspecialchars(Text::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN')); ?>" data-placement="top">
+<?php if (!empty($data->icon)) : ?>
+	<span class="<?php echo $data->icon; ?>" aria-hidden="true"></span>
+<?php endif; ?>
+<?php if (!empty($data->title)) : ?>
+	<?php echo Text::_($data->title); ?>
+<?php endif; ?>
+<?php if ($data->order == $data->selected) : ?>
+	<span class="<?php echo $data->orderIcon; ?>" aria-hidden="true"></span>
+<?php endif; ?>
 </a>
diff --git a/layouts/joomla/toolbar/apply.php b/layouts/joomla/toolbar/apply.php
index e19457d513a57..d58c7cc2e44fe 100644
--- a/layouts/joomla/toolbar/apply.php
+++ b/layouts/joomla/toolbar/apply.php
@@ -9,7 +9,10 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
 
 if (preg_match('/Joomla.submitbutton/', $displayData['doTask']))
 {
@@ -18,7 +21,7 @@
 	$ctrls = str_replace(";", '', $ctrls);
 
 	$options = array('task' => $ctrls);
-	JFactory::getDocument()->addScriptOptions('keySave', $options);
+	Factory::getDocument()->addScriptOptions('keySave', $options);
 }
 
 $id       = isset($displayData['id']) ? $displayData['id'] : '';
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index 10d5be2629a00..c5c56936ead0e 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -9,16 +9,19 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
+HTMLHelper::_('behavior.core');
 
 $id    = isset($displayData['id']) ? $displayData['id'] : '';
 $title = $displayData['title'];
-JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
-JText::script('ERROR');
+Text::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+Text::script('ERROR');
 $message = "{'error': [Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
 $alert = "Joomla.renderMessages(" . $message . ")";
 ?>
 <button<?php echo $id; ?> data-toggle="modal" onclick="if (document.adminForm.boxchecked.value==0){<?php echo $alert; ?>}else{jQuery( '#collapseModal' ).modal('show'); return true;}" class="btn btn-outline-primary btn-sm">
-	<span class="icon-checkbox-partial" aria-hidden="true" title="<?php echo $title; ?>"></span>
+	<span class="fa fa-square" aria-hidden="true" title="<?php echo $title; ?>"></span>
 	<?php echo $title; ?>
 </button>
diff --git a/layouts/joomla/toolbar/confirm.php b/layouts/joomla/toolbar/confirm.php
index bfc09ab8ca7c8..2d6070a97d1ab 100644
--- a/layouts/joomla/toolbar/confirm.php
+++ b/layouts/joomla/toolbar/confirm.php
@@ -9,7 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
 
 $id     = isset($displayData['id']) ? $displayData['id'] : '';
 $doTask = $displayData['doTask'];
diff --git a/layouts/joomla/toolbar/containeropen.php b/layouts/joomla/toolbar/containeropen.php
index fb9b832ae5179..ab478f6335c8b 100644
--- a/layouts/joomla/toolbar/containeropen.php
+++ b/layouts/joomla/toolbar/containeropen.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('script', 'system/toolbar.min.js', array('version' => 'auto', 'relative' => true));
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
+HTMLHelper::_('script', 'system/toolbar.min.js', array('version' => 'auto', 'relative' => true));
 ?>
-<div class="btn-toolbar d-flex" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>" id="<?php echo $displayData['id']; ?>">
+<div class="btn-toolbar d-flex" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>" id="<?php echo $displayData['id']; ?>">
diff --git a/layouts/joomla/toolbar/help.php b/layouts/joomla/toolbar/help.php
index a5e05a88b5ac8..df9e2109c0e6e 100644
--- a/layouts/joomla/toolbar/help.php
+++ b/layouts/joomla/toolbar/help.php
@@ -9,13 +9,15 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
 
 $id     = $displayData['id'] ?? '';
 $doTask = $displayData['doTask'];
 $text   = $displayData['text'];
 ?>
 <button<?php echo $id; ?> onclick="<?php echo $doTask; ?>" rel="help" class="btn btn-outline-info btn-sm">
-	<span class="icon-question-sign" aria-hidden="true"></span>
+	<span class="fa fa-question" aria-hidden="true"></span>
 	<?php echo $text; ?>
 </button>
diff --git a/layouts/joomla/toolbar/modal.php b/layouts/joomla/toolbar/modal.php
index dd5e0104dfa58..e1b183f9765f9 100644
--- a/layouts/joomla/toolbar/modal.php
+++ b/layouts/joomla/toolbar/modal.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Generic toolbar button layout to open a modal
  * -----------------------------------------------
@@ -26,7 +29,7 @@
 $text     = isset($displayData['text']) ? $displayData['text'] : '';
 
 // Render the modal
-echo JHtml::_('bootstrap.renderModal',
+echo HTMLHelper::_('bootstrap.renderModal',
 	'modal_'. $selector,
 	array(
 		'url'         => $displayData['doTask'],
@@ -38,13 +41,14 @@
 		'closeButton' => true,
 		'footer'      => '<a class="btn btn-secondary" data-dismiss="modal" type="button"'
 						. ' onclick="window.parent.jQuery(\'#modal_downloadModal\').modal(\'hide\');">'
-						. JText::_("COM_BANNERS_CANCEL") . '</a>'
+						. Text::_("COM_BANNERS_CANCEL") . '</a>'
 						. '<button class="btn btn-success" type="button"'
 						. ' onclick="jQuery(\'#modal_downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
-						. JText::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
+						. Text::_("COM_BANNERS_TRACKS_EXPORT") . '</button>',
 	)
 );
 ?>
 <button<?php echo $id; ?> onclick="jQuery('#modal_<?php echo $selector; ?>').modal('show')" class="<?php echo $class; ?>" data-toggle="modal" title="<?php echo $text; ?>">
-	<span class="icon-<?php echo $icon; ?>" aria-hidden="true"></span><?php echo $text; ?>
+	<span class="<?php echo $icon; ?>" aria-hidden="true"></span>
+	<?php echo $text; ?>
 </button>
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
index 66ee56000dd3f..3db4fe454b53c 100644
--- a/layouts/joomla/toolbar/popup.php
+++ b/layouts/joomla/toolbar/popup.php
@@ -9,7 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
 
 $id     = isset($displayData['id']) ? $displayData['id'] : '';
 $doTask = $displayData['doTask'];
diff --git a/layouts/joomla/toolbar/slider.php b/layouts/joomla/toolbar/slider.php
index b6353172f3fa3..7856746b29afb 100644
--- a/layouts/joomla/toolbar/slider.php
+++ b/layouts/joomla/toolbar/slider.php
@@ -9,7 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
 
 $id      = isset($displayData['id']) ? $displayData['id'] : '';
 $doTask  = $displayData['doTask'];
@@ -19,6 +21,6 @@
 $onClose = $displayData['onClose'];
 ?>
 <button<?php echo $id; ?> onclick="<?php echo $doTask; ?>" class="btn btn-sm btn-secondary" data-toggle="collapse" data-target="#collapse-<?php echo $name; ?>"<?php echo $onClose; ?>>
-	<span class="icon-cog" aria-hidden="true"></span>
+	<span class="fa fa-cog" aria-hidden="true"></span>
 	<?php echo $text; ?>
 </button>
diff --git a/layouts/joomla/toolbar/standard.php b/layouts/joomla/toolbar/standard.php
index a370eadf870f4..d632b4493802d 100644
--- a/layouts/joomla/toolbar/standard.php
+++ b/layouts/joomla/toolbar/standard.php
@@ -9,7 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
-JHtml::_('behavior.core');
+use Joomla\CMS\HTML\HTMLHelper;
+
+HTMLHelper::_('behavior.core');
 
 $id       = isset($displayData['id']) ? $displayData['id'] : '';
 $doTask   = $displayData['doTask'];
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index 2295797c05bd8..47ac9ace94d31 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -9,22 +9,26 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+
 extract($displayData);
 
-echo JHtml::_(
+echo HTMLHelper::_(
 	'bootstrap.renderModal',
 	'versionsModal',
 	array(
 		'url'    => "index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id="
 			. (int) $displayData['itemId']. "&amp;type_id=" . $displayData['typeId'] . "&amp;type_alias=" . $displayData['typeAlias']
-			. "&amp;" . JSession::getFormToken() . "=1",
+			. "&amp;" . Session::getFormToken() . "=1",
 		'title'  => $displayData['title'],
 		'height' => '100%',
 		'width'  => '100%',
 		'modalWidth'  => '80',
 		'bodyHeight'  => '60',
 		'footer' => '<a type="button" class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">'
-			. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>'
+			. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>'
 	)
 );