diff --git a/src/script.php b/src/script.php
index 85da88e6..49481545 100644
--- a/src/script.php
+++ b/src/script.php
@@ -980,8 +980,8 @@ class Pkg_MokowaasInstallerScript
 			$iconMap = [
 				'class:cogs'         => 'icon-cogs',
 				'class:puzzle-piece' => 'icon-puzzle-piece',
-				'class:headphones'   => 'icon-headphones',
-				'class:file-code'    => 'icon-file-code',
+				'class:headphones'   => 'fa-solid fa-handshake-angle',
+				'class:file-code'    => 'fa-solid fa-file-code',
 				'class:lock'         => 'icon-lock',
 				'class:shield-alt'   => 'icon-shield-alt',
 				'class:database'     => 'icon-database',
@@ -992,10 +992,15 @@ class Pkg_MokowaasInstallerScript
 				'class:bolt'         => 'icon-bolt',
 			];
 
+			// Find all MokoWaaS component submenu items (including those linking to other components)
 			$db->setQuery(
-				"SELECT id, img, params FROM #__menu"
-				. " WHERE client_id = 1 AND level >= 2"
-				. " AND link LIKE '%com_mokowaas%'"
+				$db->getQuery(true)
+					->select(['m.id', 'm.img', 'm.params'])
+					->from($db->quoteName('#__menu', 'm'))
+					->where('m.client_id = 1')
+					->where('m.level >= 2')
+					->where('m.parent_id IN (SELECT id FROM ' . $db->quoteName('#__menu')
+						. ' WHERE client_id = 1 AND level = 1 AND link LIKE ' . $db->quote('%com_mokowaas%') . ')')
 			);
 
 			foreach ($db->loadObjectList() as $item)