diff --git a/administrator/components/com_contact/Service/HTML/AdministratorService.php b/administrator/components/com_contact/Service/HTML/AdministratorService.php
index 6d037df39fbf5..114313efd618e 100644
--- a/administrator/components/com_contact/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_contact/Service/HTML/AdministratorService.php
@@ -12,7 +12,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -116,14 +115,14 @@ public function featured($value, $i, $canChange = true)
 
 		if ($canChange)
 		{
-			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon hasTooltip'
-				. ($value == 1 ? ' active' : '') . '" title="' . HTMLHelper::_('tooltipText', $state[3])
+			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon'
+				. ($value == 1 ? ' active' : '') . '" title="' . Text::_($state[3])
 				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
 		}
 		else
 		{
-			$html = '<a class="tbody-icon hasTooltip disabled' . ($value == 1 ? ' active' : '')
-				. '" title="' . HTMLHelper::_('tooltipText', $state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+			$html = '<a class="tbody-icon disabled' . ($value == 1 ? ' active' : '')
+				. '" title="' . Text::_($state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
 		}
 
 		return $html;
diff --git a/administrator/components/com_content/Service/HTML/AdministratorService.php b/administrator/components/com_content/Service/HTML/AdministratorService.php
index 70e3cb7960c9f..6b4ee27979972 100644
--- a/administrator/components/com_content/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_content/Service/HTML/AdministratorService.php
@@ -12,12 +12,10 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
-use Joomla\Utilities\ArrayHelper;
 
 /**
  * Content HTML helper
@@ -94,38 +92,4 @@ public function association($articleid)
 
 		return $html;
 	}
-
-	/**
-	 * Show the feature/unfeature links
-	 *
-	 * @param   integer  $value      The state value
-	 * @param   integer  $i          Row number
-	 * @param   boolean  $canChange  Is user allowed to change?
-	 *
-	 * @return  string       HTML code
-	 */
-	public function featured($value, $i, $canChange = true)
-	{
-		// Array of image, task, title, action
-		$states = array(
-			0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
-			1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
-		);
-		$state = ArrayHelper::getValue($states, (int) $value, $states[1]);
-		$icon  = $state[0];
-
-		if ($canChange)
-		{
-			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon hasTooltip'
-				. ($value == 1 ? ' active' : '') . '" title="' . HTMLHelper::_('tooltipText', $state[3])
-				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
-		}
-		else
-		{
-			$html = '<a class="tbody-icon hasTooltip disabled' . ($value == 1 ? ' active' : '') . '" title="'
-				. HTMLHelper::_('tooltipText', $state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
-		}
-
-		return $html;
-	}
 }
diff --git a/administrator/components/com_messages/Service/HTML/Messages.php b/administrator/components/com_messages/Service/HTML/Messages.php
index 3fa37e9911d93..8cc711a82c686 100644
--- a/administrator/components/com_messages/Service/HTML/Messages.php
+++ b/administrator/components/com_messages/Service/HTML/Messages.php
@@ -11,7 +11,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -46,8 +46,8 @@ public function status($i, $value = 0, $canChange = false)
 
 		if ($canChange)
 		{
-			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="btn btn-sm hasTooltip'
-				. ($value == 1 ? ' active' : '') . '" title="' . HTMLHelper::_('tooltipText', $state[3]) . '"><span class="icon-'
+			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon'
+				. ($value == 1 ? ' active' : '') . '" title="' . Text::_($state[3]) . '"><span class="icon-'
 				. $icon . '" aria-hidden="true"></span></a>';
 		}
 
diff --git a/administrator/components/com_redirect/Service/HTML/Redirect.php b/administrator/components/com_redirect/Service/HTML/Redirect.php
index 8e2ab20d79c1f..aeb808523bd15 100644
--- a/administrator/components/com_redirect/Service/HTML/Redirect.php
+++ b/administrator/components/com_redirect/Service/HTML/Redirect.php
@@ -11,7 +11,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -55,8 +55,8 @@ public function published($value = 0, $i = null, $canChange = true)
 
 		if ($canChange)
 		{
-			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon hasTooltip'
-				. ($value == 1 ? ' active' : '') . '" title="' . HTMLHelper::_('tooltipText', $state[3])
+			$html = '<a href="#" onclick="return Joomla.listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="tbody-icon'
+				. ($value == 1 ? ' active' : '') . '" title="' . Text::_($state[3])
 				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
 		}