diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index 3b914eadc23f8..fb94149456042 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -249,10 +249,10 @@
 													->removeState(1)
 													->removeState(2)
 													->removeState(-2)
-													->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JPUBLISHED'])
-													->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JUNPUBLISHED'])
-													->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JARCHIVED'])
-													->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JTRASHED'])
+													->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JPUBLISHED')])
+													->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JUNPUBLISHED')])
+													->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JARCHIVED')])
+													->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JTRASHED')])
 													->setLayout('joomla.button.transition-button')
 													->render($item->stage_condition, $i, $options, $item->publish_up, $item->publish_down);
 										?>
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
index 4b443b3f7d633..20c4cbb834bdd 100644
--- a/administrator/components/com_content/tmpl/featured/default.php
+++ b/administrator/components/com_content/tmpl/featured/default.php
@@ -233,10 +233,10 @@
 													->removeState(1)
 													->removeState(2)
 													->removeState(-2)
-													->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JPUBLISHED'])
-													->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JUNPUBLISHED'])
-													->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JARCHIVED'])
-													->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', 'COM_CONTENT_CHANGE_STAGE', ['tip_title' => 'JTRASHED'])
+													->addState(ContentComponent::CONDITION_PUBLISHED, '', 'publish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JPUBLISHED')])
+													->addState(ContentComponent::CONDITION_UNPUBLISHED, '', 'unpublish', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JUNPUBLISHED')])
+													->addState(ContentComponent::CONDITION_ARCHIVED, '', 'archive', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JARCHIVED')])
+													->addState(ContentComponent::CONDITION_TRASHED, '', 'trash', Text::_('COM_CONTENT_CHANGE_STAGE'), ['tip_title' => Text::_('JTRASHED')])
 													->setLayout('joomla.button.transition-button')
 													->render($item->stage_condition, $i, $options, $item->publish_up, $item->publish_down);
 										?>
diff --git a/layouts/joomla/button/action-button.php b/layouts/joomla/button/action-button.php
index 9bc755b0cbbe8..db541d5c08076 100644
--- a/layouts/joomla/button/action-button.php
+++ b/layouts/joomla/button/action-button.php
@@ -8,7 +8,6 @@
  */
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
 
 HTMLHelper::_('bootstrap.popover');
 
@@ -28,8 +27,8 @@
 $tipTitle = $options['tip_title'];
 ?>
 <button type="submit" class="tbody-icon data-state-<?php echo $this->escape($value ?? ''); ?><?php echo $tip ? ' hasPopover' : ''; ?>"
-		title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
-		data-content="<?php echo HTMLHelper::_('tooltipText', Text::_($title), '', 0); ?>"
+		title="<?php echo HTMLHelper::_('tooltipText', $tipTitle ?: $title, '', 0); ?>"
+		data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
 		data-placement="top"
 	<?php echo !empty($disabled) ? 'disabled' : ''; ?>
 	<?php if (!empty($task) && empty($disabled)) : ?>
@@ -37,5 +36,5 @@
 	<?php endif; ?>
 >
 	<span class="<?php echo $this->escape($icon ?? ''); ?>" aria-hidden="true"></span>
-	<span class="sr-only"><?php echo Text::_($title); ?></span>
+	<span class="sr-only"><?php echo $title; ?></span>
 </button>
diff --git a/layouts/joomla/button/transition-button.php b/layouts/joomla/button/transition-button.php
index db038fa132601..e1df159f2fd53 100644
--- a/layouts/joomla/button/transition-button.php
+++ b/layouts/joomla/button/transition-button.php
@@ -8,7 +8,6 @@
  */
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
 
 HTMLHelper::_('bootstrap.popover');
 
@@ -31,8 +30,8 @@
 <?php if ($only_icon) : ?>
 	<span class="tbody-icon mr-1">
 		<span class="<?php echo $this->escape($icon ?? ''); ?> <?php echo $tip ? 'hasPopover' : ''; ?>"
-			title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
-			data-content="<?php echo HTMLHelper::_('tooltipText', Text::_($title), '', 0); ?>"
+			title="<?php echo HTMLHelper::_('tooltipText', $tipTitle ?: $title, '', 0); ?>"
+			data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
 			data-placement="top"
 		></span>
 	</span>
@@ -43,7 +42,7 @@
 			href="javascript://"
 		<?php endif; ?>
 
-		title="<?php echo HTMLHelper::_('tooltipText', Text::_($tipTitle ? : $title), '', 0); ?>"
+		title="<?php echo HTMLHelper::_('tooltipText', $tipTitle ?: $title, '', 0); ?>"
 		data-content="<?php echo HTMLHelper::_('tooltipText', $title, '', 0); ?>"
 		data-placement="top"
 		onclick="Joomla.toggleAllNextElements(this, 'd-none')"
diff --git a/libraries/src/Button/FeaturedButton.php b/libraries/src/Button/FeaturedButton.php
index 7dca7eda42fac..79abdc025c50b 100644
--- a/libraries/src/Button/FeaturedButton.php
+++ b/libraries/src/Button/FeaturedButton.php
@@ -29,8 +29,8 @@ class FeaturedButton extends ActionButton
 	 */
 	protected function preprocess()
 	{
-		$this->addState(0, 'articles.featured', 'unfeatured', 'COM_CONTENT_UNFEATURED', ['tip_title' => 'JGLOBAL_TOGGLE_FEATURED']);
-		$this->addState(1, 'articles.unfeatured', 'featured', 'COM_CONTENT_FEATURED', ['tip_title' => 'JGLOBAL_TOGGLE_FEATURED']);
+		$this->addState(0, 'articles.featured', 'unfeatured', Text::_('COM_CONTENT_UNFEATURED'), ['tip_title' => Text::_('JGLOBAL_TOGGLE_FEATURED')]);
+		$this->addState(1, 'articles.unfeatured', 'featured', Text::_('COM_CONTENT_FEATURED'), ['tip_title' => Text::_('JGLOBAL_TOGGLE_FEATURED')]);
 	}
 
 	/**
@@ -88,17 +88,17 @@ public function render(string $value = null, string $row = null, array $options
 
 				$default['title'] = $tip;
 
-				$options['tip_title'] = 'JLIB_HTML_FEATURED_ITEM';
+				$options['tip_title'] = Text::_('JLIB_HTML_FEATURED_ITEM');
 
 				if ($featuredUp && $nowDate < $featuredUp->toUnix())
 				{
-					$options['tip_title'] = 'JLIB_HTML_FEATURED_PENDING_ITEM';
+					$options['tip_title'] = Text::_('JLIB_HTML_FEATURED_PENDING_ITEM');
 					$default['icon'] = 'pending';
 				}
 
 				if ($featuredDown && $nowDate > $featuredDown->toUnix())
 				{
-					$options['tip_title'] = 'JLIB_HTML_FEATURED_EXPIRED_ITEM';
+					$options['tip_title'] = Text::_('JLIB_HTML_FEATURED_EXPIRED_ITEM');
 					$default['icon'] = 'expired';
 				}
 			}
diff --git a/libraries/src/Button/PublishedButton.php b/libraries/src/Button/PublishedButton.php
index 849e70ace9c3a..3fce7670ad097 100644
--- a/libraries/src/Button/PublishedButton.php
+++ b/libraries/src/Button/PublishedButton.php
@@ -29,10 +29,10 @@ class PublishedButton extends ActionButton
 	 */
 	protected function preprocess()
 	{
-		$this->addState(1, 'unpublish', 'publish', 'JLIB_HTML_UNPUBLISH_ITEM', ['tip_title' => 'JPUBLISHED']);
-		$this->addState(0, 'publish', 'unpublish', 'JLIB_HTML_PUBLISH_ITEM', ['tip_title' => 'JUNPUBLISHED']);
-		$this->addState(2, 'unpublish', 'archive', 'JLIB_HTML_UNPUBLISH_ITEM', ['tip_title' => 'JARCHIVED']);
-		$this->addState(-2, 'publish', 'trash', 'JLIB_HTML_PUBLISH_ITEM', ['tip_title' => 'JTRASHED']);
+		$this->addState(1, 'unpublish', 'publish', Text::_('JLIB_HTML_UNPUBLISH_ITEM'), ['tip_title' => Text::_('JPUBLISHED')]);
+		$this->addState(0, 'publish', 'unpublish', Text::_('JLIB_HTML_PUBLISH_ITEM'), ['tip_title' => Text::_('JUNPUBLISHED')]);
+		$this->addState(2, 'unpublish', 'archive', Text::_('JLIB_HTML_UNPUBLISH_ITEM'), ['tip_title' => Text::_('JARCHIVED')]);
+		$this->addState(-2, 'publish', 'trash', Text::_('JLIB_HTML_PUBLISH_ITEM'), ['tip_title' => Text::_('JTRASHED')]);
 	}
 
 	/**
@@ -84,17 +84,17 @@ public function render(string $value = null, string $row = null, array $options
 
 				$default['title'] = $tip;
 
-				$options['tip_title'] = 'JLIB_HTML_PUBLISHED_ITEM';
+				$options['tip_title'] = Text::_('JLIB_HTML_PUBLISHED_ITEM');
 
 				if ($publishUp && $nowDate < $publishUp->toUnix())
 				{
-					$options['tip_title'] = 'JLIB_HTML_PUBLISHED_PENDING_ITEM';
+					$options['tip_title'] = Text::_('JLIB_HTML_PUBLISHED_PENDING_ITEM');
 					$default['icon'] = 'pending';
 				}
 
 				if ($publishDown && $nowDate > $publishDown->toUnix())
 				{
-					$options['tip_title'] = 'JLIB_HTML_PUBLISHED_EXPIRED_ITEM';
+					$options['tip_title'] = Text::_('JLIB_HTML_PUBLISHED_EXPIRED_ITEM');
 					$default['icon'] = 'expired';
 				}
 			}