diff --git a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
index 04ad61fe734cf..dccbd24670801 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
+++ b/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
@@ -94,7 +94,7 @@
 
         if (xtdButton.href) {
           tmp.onAction = () => {
-            document.getElementById(`${xtdButton.id}Modal`).open();
+            document.getElementById(`${xtdButton.id}_modal`).open();
           };
         } else {
           tmp.onAction = () => {
diff --git a/layouts/joomla/editors/buttons/button.php b/layouts/joomla/editors/buttons/button.php
index a245755ca6e1d..49993ee41fb85 100644
--- a/layouts/joomla/editors/buttons/button.php
+++ b/layouts/joomla/editors/buttons/button.php
@@ -17,13 +17,14 @@
 	$class   = 'btn btn-secondary';
 	$class  .= ($button->get('class')) ? ' ' . $button->get('class') : null;
 	$class  .= ($button->get('modal')) ? ' modal-button' : null;
-	$href    = '#' . str_replace(' ', '', $button->get('text')) . 'Modal';
+	$href    = '#' . strtolower($button->get('name')) . '_modal';
 	$link    = ($button->get('link')) ? Uri::base() . $button->get('link') : null;
 	$onclick = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : '';
 	$title   = ($button->get('title')) ? $button->get('title') : $button->get('text');
+	$icon    = ($button->get('icon')) ? $button->get('icon') : $button->get('name');
 ?>
 <button type="button" data-bs-target="<?php echo $href; ?>" class="xtd-button btn btn-secondary <?php echo $class; ?>" <?php echo $button->get('modal') ? 'data-bs-toggle="modal"' : '' ?> title="<?php echo $title; ?>" <?php echo $onclick; ?>>
-	<span class="icon-<?php echo $button->get('name'); ?>" aria-hidden="true"></span>
+	<span class="icon-<?php echo $icon; ?>" aria-hidden="true"></span>
 	<?php echo $button->get('text'); ?>
 </button>
 <?php endif; ?>
diff --git a/layouts/joomla/editors/buttons/modal.php b/layouts/joomla/editors/buttons/modal.php
index 93a200a483524..099590bf606d3 100644
--- a/layouts/joomla/editors/buttons/modal.php
+++ b/layouts/joomla/editors/buttons/modal.php
@@ -22,7 +22,7 @@
 
 $class    = ($button->get('class')) ? $button->get('class') : null;
 $class   .= ($button->get('modal')) ? ' modal-button' : null;
-$href     = '#' . str_replace(' ', '', $button->get('text')) . 'Modal';
+$href     = '#' . strtolower($button->get('name')) . '_modal';
 $link     = ($button->get('link')) ? Uri::base() . $button->get('link') : null;
 $onclick  = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : '';
 $title    = ($button->get('title')) ? $button->get('title') : $button->get('text');
@@ -42,7 +42,7 @@
 }
 else
 {
-	$id = str_replace(' ', '', $button->get('text')) . 'Modal';
+	$id = strtolower($button->get('name')) . '_modal';
 }
 
 // TODO: J4: Move Make buttons fullscreen on smaller devices per https://github.com/joomla/joomla-cms/pull/23091
diff --git a/plugins/editors-xtd/article/article.php b/plugins/editors-xtd/article/article.php
index 86cec46fe207f..62f1cb0c270ef 100644
--- a/plugins/editors-xtd/article/article.php
+++ b/plugins/editors-xtd/article/article.php
@@ -61,15 +61,15 @@ public function onDisplay($name)
 		$link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;'
 			. Session::getFormToken() . '=1&amp;editor=' . $name;
 
-		$button           = new CMSObject;
-		$button->modal    = true;
-		$button->link     = $link;
-		$button->text     = Text::_('PLG_ARTICLE_BUTTON_ARTICLE');
-		$button->name     = 'file-add';
-		$button->iconSVG  = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M28 24v-4h-4v4h-4v4h4v4h4v-4h4v-4zM2 2h18v6h6v10h2v-10l-8-'
+		$button = new CMSObject;
+		$button->modal   = true;
+		$button->link    = $link;
+		$button->text    = Text::_('PLG_ARTICLE_BUTTON_ARTICLE');
+		$button->name    = $this->_type . '_' . $this->_name;
+		$button->icon    = 'file-add';
+		$button->iconSVG = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M28 24v-4h-4v4h-4v4h4v4h4v-4h4v-4zM2 2h18v6h6v10h2v-10l-8-'
 								. '8h-20v32h18v-2h-16z"></path></svg>';
-		$button->realName = 'PlgButtonArticle';
-		$button->options  = [
+		$button->options = [
 			'height'     => '300px',
 			'width'      => '800px',
 			'bodyHeight' => '70',
diff --git a/plugins/editors-xtd/contact/contact.php b/plugins/editors-xtd/contact/contact.php
index cff2f99803496..83c431e2b4913 100644
--- a/plugins/editors-xtd/contact/contact.php
+++ b/plugins/editors-xtd/contact/contact.php
@@ -55,7 +55,8 @@ public function onDisplay($name)
 		$button->modal   = true;
 		$button->link    = $link;
 		$button->text    = Text::_('PLG_EDITORS-XTD_CONTACT_BUTTON_CONTACT');
-		$button->name    = 'address';
+		$button->name    = $this->_type . '_' . $this->_name;
+		$button->icon    = 'address';
 		$button->iconSVG = '<svg viewBox="0 0 448 512" width="24" height="24"><path d="M436 160c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-20V48c'
 							. '0-26.5-21.5-48-48-48H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h320c26.5 0 48-21.5 48-48v-48h20c6.6 0 12-5.4 1'
 							. '2-12v-40c0-6.6-5.4-12-12-12h-20v-64h20c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-20v-64h20zm-228-32c35.3 0 64 28.7'
diff --git a/plugins/editors-xtd/fields/fields.php b/plugins/editors-xtd/fields/fields.php
index 207b191621f87..70a4f2b73b0cc 100644
--- a/plugins/editors-xtd/fields/fields.php
+++ b/plugins/editors-xtd/fields/fields.php
@@ -63,11 +63,12 @@ public function onDisplay($name)
 		$link = 'index.php?option=com_fields&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;context='
 			. $context . '&amp;editor=' . $name . '&amp;' . Session::getFormToken() . '=1';
 
-		$button          = new CMSObject;
+		$button = new CMSObject;
 		$button->modal   = true;
 		$button->link    = $link;
 		$button->text    = Text::_('PLG_EDITORS-XTD_FIELDS_BUTTON_FIELD');
-		$button->name    = 'puzzle';
+		$button->name    = $this->_type . '_' . $this->_name;
+		$button->icon    = 'puzzle';
 		$button->iconSVG = '<svg viewBox="0 0 576 512" width="24" height="24"><path d="M519.442 288.651c-41.519 0-59.5 31.593-82.058 31.593C377.'
 							. '409 320.244 432 144 432 144s-196.288 80-196.288-3.297c0-35.827 36.288-46.25 36.288-85.985C272 19.216 243.885 0 210.'
 							. '539 0c-34.654 0-66.366 18.891-66.366 56.346 0 41.364 31.711 59.277 31.711 81.75C175.885 207.719 0 166.758 0 166.758'
diff --git a/plugins/editors-xtd/image/image.php b/plugins/editors-xtd/image/image.php
index d3c5a2dc5dd99..a77625d4b5bcb 100644
--- a/plugins/editors-xtd/image/image.php
+++ b/plugins/editors-xtd/image/image.php
@@ -88,20 +88,21 @@ public function onDisplay($name, $asset, $author)
 			$button->modal   = true;
 			$button->link    = $link;
 			$button->text    = Text::_('PLG_IMAGE_BUTTON_IMAGE');
-			$button->name    = 'pictures';
+			$button->name    = $this->_type . '_' . $this->_name;
+			$button->icon    = 'pictures';
 			$button->iconSVG = '<svg width="24" height="24" viewBox="0 0 512 512"><path d="M464 64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48'
 								. ' 48 48h416c26.51 0 48-21.49 48-48V112c0-26.51-21.49-48-48-48zm-6 336H54a6 6 0 0 1-6-6V118a6 6 0 0 1 6-6h404a6 6'
 								. ' 0 0 1 6 6v276a6 6 0 0 1-6 6zM128 152c-22.091 0-40 17.909-40 40s17.909 40 40 40 40-17.909 40-40-17.909-40-40-40'
 								. 'zM96 352h320v-80l-87.515-87.515c-4.686-4.686-12.284-4.686-16.971 0L192 304l-39.515-39.515c-4.686-4.686-12.284-4'
 								. '.686-16.971 0L96 304v48z"></path></svg>';
 			$button->options = [
-				'height'     => '400px',
-				'width'      => '800px',
-				'bodyHeight' => '70',
-				'modalWidth' => '80',
-				'tinyPath'   => $link,
+				'height'          => '400px',
+				'width'           => '800px',
+				'bodyHeight'      => '70',
+				'modalWidth'      => '80',
+				'tinyPath'        => $link,
 				'confirmCallback' => 'Joomla.getImage(Joomla.selectedMediaFile, \'' . $name . '\', this)',
-				'confirmText' => Text::_('PLG_IMAGE_BUTTON_INSERT')
+				'confirmText'     => Text::_('PLG_IMAGE_BUTTON_INSERT')
 			];
 
 			return $button;
diff --git a/plugins/editors-xtd/menu/menu.php b/plugins/editors-xtd/menu/menu.php
index 2421c2824bae4..61b0d08a7eab0 100644
--- a/plugins/editors-xtd/menu/menu.php
+++ b/plugins/editors-xtd/menu/menu.php
@@ -52,11 +52,12 @@ public function onDisplay($name)
 		$link = 'index.php?option=com_menus&amp;view=items&amp;layout=modal&amp;tmpl=component&amp;'
 			. Session::getFormToken() . '=1&amp;editor=' . $name;
 
-		$button          = new CMSObject;
+		$button = new CMSObject;
 		$button->modal   = true;
 		$button->link    = $link;
 		$button->text    = Text::_('PLG_EDITORS-XTD_MENU_BUTTON_MENU');
-		$button->name    = 'list';
+		$button->name    = $this->_type . '_' . $this->_name;
+		$button->icon    = 'list';
 		$button->iconSVG = '<svg viewBox="0 0 512 512"  width="24" height="24"><path d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 1'
 							. '6 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 '
 							. '0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H1'
@@ -65,8 +66,8 @@ public function onDisplay($name)
 							. 'h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>';
 
 		$button->options = [
-			'height' => '300px',
-			'width'  => '800px',
+			'height'      => '300px',
+			'width'       => '800px',
 			'bodyHeight'  => '70',
 			'modalWidth'  => '80',
 		];
diff --git a/plugins/editors-xtd/module/module.php b/plugins/editors-xtd/module/module.php
index dd9b8c9d341d0..9f03874d7c817 100644
--- a/plugins/editors-xtd/module/module.php
+++ b/plugins/editors-xtd/module/module.php
@@ -53,12 +53,13 @@ public function onDisplay($name)
 		{
 			$link = 'index.php?option=com_modules&amp;view=modules&amp;layout=modal&amp;tmpl=component&amp;editor='
 					. $name . '&amp;' . Session::getFormToken() . '=1';
-			$button          = new CMSObject;
+			$button = new CMSObject;
 			$button->modal   = true;
 			$button->link    = $link;
 			$button->text    = Text::_('PLG_MODULE_BUTTON_MODULE');
-			$button->name    = 'cube';
-			$button->iconSVG  = '<svg viewBox="0 0 512 512" width="24" height="24"><path d="M239.1 6.3l-208 78c-18.7 7-31.1 '
+			$button->name    = $this->_type . '_' . $this->_name;
+			$button->icon    = 'cube';
+			$button->iconSVG = '<svg viewBox="0 0 512 512" width="24" height="24"><path d="M239.1 6.3l-208 78c-18.7 7-31.1 '
 				. '25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 '
 				. '26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 '
 				. '78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"></path></svg>';
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.php b/plugins/editors-xtd/pagebreak/pagebreak.php
index f1c823c33636a..639d6ca497d48 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.php
+++ b/plugins/editors-xtd/pagebreak/pagebreak.php
@@ -60,11 +60,12 @@ public function onDisplay($name)
 		Factory::getDocument()->addScriptOptions('xtd-pagebreak', array('editor' => $name));
 		$link = 'index.php?option=com_content&amp;view=article&amp;layout=pagebreak&amp;tmpl=component&amp;e_name=' . $name;
 
-		$button          = new CMSObject;
+		$button = new CMSObject;
 		$button->modal   = true;
 		$button->link    = $link;
 		$button->text    = Text::_('PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK');
-		$button->name    = 'copy';
+		$button->name    = $this->_type . '_' . $this->_name;
+		$button->icon    = 'copy';
 		$button->iconSVG = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M26 8h-6v-2l-6-6h-14v24h12v8h20v-18l-6-6zM26 10.828l3.172 3'
 							. '.172h-3.172v-3.172zM14 2.828l3.172 3.172h-3.172v-3.172zM2 2h10v6h6v14h-16v-20zM30 30h-16v-6h6v-14h4v6h6v14z"></pa'
 							. 'th></svg>';
diff --git a/plugins/editors-xtd/readmore/readmore.php b/plugins/editors-xtd/readmore/readmore.php
index cca42f8dcded5..2bb52f899c803 100644
--- a/plugins/editors-xtd/readmore/readmore.php
+++ b/plugins/editors-xtd/readmore/readmore.php
@@ -63,7 +63,8 @@ public function onDisplay($name)
 		$button->modal   = false;
 		$button->onclick = 'insertReadmore(\'' . $name . '\');return false;';
 		$button->text    = Text::_('PLG_READMORE_BUTTON_READMORE');
-		$button->name    = 'arrow-down';
+		$button->name    = $this->_type . '_' . $this->_name;
+		$button->icon    = 'arrow-down';
 		$button->iconSVG = '<svg viewBox="0 0 32 32" width="24" height="24"><path d="M32 12l-6-6-10 10-10-10-6 6 16 16z"></path></svg>';
 		$button->link    = '#';
 
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 2a278893bf104..87c53decd0926 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -697,7 +697,7 @@ private function tinyButtons($name, $excluded)
 			// Build the script
 			foreach ($buttons as $i => $button)
 			{
-				$button->id = $name . '_' . $button->text . 'Modal';
+				$button->id = $name . '_' . $button->name . '_modal';
 
 				echo LayoutHelper::render('joomla.editors.buttons.modal', $button);
 
@@ -705,9 +705,9 @@ private function tinyButtons($name, $excluded)
 				{
 					// Set some vars
 					$btnName = $button->get('text');
-					$modalId = $name . '_' . str_replace(' ', '', $button->get('text'));
+					$modalId = $name . '_' . $button->name;
 					$onclick = $button->get('onclick') ?: null;
-					$icon    = $button->get('name');
+					$icon    = $button->get('icon');
 
 					if ($button->get('link') !== '#')
 					{