diff --git a/source/packages/com_mokosuiteclient/admin/language/en-GB/com_mokosuiteclient.sys.ini b/source/packages/com_mokosuiteclient/admin/language/en-GB/com_mokosuiteclient.sys.ini
index 1ac9f72b..ccc54f48 100644
--- a/source/packages/com_mokosuiteclient/admin/language/en-GB/com_mokosuiteclient.sys.ini
+++ b/source/packages/com_mokosuiteclient/admin/language/en-GB/com_mokosuiteclient.sys.ini
@@ -17,3 +17,9 @@ COM_MOKOSUITECLIENT_MENU_WAFLOG="WAF Log"
 COM_MOKOSUITECLIENT_MENU_DATABASE="Database Tools"
 COM_MOKOSUITECLIENT_MENU_CLEANUP="Cache Cleanup"
 COM_MOKOSUITECLIENT_MENU_CACHE="Cache Management"
+COM_MOKOSUITECLIENT_MENU_CONDITIONS="Conditions"
+COM_MOKOSUITECLIENT_MENU_SNIPPETS="Snippets"
+COM_MOKOSUITECLIENT_MENU_TEMPLATES="Content Templates"
+COM_MOKOSUITECLIENT_MENU_REPLACEMENTS="Replacements"
+COM_MOKOSUITECLIENT_MENU_AUTOMATION="Automation"
+COM_MOKOSUITECLIENT_MENU_MODULES="Modules"
diff --git a/source/packages/com_mokosuiteclient/mokosuiteclient.xml b/source/packages/com_mokosuiteclient/mokosuiteclient.xml
index cbf8d919..b6d7e26a 100644
--- a/source/packages/com_mokosuiteclient/mokosuiteclient.xml
+++ b/source/packages/com_mokosuiteclient/mokosuiteclient.xml
@@ -47,6 +47,12 @@
 			<menu link="option=com_mokosuiteclient&amp;view=waflog" img="class:shield-alt">COM_MOKOSUITECLIENT_MENU_WAFLOG</menu>
 			<menu link="option=com_mokosuiteclient&amp;view=database" img="class:database">COM_MOKOSUITECLIENT_MENU_DATABASE</menu>
 			<menu link="option=com_mokosuiteclient&amp;view=cleanup" img="class:trash">COM_MOKOSUITECLIENT_MENU_CLEANUP</menu>
+			<menu link="option=com_mokosuiteclient&amp;view=conditions" img="class:shuffle">COM_MOKOSUITECLIENT_MENU_CONDITIONS</menu>
+			<menu link="option=com_mokosuiteclient&amp;view=snippets" img="class:code">COM_MOKOSUITECLIENT_MENU_SNIPPETS</menu>
+			<menu link="option=com_mokosuiteclient&amp;view=templates" img="class:file-alt">COM_MOKOSUITECLIENT_MENU_TEMPLATES</menu>
+			<menu link="option=com_mokosuiteclient&amp;view=replacements" img="class:exchange-alt">COM_MOKOSUITECLIENT_MENU_REPLACEMENTS</menu>
+			<menu link="option=com_mokosuiteclient&amp;view=automation" img="class:random">COM_MOKOSUITECLIENT_MENU_AUTOMATION</menu>
+			<menu link="option=com_mokosuiteclient&amp;view=modules" img="class:th-large">COM_MOKOSUITECLIENT_MENU_MODULES</menu>
 			<menu link="option=com_plugins&amp;filter[folder]=system&amp;filter[search]=mokosuiteclient" img="class:power-off">COM_MOKOSUITECLIENT_MENU_PLUGINS</menu>
 			<menu link="option=com_installer&amp;view=update" img="class:refresh">COM_MOKOSUITECLIENT_MENU_UPDATES</menu>
 			<menu link="option=com_checkin" img="class:check-square">COM_MOKOSUITECLIENT_MENU_CHECKIN</menu>
diff --git a/source/packages/mod_mokosuiteclient_menu/tmpl/default.php b/source/packages/mod_mokosuiteclient_menu/tmpl/default.php
index 0c382156..d03a3529 100644
--- a/source/packages/mod_mokosuiteclient_menu/tmpl/default.php
+++ b/source/packages/mod_mokosuiteclient_menu/tmpl/default.php
@@ -43,9 +43,10 @@ $iconOverrides = [
 	'com_mokosuiteclient'       => 'icon-shield-alt',
 	'com_mokosuitehq'           => 'icon-tachometer-alt',
 	'com_mokosuitebackup'       => 'icon-archive',
-	'com_mokosuitecrm'          => 'icon-address-book',
-	'com_mokosuiteerp'          => 'icon-briefcase',
+	'com_mokosuite_crm'         => 'icon-address-book',
+	'com_mokosuite_erp'         => 'icon-briefcase',
 	'com_mokosuiteshop'         => 'icon-shopping-cart',
+	'com_mokoshop'              => 'icon-shopping-cart',
 	'com_mokosuitepos'          => 'icon-calculator',
 	'com_mokosuitemrp'          => 'icon-cogs',
 	'com_mokosuitehrm'          => 'icon-id-badge',
@@ -57,8 +58,24 @@ $iconOverrides = [
 	'com_mokosuiteforms'        => 'icon-list-alt',
 	'com_mokosuitecommunity'    => 'icon-comments',
 	'com_mokosuitecross'        => 'icon-share-alt',
+	'com_mokoog'                => 'icon-globe',
 	'com_mokosuiteopengraph'    => 'icon-globe',
 	'com_mokosuitestorelocator' => 'icon-map-marker-alt',
+	'com_mokosuiteanalytics'    => 'icon-chart-line',
+	'com_mokosuitesecurity'     => 'icon-lock',
+	'com_mokosuitenotify'       => 'icon-bell',
+	'com_mokosuiteworkflow'     => 'icon-random',
+	'com_mokosuiteai'           => 'icon-magic',
+	'com_mokosuiteauto'         => 'icon-car',
+	'com_mokosuitebeauty'       => 'icon-spa',
+	'com_mokosuiteconstruction' => 'icon-hard-hat',
+	'com_mokosuiteeditor'       => 'icon-edit',
+	'com_mokosuiteevent'        => 'icon-calendar',
+	'com_mokosuiteinsight'      => 'icon-lightbulb',
+	'com_mokosuitelibrary'      => 'icon-book',
+	'com_mokosuiterealty'        => 'icon-home',
+	'com_mokosuitesupport'      => 'icon-life-ring',
+	'com_mokosuitetaxi'         => 'icon-taxi',
 ];
 
 $childIconMap = [