diff --git a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
index 397fd43c0a2..09a95e1f1e0 100644
--- a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
+++ b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
@@ -127,7 +127,7 @@ public function display($tpl = null)
                     } elseif ($parts[0] === 'system') {
                         $icon = 'icon-wrench';
                     } elseif ($parts[0] === 'healthcheck') {
-                        $icon = 'icon-health';
+                        $icon = 'icon-heart';
                     } elseif ($parts[0] === 'help') {
                         $icon = 'icon-info-circle';
                     } elseif ($lang->hasKey($keyIcon)) {
diff --git a/administrator/modules/mod_healthcheck/src/Helper/HealthCheckHelper.php b/administrator/modules/mod_healthcheck/src/Helper/HealthCheckHelper.php
index ae43429f082..011ea602e58 100644
--- a/administrator/modules/mod_healthcheck/src/Helper/HealthCheckHelper.php
+++ b/administrator/modules/mod_healthcheck/src/Helper/HealthCheckHelper.php
@@ -123,12 +123,18 @@ protected function getHealthCheckData(
 
             PluginHelper::importPlugin('healthcheck');
 
-            $arrays = (array) $application->getDispatcher()->dispatch(
+            $eventResult = $application->getDispatcher()->dispatch(
                 $eventName,
                 new HealthChecksEvent($eventName, ['context' => $context])
             );
 
-            foreach ($arrays as $response) {
+            $result = $eventResult->getArgument('result');
+
+            if (empty($result)) {
+                return [];
+            }
+
+            foreach ($result as $response) {
                 if (!\is_array($response)) {
                     continue;
                 }
diff --git a/administrator/modules/mod_healthcheck/tmpl/default.php b/administrator/modules/mod_healthcheck/tmpl/default.php
index f069857b28a..b023e55a9af 100644
--- a/administrator/modules/mod_healthcheck/tmpl/default.php
+++ b/administrator/modules/mod_healthcheck/tmpl/default.php
@@ -51,7 +51,7 @@
                 <?php echo Text::_('MOD_HEALTHCHECK_FILTER_CRITICAL'); ?>
             </button>
         </div>
-        <button type="button" class="btn btn-primary">
+        <button type="button" class="btn btn-sm btn-primary">
             <i class="icon-refresh"></i>
         </button>
     </div>
@@ -100,7 +100,7 @@
     <?php else : ?>
         <?php echo LayoutHelper::render('joomla.content.emptystate_module', [
             'textPrefix' => 'MOD_HEALTHCHECK',
-            'icon'       => 'icon-health',
+            'icon'       => 'icon-heart',
             'title'      => 'MOD_HEALTHCHECK_NO_MATCHING_RESULTS'
         ]); ?>
     <?php endif; ?>
diff --git a/layouts/joomla/healthchecks/icon.php b/layouts/joomla/healthchecks/icon.php
index e27e11606fa..ef7c1f04a47 100644
--- a/layouts/joomla/healthchecks/icon.php
+++ b/layouts/joomla/healthchecks/icon.php
@@ -31,6 +31,7 @@
 // Make the class string
 
 // depending on status, determine additional class
+$class        = '';
 $filterStatus = 'healthy'; // Default to "healthy"
 if (isset($displayData['status'])) {
     switch ($displayData['status']) {
diff --git a/build/media_source/mod_healthcheck/css/healthcheck-filter.css b/media_source/mod_healthcheck/css/healthcheck-filter.css
similarity index 98%
rename from build/media_source/mod_healthcheck/css/healthcheck-filter.css
rename to media_source/mod_healthcheck/css/healthcheck-filter.css
index 3dfd56c45bc..e1ce0ceb792 100644
--- a/build/media_source/mod_healthcheck/css/healthcheck-filter.css
+++ b/media_source/mod_healthcheck/css/healthcheck-filter.css
@@ -154,7 +154,7 @@
 }
 
 /* High contrast mode support */
-@media (prefers-contrast: high) {
+@media (prefers-contrast: more) {
   .healthcheck-gauge {
     border: 2px solid;
   }
diff --git a/build/media_source/mod_healthcheck/js/healthcheck-filter.js b/media_source/mod_healthcheck/js/healthcheck-filter.js
similarity index 100%
rename from build/media_source/mod_healthcheck/js/healthcheck-filter.js
rename to media_source/mod_healthcheck/js/healthcheck-filter.js