diff --git a/source/packages/mod_mokosuiteclient_menu/tmpl/default.php b/source/packages/mod_mokosuiteclient_menu/tmpl/default.php
index 418723b6..1c29b80d 100644
--- a/source/packages/mod_mokosuiteclient_menu/tmpl/default.php
+++ b/source/packages/mod_mokosuiteclient_menu/tmpl/default.php
@@ -165,6 +165,10 @@ foreach ($rest as $comp)
 
 <style>
 .sidebar-wrapper .mokosuiteclient-ext-child > a { padding-inline-start: 0.5rem; }
+.sidebar-wrapper .item > a [class^="icon-"],
+.sidebar-wrapper .item > a [class*=" icon-"],
+.sidebar-wrapper .item > a [class^="fa-"],
+.sidebar-wrapper .item > a [class*=" fa-"] { margin-left: 0; }
 </style>
 
 <ul class="nav flex-column main-nav">
diff --git a/source/script.php b/source/script.php
index 0e772ebf..fd10b4e8 100644
--- a/source/script.php
+++ b/source/script.php
@@ -585,10 +585,11 @@ class Pkg_MokosuiteclientInstallerScript
 		{
 			$db = Factory::getDbo();
 
-			// 1. Delete orphaned extension rows with empty element
+			// 1. Delete orphaned MokoSuiteClient extension rows with empty element
 			$db->setQuery("DELETE FROM " . $db->quoteName('#__extensions')
 				. " WHERE " . $db->quoteName('element') . " = ''"
-				. " AND " . $db->quoteName('type') . " = 'plugin'");
+				. " AND " . $db->quoteName('type') . " = " . $db->quote('plugin')
+				. " AND " . $db->quoteName('name') . " LIKE " . $db->quote('%MokoSuiteClient%'));
 			$db->execute();
 			$deleted = $db->getAffectedRows();