diff --git a/manager/actions/mutate_module.dynamic.php b/manager/actions/mutate_module.dynamic.php
index bfc3ca8f94..cba79828d6 100644
--- a/manager/actions/mutate_module.dynamic.php
+++ b/manager/actions/mutate_module.dynamic.php
@@ -449,7 +449,7 @@ function SetUrl(url, width, height, alt) {
 	<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">
 
 	<h1>
-		<i class="fa fa-cubes"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
+		<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
 	</h1>
 
 	<?= $_style['actionbuttons']['dynamic']['element'] ?>
diff --git a/manager/frames/mainmenu.php b/manager/frames/mainmenu.php
index e2cca9991c..a28f79f400 100644
--- a/manager/frames/mainmenu.php
+++ b/manager/frames/mainmenu.php
@@ -52,7 +52,7 @@
 	$sitemenu['modules'] = array(
 		'modules',
 		'main',
-		'<i class="fa fa-cubes"></i>' . $_lang['modules'],
+		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
 		'javascript:;',
 		$_lang['modules'],
 		' return false;',
@@ -210,7 +210,7 @@
 	$sitemenu['new_module'] = array(
 		'new_module',
 		'modules',
-		'<i class="fa fa-cubes"></i>' . $_lang['module_management'],
+		'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
 		'index.php?a=106',
 		$_lang['module_management'],
 		'',
@@ -224,7 +224,7 @@
 
 if($modx->hasPermission('exec_module')) {
 	if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
-		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, mg.member
+		$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm,icon, mg.member
 				FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
 				LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
 				LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
@@ -238,7 +238,7 @@
             $sitemenu['module' . $row['id']] = array(
                 'module' . $row['id'],
                 'modules',
-                ($row['name'] == 'Extras' ? '<i class="fa fa-archive"></i>' : '<i class="fa fa-cube"></i>') . $row['name'],
+                ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],
                 'index.php?a=112&id=' . $row['id'],
                 $row['name'],
                 '',