diff --git a/layouts/joomla/button/iconclass.php b/layouts/joomla/button/iconclass.php
index f7e137a45bc7c..bbaa337ba13b3 100644
--- a/layouts/joomla/button/iconclass.php
+++ b/layouts/joomla/button/iconclass.php
@@ -9,113 +9,8 @@
 
 defined('_JEXEC') or die;
 
-// Convert icomoon to fa
-$icon = $displayData['icon'];
+use Joomla\CMS\Layout\LayoutHelper;
 
-if(strpos($icon, 'fa-') == true || strpos($icon, 'icon-') == true){
-	$icon = $icon;
-}
-elseif  ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
-{
-	$icon = 'fas fa-folder';
-}
-elseif ($icon === 'publish')
-{
-	$icon = 'fas fa-check';
-}
-elseif ($icon === 'unpublish' || $icon === 'cancel' || $icon === 'delete' || $icon === 'remove')
-{
-	$icon = 'fas fa-times';
-}
-elseif ($icon === 'new' || $icon === 'save-new')
-{
-	$icon = 'fas fa-plus';
-}
-elseif ($icon === 'apply' || $icon === 'save')
-{
-	$icon = 'fas fa-save';
-}
-elseif ($icon === 'mail')
-{
-	$icon = 'fas fa-envelope';
-}
-elseif ($icon === 'unfeatured' || $icon === 'asterisk')
-{
-	$icon = 'fas fa-star';
-}
-elseif ($icon === 'featured')
-{
-	$icon = 'fas fa-star featured';
-}
-elseif ($icon === 'checkedout')
-{
-	$icon = 'fas fa-lock';
-}
-elseif ($icon === 'eye-close')
-{
-	$icon = 'fas fa-eye-slash';
-}
-elseif ($icon === 'eye-open')
-{
-	$icon = 'fas fa-eye';
-}
-elseif ($icon === 'loop' || $icon === 'refresh' || $icon === 'unblock')
-{
-	$icon = 'fas fa-sync';
-}
-elseif ($icon === 'contract')
-{
-	$icon = 'fas fa-compress';
-}
-elseif ($icon === 'purge')
-{
-	$icon = 'fas fa-trash';
-}
-elseif ($icon === 'options')
-{
-	$icon = 'fas fa-cog';
-}
-elseif ($icon === 'expired')
-{
-	$icon = 'fas fa-minus-circle';
-}
-elseif ($icon === 'save-copy')
-{
-	$icon = 'fas fa-copy';
-}
-elseif ($icon === 'checkin')
-{
-	$icon = 'fas fa-check-square';
-}
-elseif ($icon === 'generic')
-{
-	$icon = 'fas fa-dot-circle';
-}
-elseif ($icon === 'list-2')
-{
-	$icon = 'fas fa-list-ul';
-}
-elseif ($icon === 'default')
-{
-	$icon = 'fas fa-home';
-}
-elseif ($icon === 'crop')
-{
-	$icon = 'fas fa-crop';
-}
-elseif ($icon === 'chevron-down')
-{
-	$icon = 'fas fa-chevron-down';
-}
-elseif ($icon === 'times')
-{
-	$icon = 'fas fa-times';
-}
-elseif ($icon === 'move')
-{
-	$icon = 'fas fa-arrows-alt';
-}
-else{
-	$icon = 'icon-' . $icon;
-}
-echo $icon;
+$displayData['html'] = false;
+
+echo LayoutHelper::render('joomla.icon.iconclass', $displayData);
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index 0c3035f3b4ee8..8f4ba088f798f 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -10,12 +10,13 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
 ?>
 <dd class="category-name">
-	<span class="fas fa-folder-open fa-fw" aria-hidden="true"></span>
+	<?php echo LayoutHelper::render('joomla.icon.iconclass', ['icon' => 'fa-folder-open fa-fw']); ?>
 	<?php $title = $this->escape($displayData['item']->category_title); ?>
 	<?php if ($displayData['params']->get('link_category') && !empty($displayData['item']->catid)) : ?>
 		<?php $url = '<a href="' . Route::_(
diff --git a/layouts/joomla/icon/iconclass.php b/layouts/joomla/icon/iconclass.php
new file mode 100644
index 0000000000000..58d50c8b71f3d
--- /dev/null
+++ b/layouts/joomla/icon/iconclass.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Convert icomoon to fa
+$icon = $displayData['icon'];
+$html = $displayData['html'] ?? true;
+
+switch ($icon)
+{
+	case (strpos($icon, 'fa-') !== false):
+		$icon = 'fas ' . str_ireplace('fas ', '', $icon);
+		break;
+
+	case (strpos($icon, 'icon-') !== false):
+		break;
+
+	case 'archive':
+	case 'folder-close':
+	case 'folder-folder-2':
+	case 'folder-minus':
+	case 'folder-plus-2':
+	case 'folder-remove':
+	case 'drawer-2':
+		$icon = 'fas fa-folder';
+		break;
+
+	case 'publish':
+		$icon = 'fas fa-check';
+		break;
+
+	case 'unpublish':
+	case 'cancel':
+	case 'delete':
+	case 'remove':
+	case 'times':
+		$icon = 'fas fa-times';
+		break;
+
+	case 'new':
+	case 'save-new':
+		$icon = 'fas fa-plus';
+		break;
+
+	case 'apply':
+	case 'save':
+		$icon = 'fas fa-save';
+		break;
+
+	case 'mail':
+		$icon = 'fas fa-envelope';
+		break;
+
+	case 'unfeatured':
+	case 'asterisk':
+		$icon = 'fas fa-star';
+		break;
+
+	case 'featured':
+		$icon = 'fas fa-star featured';
+		break;
+
+	case 'checkedout':
+	case 'protected':
+		$icon = 'fas fa-lock';
+		break;
+
+	case 'eye-close':
+		$icon = 'fas fa-eye-slash';
+		break;
+
+	case 'eye-open':
+		$icon = 'fas fa-eye';
+		break;
+
+	case 'loop':
+	case 'refresh':
+	case 'unblock':
+		$icon = 'fas fa-sync';
+		break;
+
+	case 'contract':
+		$icon = 'fas fa-compress';
+		break;
+
+	case 'purge':
+	case 'trash':
+		$icon = 'fas fa-trash';
+		break;
+
+	case 'options':
+		$icon = 'fas fa-cog';
+		break;
+
+	case 'expired':
+		$icon = 'fas fa-minus-circle';
+		break;
+
+	case 'save-copy':
+		$icon = 'fas fa-copy';
+		break;
+
+	case 'checkin':
+		$icon = 'fas fa-check-square';
+		break;
+
+	case 'generic':
+		$icon = 'fas fa-dot-circle';
+		break;
+
+	case 'list-2':
+		$icon = 'fas fa-list-ul';
+		break;
+
+	case 'default':
+		$icon = 'fas fa-home';
+		break;
+
+	case 'crop':
+		$icon = 'fas fa-crop';
+		break;
+
+	case 'chevron-down':
+		$icon = 'fas fa-chevron-down';
+		break;
+
+	case 'move':
+		$icon = 'fas fa-arrows-alt';
+		break;
+
+	default:
+		$icon = 'icon-' . $icon;
+		break;
+}
+
+if ($html !== false)
+{
+	$icon = '<span class="' . $icon . '" aria-hidden="true"></span>';
+}
+
+echo $icon;
diff --git a/layouts/joomla/toolbar/iconclass.php b/layouts/joomla/toolbar/iconclass.php
index 15abd51c740fd..bbaa337ba13b3 100644
--- a/layouts/joomla/toolbar/iconclass.php
+++ b/layouts/joomla/toolbar/iconclass.php
@@ -9,114 +9,8 @@
 
 defined('_JEXEC') or die;
 
-// Convert icomoon to fa
-$icon = $displayData['icon'];
+use Joomla\CMS\Layout\LayoutHelper;
 
-if(strpos($icon, 'fa-') == true || strpos($icon, 'icon-') == true){
-	$icon = $icon;
-}
-elseif  ($icon === 'archive' || $icon === 'folder-close' || $icon === 'folder-folder-2' || $icon === 'folder-minus' || $icon === 'folder-plus-2' || $icon === 'folder-remove' || $icon === 'drawer-2')
-{
-	$icon = 'fas fa-folder';
-}
-elseif ($icon === 'publish')
-{
-	$icon = 'fas fa-check';
-}
-elseif ($icon === 'unpublish' || $icon === 'cancel' || $icon === 'delete' || $icon === 'remove')
-{
-	$icon = 'fas fa-times';
-}
-elseif ($icon === 'new' || $icon === 'save-new')
-{
-	$icon = 'fas fa-plus';
-}
-elseif ($icon === 'apply' || $icon === 'save')
-{
-	$icon = 'fas fa-save';
-}
-elseif ($icon === 'mail')
-{
-	$icon = 'fas fa-envelope';
-}
-elseif ($icon === 'unfeatured' || $icon === 'asterisk')
-{
-	$icon = 'fas fa-star';
-}
-elseif ($icon === 'featured')
-{
-	$icon = 'fas fa-star featured';
-}
-elseif ($icon === 'checkedout')
-{
-	$icon = 'fas fa-lock';
-}
-elseif ($icon === 'eye-close')
-{
-	$icon = 'fas fa-eye-slash';
-}
-elseif ($icon === 'eye-open')
-{
-	$icon = 'fas fa-eye';
-}
-elseif ($icon === 'loop' || $icon === 'refresh' || $icon === 'unblock')
-{
-	$icon = 'fas fa-sync';
-}
-elseif ($icon === 'contract')
-{
-	$icon = 'fas fa-compress';
-}
-elseif ($icon === 'purge')
-{
-	$icon = 'fas fa-trash';
-}
-elseif ($icon === 'options')
-{
-	$icon = 'fas fa-cog';
-}
-elseif ($icon === 'expired')
-{
-	$icon = 'fas fa-minus-circle';
-}
-elseif ($icon === 'save-copy')
-{
-	$icon = 'fas fa-copy';
-}
-elseif ($icon === 'checkin')
-{
-	$icon = 'fas fa-check-square';
-}
-elseif ($icon === 'generic')
-{
-	$icon = 'fas fa-dot-circle';
-}
-elseif ($icon === 'list-2')
-{
-	$icon = 'fas fa-list-ul';
-}
-elseif ($icon === 'default')
-{
-	$icon = 'fas fa-home';
-}
-elseif ($icon === 'crop')
-{
-	$icon = 'fas fa-crop';
-}
-elseif ($icon === 'chevron-down')
-{
-	$icon = 'fas fa-chevron-down';
-}
-elseif ($icon === 'times')
-{
-	$icon = 'fas fa-times';
-}
-elseif ($icon === 'move')
-{
-	$icon = 'fas fa-arrows-alt';
-}
-else
-{
-	$icon = 'icon-' . $icon;
-}
-echo $icon;
+$displayData['html'] = false;
+
+echo LayoutHelper::render('joomla.icon.iconclass', $displayData);
diff --git a/libraries/src/HTML/Helpers/ActionsDropdown.php b/libraries/src/HTML/Helpers/ActionsDropdown.php
index 015b63336f4e7..b6f6ee304c96b 100644
--- a/libraries/src/HTML/Helpers/ActionsDropdown.php
+++ b/libraries/src/HTML/Helpers/ActionsDropdown.php
@@ -10,7 +10,9 @@
 
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 
 /**
  * HTML utility class for building a dropdown menu
@@ -226,10 +228,13 @@ public static function divider()
 	public static function addCustomItem($label, $icon = '', $id = '', $task = '')
 	{
 		static::$dropDownList[] = '<li>'
-			. '<a href = "javascript://" onclick="Joomla.listItemTask(\'' . $id . '\', \'' . $task . '\')">'
-			. ($icon ? '<span class="icon-' . $icon . '" aria-hidden="true"></span> ' : '')
-			. $label
-			. '</a>'
+			. HTMLHelper::link(
+				'javascript://',
+				($icon ? LayoutHelper::render('joomla.icon.iconclass', ['icon' => $icon]) : '') . $label,
+				[
+					'onclick' => 'Joomla.listItemTask(\'' . $id . '\', \'' . $task . '\')'
+				]
+			)
 			. '</li>';
 	}
 }
diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php
index a68a32a41fb56..e7d5ec8e61d10 100644
--- a/libraries/src/HTML/Helpers/JGrid.php
+++ b/libraries/src/HTML/Helpers/JGrid.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
@@ -89,45 +90,7 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
-
-			if (strpos($active_class, 'fa-') !== false)
-			{
-				$active_class = 'fas ' . $active_class;
-			}
-			elseif (strpos($active_class, 'icon-') !== false)
-			{
-				$active_class = $active_class;
-			}
-			elseif ($active_class === 'publish')
-			{
-				$active_class = 'fas fa-check';
-			}
-			elseif ($active_class === 'unpublish')
-			{
-				$active_class = 'fas fa-times';
-			}
-			elseif ($active_class === 'archive')
-			{
-				$active_class = 'fas fa-folder';
-			}
-			elseif ($active_class === 'checkedout')
-			{
-				$active_class = 'fas fa-lock';
-			}
-			elseif ($active_class === 'unfeatured')
-			{
-				$active_class = 'fas fa-star';
-			}
-			elseif ($active_class === 'featured')
-			{
-				$active_class = 'fas fa-star featured';
-			}
-			else
-			{
-				$active_class = 'icon-' . $active_class;
-			}
-
-			$html[] = '<span class="' . $active_class . '" aria-hidden="true"></span>';
+			$html[] = LayoutHelper::render('joomla.icon.iconclass', ['icon' => $active_class]);
 			$html[] = '</a>';
 			$html[] = $tip ? '<div role="tooltip" id="' . $ariaid . '">' . $title . '</div>' : '';
 		}
@@ -136,53 +99,7 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			$html[] = '<span class="tbody-icon jgrid"';
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
-
-			if ($active_class === 'protected')
-			{
-				$html[] = '<span class="fas fa-lock" aria-hidden="true"></span>';
-			}
-			else
-			{
-				if (strpos($inactive_class, 'fa-') !== false)
-				{
-					$inactive_class = 'fas ' . $inactive_class;
-				}
-				elseif (strpos($inactive_class, 'icon-') !== false)
-				{
-					$inactive_class = $inactive_class;
-				}
-				elseif ($inactive_class === 'publish')
-				{
-					$inactive_class = 'fas fa-check';
-				}
-				elseif ($inactive_class === 'unpublish')
-				{
-					$inactive_class = 'fas fa-times';
-				}
-				elseif ($inactive_class === 'archive')
-				{
-					$inactive_class = 'fas fa-folder';
-				}
-				elseif ($inactive_class === 'checkedout')
-				{
-					$inactive_class = 'fas fa-lock';
-				}
-				elseif ($inactive_class === 'unfeatured')
-				{
-					$inactive_class = 'fas fa-star';
-				}
-				elseif ($inactive_class === 'featured')
-				{
-					$inactive_class = 'fas fa-star featured';
-				}
-				else
-				{
-					$inactive_class = 'icon-' . $inactive_class;
-				}
-
-				$html[] = '<span class="' . $inactive_class . '" aria-hidden="true"></span>';
-			}
-
+			$html[] = LayoutHelper::render('joomla.icon.iconclass', ['icon' => $inactive_class]);
 			$html[] = '</span>';
 			$html[] = $tip ? '<div role="tooltip" id="' . $ariaid . '">' . $title . '</div>' : '';
 		}
diff --git a/libraries/src/Toolbar/ToolbarButton.php b/libraries/src/Toolbar/ToolbarButton.php
index dae3f39743b7b..9bedf2fa5bff3 100644
--- a/libraries/src/Toolbar/ToolbarButton.php
+++ b/libraries/src/Toolbar/ToolbarButton.php
@@ -197,6 +197,7 @@ protected function renderButton(array &$options): string
 
 		// Isolate button class from icon class
 		$buttonClass = str_replace('fas fa-', '', $this->getName());
+		$buttonClass = str_ireplace('fa-', '', $buttonClass);
 		$iconclass = $options['btnClass'] ?? '';
 		$options['btnClass'] = 'button-' . $buttonClass . ' ' . $iconclass;