diff --git a/administrator/components/com_cpanel/tmpl/cpanel/default.php b/administrator/components/com_cpanel/tmpl/cpanel/default.php
index 8a28c306c2f94..3363f9a3d5b15 100644
--- a/administrator/components/com_cpanel/tmpl/cpanel/default.php
+++ b/administrator/components/com_cpanel/tmpl/cpanel/default.php
@@ -10,6 +10,7 @@
defined('_JEXEC') or die;
+use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Helper\ModuleHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;
@@ -64,7 +65,8 @@
data-joomla-dialog=""
data-close-on-message data-reload-on-close>
-
+
+
diff --git a/administrator/modules/mod_frontend/tmpl/default.php b/administrator/modules/mod_frontend/tmpl/default.php
index fcb126f39fcd7..d76906b346119 100644
--- a/administrator/modules/mod_frontend/tmpl/default.php
+++ b/administrator/modules/mod_frontend/tmpl/default.php
@@ -19,7 +19,8 @@
title=""
target="_blank">
', $icons, $finalHtmlString) : $finalHtmlString;
}
}
diff --git a/libraries/src/HTML/Helpers/SVGIcon.php b/libraries/src/HTML/Helpers/SVGIcon.php
new file mode 100644
index 0000000000000..c67bdd00772eb
--- /dev/null
+++ b/libraries/src/HTML/Helpers/SVGIcon.php
@@ -0,0 +1,144 @@
+
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\HTML\Helpers;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Utility class for inline SVG icons
+ *
+ * @since __DEPLOY_VERSION__
+ */
+abstract class SVGIcon
+{
+ /**
+ * Has the class been initialised
+ *
+ * @var bool
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ protected static $initialized = false;
+
+ /**
+ * Array containing the selected icons, as name => symbol.
+ *
+ * @var array
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ protected static $selected = [];
+
+ /**
+ * Array containing the pool of icons, as name => symbol.
+ *
+ * @var array
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ protected static $pool = [];
+
+ /**
+ * Imports a single icon to the pool
+ *
+ * @param string $name the name of the icon
+ * @param string $code the svg code of the icon
+ *
+ * @return void
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ protected static function importIcon(string $name, string $code)
+ {
+ static::$pool[$name] = $code;
+ }
+
+ /**
+ * Imports an array of icons to the pool
+ *
+ * @param array $icons
+ *
+ * @return void
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public static function importIcons(array $icons): void
+ {
+ if (static::$initialized !== true && is_file(JPATH_LIBRARIES . '/svg_icons.php')) {
+ $init = require JPATH_LIBRARIES . '/svg_icons.php';
+
+ foreach ($init as $name => $code) {
+ static::importIcon($name, $code);
+ }
+
+ static::$initialized = true;
+ }
+
+ foreach($icons as $name => $code) {
+ static::importIcon($name, $code);
+ }
+ }
+
+ /**
+ * Registers an icon
+ *
+ * @param string $name the name of the icon
+ *
+ * @return string the name of the icon
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public static function add(string $name): string
+ {
+ if (!static::$initialized) {
+ static::importIcons([]);
+
+ static::$initialized = true;
+ }
+
+ if (!isset(static::$pool[$name])) {
+ return '';
+ }
+
+ if (isset(static::$pool[$name]) && !isset(static::$selected[$name])) {
+ static::$selected[$name] = static::$pool[$name];
+ }
+
+ return $name;
+ }
+
+ /**
+ * Returns a specific selected icon
+ *
+ * @param string $name the name of the icon
+ *
+ * @return string
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public static function get(string $name): string
+ {
+ return !isset(static::$selected[$name]) ? '' : static::$selected[$name];
+ }
+
+ /**
+ * Returns all the currently selected icons
+ *
+ * @return array the array of the selected icons
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public static function getAll(): array
+ {
+ return static::$selected;
+ }
+}
diff --git a/libraries/src/HTML/Registry.php b/libraries/src/HTML/Registry.php
index 2ca78318c3f7c..c3798b1afe846 100644
--- a/libraries/src/HTML/Registry.php
+++ b/libraries/src/HTML/Registry.php
@@ -44,6 +44,7 @@ final class Registry
'formbehavior' => Helpers\FormBehavior::class,
'grid' => Helpers\Grid::class,
'icons' => Helpers\Icons::class,
+ 'svgicon' => Helpers\SVGIcon::class,
'jgrid' => Helpers\JGrid::class,
'jquery' => Helpers\Jquery::class,
'links' => Helpers\Links::class,
diff --git a/libraries/svg_icons.php b/libraries/svg_icons.php
new file mode 100644
index 0000000000000..c3b67a43a60c1
--- /dev/null
+++ b/libraries/svg_icons.php
@@ -0,0 +1,8 @@
+ '