diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php
index 450b687766e79..5db6fcce32357 100644
--- a/layouts/joomla/form/field/calendar.php
+++ b/layouts/joomla/form/field/calendar.php
@@ -9,12 +9,15 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
 extract($displayData);
 
 // Get some system objects.
-$document = JFactory::getDocument();
+$document = Factory::getDocument();
 
 /**
  * Layout variables
@@ -81,7 +84,7 @@
 // Handle the special case for "now".
 if (strtoupper($value) == 'NOW')
 {
-	$value = JFactory::getDate()->format('Y-m-d H:i:s');
+	$value = Factory::getDate()->format('Y-m-d H:i:s');
 }
 
 $readonly = isset($attributes['readonly']) && $attributes['readonly'] == 'readonly';
@@ -95,10 +98,10 @@
 $cssFileExt = ($direction === 'rtl') ? '-rtl.css' : '.css';
 
 // The static assets for the calendar
-JHtml::_('script', $localesPath, false, true, false, false, true);
-JHtml::_('script', $helperPath, false, true, false, false, true);
-JHtml::_('script', 'system/fields/calendar.min.js', false, true, false, false, true);
-JHtml::_('stylesheet', 'system/fields/calendar' . $cssFileExt, array(), true);
+HTMLHelper::_('script', $localesPath, false, true, false, false, true);
+HTMLHelper::_('script', $helperPath, false, true, false, false, true);
+HTMLHelper::_('script', 'system/fields/calendar.min.js', false, true, false, false, true);
+HTMLHelper::_('stylesheet', 'system/fields/calendar' . $cssFileExt, array(), true);
 ?>
 <div class="field-calendar">
 	<?php if (!$readonly && !$disabled) : ?>
@@ -118,8 +121,8 @@
 				data-inputfield="<?php echo $id; ?>"
 				data-dayformat="<?php echo $format; ?>"
 				data-button="<?php echo $id; ?>_btn"
-				data-firstday="<?php echo JFactory::getLanguage()->getFirstDay(); ?>"
-				data-weekend="<?php echo JFactory::getLanguage()->getWeekEnd(); ?>"
+				data-firstday="<?php echo Factory::getLanguage()->getFirstDay(); ?>"
+				data-weekend="<?php echo Factory::getLanguage()->getWeekEnd(); ?>"
 				data-today-btn="<?php echo $todaybutton; ?>"
 				data-week-numbers="<?php echo $weeknumbers; ?>"
 				data-show-time="<?php echo $showtime; ?>"
diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php
index 7b43e801e861d..e6f4e52898c1d 100644
--- a/layouts/joomla/form/field/color/advanced.php
+++ b/layouts/joomla/form/field/color/advanced.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 extract($displayData);
 
 /**
@@ -70,10 +72,10 @@
 // Force LTR input value in RTL, due to display issues with rgba/hex colors
 $direction = $lang->isRtl() ? ' dir="ltr" style="text-align:right"' : '';
 
-JHtml::_('jquery.framework');
-JHtml::_('script', 'vendor/minicolors/jquery.minicolors.min.js', array('version' => 'auto', 'relative' => true));
-JHtml::_('stylesheet', 'vendor/minicolors/jquery.minicolors.css', array('version' => 'auto', 'relative' => true));
-JHtml::_('script', 'system/fields/color-field-adv-init.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('jquery.framework');
+HTMLHelper::_('script', 'vendor/minicolors/jquery.minicolors.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('stylesheet', 'vendor/minicolors/jquery.minicolors.css', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'system/fields/color-field-adv-init.min.js', array('version' => 'auto', 'relative' => true));
 ?>
 <input
 	type="text"
diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php
index b2bdec6fed9de..95cd9f7427fae 100644
--- a/layouts/joomla/form/field/color/simple.php
+++ b/layouts/joomla/form/field/color/simple.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 extract($displayData);
 
 /**
@@ -50,10 +52,10 @@
 $readonly = $readonly ? ' readonly' : '';
 
 // Include jQuery
-JHtml::_('jquery.framework');
-JHtml::_('script', 'system/fields/simplecolors.min.js', array('version' => 'auto', 'relative' => true));
-JHtml::_('stylesheet', 'system/simplecolors.css', array('version' => 'auto', 'relative' => true));
-JHtml::_('script', 'system/fields/color-field-init.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('jquery.framework');
+HTMLHelper::_('script', 'system/fields/simplecolors.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('stylesheet', 'system/simplecolors.css', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'system/fields/color-field-init.min.js', array('version' => 'auto', 'relative' => true));
 ?>
 <select data-chosen="true" name="<?php echo $name; ?>" id="<?php echo $id; ?>"<?php
 echo $disabled; ?><?php echo $readonly; ?><?php echo $required; ?><?php echo $class; ?><?php echo $position; ?><?php
diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php
index 27e71dbdbdd26..80d04f6b3d39a 100644
--- a/layouts/joomla/form/field/combo.php
+++ b/layouts/joomla/form/field/combo.php
@@ -11,6 +11,8 @@
 
 extract($displayData);
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 /**
  * Layout variables
  * -----------------
@@ -40,7 +42,7 @@
  * @var   array    $options         Options available for this field.
  */
 
-JHtml::_('behavior.combobox');
+HTMLHelper::_('behavior.combobox');
 
 $attr .= !empty($class) ? ' class="awesomplete form-control ' . $class . '"' : ' class="awesomplete form-control"';
 $attr .= !empty($size) ? ' size="' . $size . '"' : '';
diff --git a/layouts/joomla/form/field/contenthistory.php b/layouts/joomla/form/field/contenthistory.php
index 861833a09f560..b4b27871de578 100644
--- a/layouts/joomla/form/field/contenthistory.php
+++ b/layouts/joomla/form/field/contenthistory.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Layout variables
  * -----------------
@@ -44,7 +47,7 @@
  */
 extract($displayData);
 
-echo JHtml::_(
+echo HTMLHelper::_(
 	'bootstrap.renderModal',
 	'versionsModal',
 	array(
@@ -55,7 +58,7 @@
 		'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>'
 	)
 );
 
diff --git a/layouts/joomla/form/field/email.php b/layouts/joomla/form/field/email.php
index f4c4333c99521..3c6765b62a91e 100644
--- a/layouts/joomla/form/field/email.php
+++ b/layouts/joomla/form/field/email.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\String\PunycodeHelper;
+
 extract($displayData);
 
 /**
@@ -67,5 +69,5 @@
 	name="<?php echo $name; ?>"
 	<?php echo !empty($class) ? ' class="form-control validate-email ' . $class . '"' : ' class="form-control validate-email"'; ?>
 	id="<?php echo $id; ?>"
-	value="<?php echo htmlspecialchars(JStringPunycode::emailToUTF8($value), ENT_COMPAT, 'UTF-8'); ?>"
+	value="<?php echo htmlspecialchars(PunycodeHelper::emailToUTF8($value), ENT_COMPAT, 'UTF-8'); ?>"
 	<?php echo implode(' ', $attributes); ?>>
diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php
index 77995d68deefb..19bf365a3a719 100644
--- a/layouts/joomla/form/field/file.php
+++ b/layouts/joomla/form/field/file.php
@@ -9,6 +9,10 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Utility\Utility;
+
 extract($displayData);
 
 /**
@@ -45,7 +49,7 @@
  * @var   string   $accept          File types that are accepted.
  */
 
-$maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize());
+$maxSize = HTMLHelper::_('number.bytes', Utility::getMaxUploadSize());
 ?>
 <input type="file"
 	name="<?php echo $name; ?>"
@@ -58,4 +62,4 @@
 	<?php echo $autofocus ? ' autofocus' : ''; ?>
 	<?php echo !empty($onchange) ? ' onchange="' . $onchange . '"' : ''; ?>
 	<?php echo $required ? ' required aria-required="true"' : ''; ?>><br>
-	<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
+	<?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index 192dcea98b2bb..d7356387e9e1a 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -10,6 +10,9 @@
 defined('JPATH_BASE') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Layout variables
@@ -65,7 +68,7 @@
 {
 	if ($value && file_exists(JPATH_ROOT . '/' . $value))
 	{
-		$src = JUri::root() . $value;
+		$src = Uri::root() . $value;
 	}
 	else
 	{
@@ -83,11 +86,11 @@
 		'style' => $style,
 	);
 
-	$img = JHtml::_('image', $src, JText::_('JLIB_FORM_MEDIA_PREVIEW_ALT'), $imgattr);
+	$img = HTMLHelper::_('image', $src, Text::_('JLIB_FORM_MEDIA_PREVIEW_ALT'), $imgattr);
 
 	$previewImg = '<div id="' . $id . '_preview_img"' . '>' . $img . '</div>';
 	$previewImgEmpty = '<div id="' . $id . '_preview_empty"' . ($src ? ' style="display:none"' : '') . '>'
-		. JText::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY') . '</div>';
+		. Text::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY') . '</div>';
 
 	$showPreview = 'static';
 }
@@ -101,7 +104,7 @@
 ?>
 <joomla-field-media class="field-media-wrapper"
 		type="image" <?php // @TODO add this attribute to the field in order to use it for all media types ?>
-		base-path="<?php echo JUri::root(); ?>"
+		base-path="<?php echo Uri::root(); ?>"
 		root-folder="<?php echo ComponentHelper::getParams('com_media')->get('file_path', 'images'); ?>"
 		url="<?php echo $url; ?>"
 		modal-container=".modal"
@@ -118,22 +121,22 @@
 >
 	<?php
 	// Render the modal
-	echo JHtml::_('bootstrap.renderModal',
+	echo HTMLHelper::_('bootstrap.renderModal',
 		'imageModal_'. $id,
 		array(
 			'url'         => $url,
-			'title'       => JText::_('JLIB_FORM_CHANGE_IMAGE'),
+			'title'       => Text::_('JLIB_FORM_CHANGE_IMAGE'),
 			'closeButton' => true,
 			'height' => '100%',
 			'width'  => '100%',
 			'modalWidth'  => '80',
 			'bodyHeight'  => '60',
-			'footer'      => '<button class="btn btn-secondary button-save-selected">' . JText::_('JSELECT') . '</button><button class="btn btn-secondary" data-dismiss="modal">' . JText::_('JCANCEL') . '</button>'
+			'footer'      => '<button class="btn btn-secondary button-save-selected">' . Text::_('JSELECT') . '</button><button class="btn btn-secondary" data-dismiss="modal">' . Text::_('JCANCEL') . '</button>'
 		)
 	);
 
-	JHtml::_('webcomponent', ['joomla-field-media' => 'system/webcomponents/joomla-field-media.min.js'], ['relative' => true, 'version' => 'auto', 'detectBrowser' => false, 'detectDebug' => true]);
-	JText::script('JLIB_FORM_MEDIA_PREVIEW_EMPTY', true);
+	HTMLHelper::_('webcomponent', ['joomla-field-media' => 'system/webcomponents/joomla-field-media.min.js'], ['relative' => true, 'version' => 'auto', 'detectBrowser' => false, 'detectDebug' => true]);
+	Text::script('JLIB_FORM_MEDIA_PREVIEW_EMPTY', true);
 	?>
 	<?php if ($showPreview) : ?>
 		<div class="field-media-preview" style="height:auto">
@@ -145,8 +148,8 @@
 		<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" readonly="readonly"<?php echo $attr; ?>>
 		<?php if ($disabled != true) : ?>
 			<div class="input-group-append">
-				<a class="btn btn-secondary button-select"><?php echo JText::_("JLIB_FORM_BUTTON_SELECT"); ?></a>
-				<a class="btn btn-secondary hasTooltip button-clear" title="<?php echo JText::_("JLIB_FORM_BUTTON_CLEAR"); ?>"><span class="fa fa-times" aria-hidden="true"></span></a>
+				<a class="btn btn-secondary button-select"><?php echo Text::_("JLIB_FORM_BUTTON_SELECT"); ?></a>
+				<a class="btn btn-secondary hasTooltip button-clear" title="<?php echo Text::_("JLIB_FORM_BUTTON_CLEAR"); ?>"><span class="fa fa-times" aria-hidden="true"></span></a>
 			</div>
 		<?php endif; ?>
 	</div>
diff --git a/layouts/joomla/form/field/moduleorder.php b/layouts/joomla/form/field/moduleorder.php
index fef0b2c05c944..11959fa4bd484 100644
--- a/layouts/joomla/form/field/moduleorder.php
+++ b/layouts/joomla/form/field/moduleorder.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 extract($displayData);
 
 /**
@@ -55,7 +57,7 @@
 // Initialize JavaScript field attributes.
 $attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
 
-JHtml::_('script', 'system/fields/moduleorder.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'system/fields/moduleorder.min.js', array('version' => 'auto', 'relative' => true));
 ?>
 <div
 	id="parent_<?php echo $id; ?>"
diff --git a/layouts/joomla/form/field/password.php b/layouts/joomla/form/field/password.php
index b63ae2fecc558..4d10e5693b325 100644
--- a/layouts/joomla/form/field/password.php
+++ b/layouts/joomla/form/field/password.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 extract($displayData);
 
 /**
@@ -46,8 +49,8 @@
 
 if ($meter)
 {
-	JHtml::_('behavior.formvalidator');
-	JHtml::_('script', 'system/fields/passwordstrength.min.js', array('version' => 'auto', 'relative' => true));
+	HTMLHelper::_('behavior.formvalidator');
+	HTMLHelper::_('script', 'system/fields/passwordstrength.min.js', array('version' => 'auto', 'relative' => true));
 
 	$class = 'js-password-strength ' . $class;
 
@@ -57,12 +60,12 @@
 	}
 }
 
-JHtml::_('script', 'system/fields/passwordview.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'system/fields/passwordview.min.js', array('version' => 'auto', 'relative' => true));
 
-JText::script('JFIELD_PASSWORD_INDICATE_INCOMPLETE');
-JText::script('JFIELD_PASSWORD_INDICATE_COMPLETE');
-JText::script('JSHOW');
-JText::script('JHIDE');
+Text::script('JFIELD_PASSWORD_INDICATE_INCOMPLETE');
+Text::script('JFIELD_PASSWORD_INDICATE_COMPLETE');
+Text::script('JSHOW');
+Text::script('JHIDE');
 
 $attributes = array(
 	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
@@ -93,7 +96,7 @@
 			<?php echo implode(' ', $attributes); ?>>
 		<span class="input-group-addon">
 			<span class="fa fa-eye" aria-hidden="true"></span>
-			<span class="sr-only"><?php echo JText::_('JSHOW'); ?></span>
+			<span class="sr-only"><?php echo Text::_('JSHOW'); ?></span>
 		</span>
 	</div>
 </div>
diff --git a/layouts/joomla/form/field/radiobasic.php b/layouts/joomla/form/field/radiobasic.php
index 5797f35f35b0a..0a609b9ef3ec6 100644
--- a/layouts/joomla/form/field/radiobasic.php
+++ b/layouts/joomla/form/field/radiobasic.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Language\Text;
+
 extract($displayData);
 
 /**
@@ -40,9 +42,6 @@
  * @var   array    $options         Options available for this field.
  */
 
-// Including fallback code for HTML5 non supported browsers.
-JHtml::_('jquery.framework');
-
 /**
  * The format of the input tag to be filled in using sprintf.
  *     %1 - id
@@ -79,7 +78,7 @@
 			<div class="radio m-b-0">
 				<label for="<?php echo $oid; ?>" <?php echo $optionClass; ?>>
 					<?php echo sprintf($format, $oid, $name, $ovalue, implode(' ', $attributes)); ?>
-					<?php echo JText::alt($option->text, $alt); ?>
+					<?php echo Text::alt($option->text, $alt); ?>
 				</label>
 			</div>
 		<?php endforeach; ?>
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index 9be6a2886b186..c118aa0f6d483 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -9,6 +9,10 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Make thing clear
  *
@@ -29,8 +33,8 @@
 // Add script
 if ($multiple)
 {
-	JHtml::_('jquery.ui', array('core', 'sortable'));
-	JHtml::_('script', 'system/fields/subform-repeatable.min.js', array('version' => 'auto', 'relative' => true));
+	HTMLHelper::_('jquery.ui', array('core', 'sortable'));
+	HTMLHelper::_('script', 'system/fields/subform-repeatable.min.js', array('version' => 'auto', 'relative' => true));
 }
 
 // Build heading
@@ -39,11 +43,11 @@
 if (!empty($groupByFieldset))
 {
 	foreach ($tmpl->getFieldsets() as $fieldset) {
-		$table_head .= '<th>' . JText::_($fieldset->label);
+		$table_head .= '<th>' . Text::_($fieldset->label);
 
 		if (!empty($fieldset->description))
 		{
-			$table_head .= '<br><small style="font-weight:normal">' . JText::_($fieldset->description) . '</small>';
+			$table_head .= '<br><small style="font-weight:normal">' . Text::_($fieldset->description) . '</small>';
 		}
 
 		$table_head .= '</th>';
@@ -55,14 +59,14 @@
 {
 	foreach ($tmpl->getGroup('') as $field) {
 		$table_head .= '<th>' . strip_tags($field->label);
-		$table_head .= '<br><small style="font-weight:normal">' . JText::_($field->description) . '</small>';
+		$table_head .= '<br><small style="font-weight:normal">' . Text::_($field->description) . '</small>';
 		$table_head .= '</th>';
 	}
 
 	$sublayout = 'section';
 
 	// Label will not be shown for sections layout, so reset the margin left
-	JFactory::getDocument()->addStyleDeclaration(
+	Factory::getDocument()->addStyleDeclaration(
 		'.subform-table-sublayout-section .controls { margin-left: 0px }'
 	);
 }
@@ -83,7 +87,7 @@
 					<th style="width:8%;">
 					<?php if (!empty($buttons['add'])) : ?>
 						<div class="btn-group">
-							<a class="group-add btn btn-sm button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus icon-white" aria-hidden="true"></span> </a>
+							<a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>"><span class="fa fa-plus icon-white" aria-hidden="true"></span> </a>
 						</div>
 					<?php endif; ?>
 					</th>
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 5e1c840dc10d2..e0e03fe385bab 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
+
 /**
  * Make thing clear
  *
@@ -32,9 +34,9 @@
 	<?php if (!empty($buttons)) : ?>
 	<td>
 		<div class="btn-group">
-			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-sm button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move 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'); ?>"><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'); ?>"><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 icon-white" aria-hidden="true"></span> </a><?php endif; ?>
 		</div>
 	</td>
 	<?php endif; ?>
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php
index bfc29a4278b8e..e3fb5ae7a63bd 100644
--- a/layouts/joomla/form/field/subform/repeatable-table/section.php
+++ b/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
+
 /**
  * Make thing clear
  *
@@ -30,9 +32,9 @@
 	<?php if (!empty($buttons)) : ?>
 	<td>
 		<div class="btn-group">
-			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-sm button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move 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'); ?>"><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'); ?>"><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 icon-white" aria-hidden="true"></span> </a><?php endif; ?>
 		</div>
 	</td>
 	<?php endif; ?>
diff --git a/layouts/joomla/form/field/subform/repeatable.php b/layouts/joomla/form/field/subform/repeatable.php
index 20c11f7c7e44b..cd6d9cbbfe8c9 100644
--- a/layouts/joomla/form/field/subform/repeatable.php
+++ b/layouts/joomla/form/field/subform/repeatable.php
@@ -9,6 +9,9 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
 /**
  * Make thing clear
  *
@@ -29,8 +32,8 @@
 // Add script
 if ($multiple)
 {
-	JHtml::_('jquery.ui', array('core', 'sortable'));
-	JHtml::_('script', 'system/fields/subform-repeatable.min.js', array('version' => 'auto', 'relative' => true));
+	HTMLHelper::_('jquery.ui', array('core', 'sortable'));
+	HTMLHelper::_('script', 'system/fields/subform-repeatable.min.js', array('version' => 'auto', 'relative' => true));
 }
 
 $sublayout = empty($groupByFieldset) ? 'section' : 'section-byfieldsets';
@@ -44,7 +47,7 @@
 			<?php if (!empty($buttons['add'])) : ?>
 			<div class="btn-toolbar">
 				<div class="btn-group">
-					<a class="group-add btn btn-sm button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus icon-white" aria-hidden="true"></span> </a>
+					<a class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>"><span class="fa 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 0009fa27147b3..93335337de776 100644
--- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
+
 /**
  * Make thing clear
  *
@@ -24,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 JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move 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'); ?>"><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'); ?>"><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 icon-white" aria-hidden="true"></span> </a><?php endif; ?>
 		</div>
 	</div>
 	<?php endif; ?>
@@ -34,7 +36,7 @@
 		<?php foreach ($form->getFieldsets() as $fieldset) : ?>
 		<fieldset class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
 			<?php if (!empty($fieldset->label)) : ?>
-				<legend><?php echo JText::_($fieldset->label); ?></legend>
+				<legend><?php echo Text::_($fieldset->label); ?></legend>
 			<?php endif; ?>
 			<?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
 				<?php echo $field->renderField(); ?>
diff --git a/layouts/joomla/form/field/subform/repeatable/section.php b/layouts/joomla/form/field/subform/repeatable/section.php
index e674d93cb5b09..1b4790b910f93 100644
--- a/layouts/joomla/form/field/subform/repeatable/section.php
+++ b/layouts/joomla/form/field/subform/repeatable/section.php
@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
+
 /**
  * Make thing clear
  *
@@ -25,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 JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-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 JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move 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'); ?>"><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'); ?>"><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 icon-white" aria-hidden="true"></span> </a><?php endif; ?>
 		</div>
 	</div>
 	<?php endif; ?>
diff --git a/layouts/joomla/form/field/text.php b/layouts/joomla/form/field/text.php
index e906d9c239c4c..786af949ecb6e 100644
--- a/layouts/joomla/form/field/text.php
+++ b/layouts/joomla/form/field/text.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Language\Text;
+
 extract($displayData);
 
 /**
@@ -75,8 +77,8 @@
 	!empty($validationtext) ? 'data-validation-text="' . $validationtext . '"' : '',
 );
 
-$addonBeforeHtml = '<span class="input-group-prepend"><span class="input-group-text">' . JText::_($addonBefore) . '</span></span>';
-$addonAfterHtml  = '<span class="input-group-append"><span class="input-group-text">' . JText::_($addonAfter) . '</span></span>';
+$addonBeforeHtml = '<span class="input-group-prepend"><span class="input-group-text">' . Text::_($addonBefore) . '</span></span>';
+$addonAfterHtml  = '<span class="input-group-append"><span class="input-group-text">' . Text::_($addonAfter) . '</span></span>';
 ?>
 
 <?php if (!empty($addonBefore) || !empty($addonAfter)) : ?>
diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php
index 3d64686ebdbae..6ac1bfc01ee8c 100644
--- a/layouts/joomla/form/field/url.php
+++ b/layouts/joomla/form/field/url.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\String\PunycodeHelper;
+
 extract($displayData);
 
 /**
@@ -65,5 +67,5 @@
 	name="<?php echo $name; ?>"
 	<?php echo !empty($class) ? ' class="form-control ' . $class . '"' : 'class="form-control"'; ?>
 	id="<?php echo $id; ?>"
-	value="<?php echo htmlspecialchars(JStringPunycode::urlToUTF8($value), ENT_COMPAT, 'UTF-8'); ?>"
+	value="<?php echo htmlspecialchars(PunycodeHelper::urlToUTF8($value), ENT_COMPAT, 'UTF-8'); ?>"
 	<?php echo implode(' ', $attributes); ?>>
diff --git a/layouts/joomla/form/field/user.php b/layouts/joomla/form/field/user.php
index ddc7a1aed1fc3..4d74bdc2b9d40 100644
--- a/layouts/joomla/form/field/user.php
+++ b/layouts/joomla/form/field/user.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 use Joomla\Utilities\ArrayHelper;
 
 extract($displayData);
@@ -48,11 +51,11 @@
 if (!$readonly)
 {
 	// @TODO remove jQuery dependency once modal moves to webcomponents
-	JHtml::_('jquery.framework');
+	HTMLHelper::_('jquery.framework');
 
-	JHtml::_('webcomponent', ['joomla-field-user' =>'system/webcomponents/joomla-field-user.min.js'], ['version' => 'auto', 'relative' => true]);}
+	HTMLHelper::_('webcomponent', ['joomla-field-user' =>'system/webcomponents/joomla-field-user.min.js'], ['version' => 'auto', 'relative' => true]);}
 
-$uri = new JUri('index.php?option=com_users&view=users&layout=modal&tmpl=component&required=0');
+$uri = new Uri('index.php?option=com_users&view=users&layout=modal&tmpl=component&required=0');
 
 $uri->setVar('field', $this->escape($id));
 
@@ -72,7 +75,7 @@
 }
 
 // Invalidate the input value if no user selected
-if ($this->escape($userName) === JText::_('JLIB_FORM_SELECT_USER'))
+if ($this->escape($userName) === Text::_('JLIB_FORM_SELECT_USER'))
 {
 	$userName = '';
 }
@@ -94,7 +97,7 @@
 }
 if (!$readonly)
 {
-	$inputAttributes['placeholder'] = JText::_('JLIB_FORM_SELECT_USER');
+	$inputAttributes['placeholder'] = Text::_('JLIB_FORM_SELECT_USER');
 }
 ?>
 <?php // Create a dummy text field with the user name. ?>
@@ -110,19 +113,19 @@
 		<input <?php echo ArrayHelper::toString($inputAttributes); ?> readonly>
 		<?php if (!$readonly) : ?>
 			<span class="input-group-append">
-					<a class="btn btn-primary button-select" title="<?php echo JText::_('JLIB_FORM_CHANGE_USER') ?>"><span class="fa fa-user icon-white" aria-hidden="true"></span></a>
-				<?php echo JHtml::_(
+					<a 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></a>
+				<?php echo HTMLHelper::_(
 					'bootstrap.renderModal',
 					'userModal_' . $id,
 					array(
 						'url'         => $uri,
-						'title'       => JText::_('JLIB_FORM_CHANGE_USER'),
+						'title'       => Text::_('JLIB_FORM_CHANGE_USER'),
 						'closeButton' => true,
 						'height'      => '100%',
 						'width'       => '100%',
 						'modalWidth'  => 80,
 						'bodyHeight'  => 60,
-						'footer'      => '<a type="button" class="btn btn-secondary" data-dismiss="modal">' . JText::_('JCANCEL') . '</a>'
+						'footer'      => '<a type="button" class="btn btn-secondary" data-dismiss="modal">' . Text::_('JCANCEL') . '</a>'
 					)
 				); ?>
 				</span>
diff --git a/layouts/joomla/form/renderfield.php b/layouts/joomla/form/renderfield.php
index a605297d93b31..55c018be89425 100644
--- a/layouts/joomla/form/renderfield.php
+++ b/layouts/joomla/form/renderfield.php
@@ -9,6 +9,8 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
+
 extract($displayData);
 
 /**
@@ -22,8 +24,8 @@
 
 if (!empty($options['showonEnabled']))
 {
-	JHtml::_('jquery.framework');
-	JHtml::_('script', 'system/cms.min.js', array('version' => 'auto', 'relative' => true));
+	HTMLHelper::_('jquery.framework');
+	HTMLHelper::_('script', 'system/cms.min.js', array('version' => 'auto', 'relative' => true));
 }
 
 $class = empty($options['class']) ? '' : ' ' . $options['class'];
diff --git a/layouts/joomla/form/renderlabel.php b/layouts/joomla/form/renderlabel.php
index 031c79d0917db..6a58d69290be5 100644
--- a/layouts/joomla/form/renderlabel.php
+++ b/layouts/joomla/form/renderlabel.php
@@ -9,6 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+
 extract($displayData);
 
 /**
@@ -24,19 +27,19 @@
 
 $classes = array_filter((array) $classes);
 
-$id = $for . '-lbl';
+$id    = $for . '-lbl';
 $title = '';
 
 if (!empty($description))
 {
 	if ($text && $text !== $description)
 	{
-		JHtml::_('bootstrap.popover');
+		HTMLHelper::_('bootstrap.popover');
 		$classes[] = 'hasPopover';
 		$title     = ' title="' . htmlspecialchars(trim($text, ':')) . '"'
 			. ' data-content="'. htmlspecialchars($description) . '"';
 
-		if (!$position && JFactory::getLanguage()->isRtl())
+		if (!$position && Factory::getLanguage()->isRtl())
 		{
 			$position = ' data-placement="left" ';
 		}
@@ -44,7 +47,7 @@
 	else
 	{
 		$classes[] = 'hasTooltip';
-		$title     = ' title="' . JHtml::_('tooltipText', trim($text, ':'), $description, 0) . '"';
+		$title     = ' title="' . HTMLHelper::_('tooltipText', trim($text, ':'), $description, 0) . '"';
 	}
 }