diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php
index 4575e4572f991..007bfaa5ef34b 100644
--- a/administrator/components/com_menus/tmpl/items/default.php
+++ b/administrator/components/com_menus/tmpl/items/default.php
@@ -211,7 +211,7 @@
 									<td class="text-center d-none d-md-table-cell">
 										<?php if ($item->type == 'component') : ?>
 											<?php if ($item->language == '*' || $item->home == '0') : ?>
-												<?php echo HTMLHelper::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, 'cb', null, 'home', 'circle'); ?>
+												<?php echo HTMLHelper::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected, 'cb', null, 'fa-home', 'fa-circle'); ?>
 											<?php elseif ($canChange) : ?>
 												<a href="<?php echo Route::_('index.php?option=com_menus&task=items.unsetDefault&cid[]=' . $item->id . '&' . Session::getFormToken() . '=1'); ?>">
 													<?php if ($item->language_image) : ?>
diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php
index 00f5f69bdfd3f..a68a32a41fb56 100644
--- a/libraries/src/HTML/Helpers/JGrid.php
+++ b/libraries/src/HTML/Helpers/JGrid.php
@@ -90,7 +90,11 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
 
-			if (strpos($active_class, 'fa-') == true || strpos($active_class, 'icon-') == true)
+			if (strpos($active_class, 'fa-') !== false)
+			{
+				$active_class = 'fas ' . $active_class;
+			}
+			elseif (strpos($active_class, 'icon-') !== false)
 			{
 				$active_class = $active_class;
 			}
@@ -139,7 +143,11 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			}
 			else
 			{
-				if (strpos($inactive_class, 'fa-') == true || strpos($inactive_class, 'icon-') == true)
+				if (strpos($inactive_class, 'fa-') !== false)
+				{
+					$inactive_class = 'fas ' . $inactive_class;
+				}
+				elseif (strpos($inactive_class, 'icon-') !== false)
 				{
 					$inactive_class = $inactive_class;
 				}