Index: trunk/core/units/admin/admin_config.php
===================================================================
diff -u -N -r6428 -r6647
--- trunk/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 6428)
+++ trunk/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 6647)
@@ -23,7 +23,7 @@
 					'Sections'			=>	Array(
 													'in-portal:root'	=>	Array(
 																						'parent'		=>	null,
-																						'icon'			=>	'site',
+																						'icon'			=>	'in-portal:site',
 																						'label'			=>	$this->Application->ConfigValue('Site_Name'),
 																						'url'			=>	Array('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
 																						'permissions'	=>	Array('advanced:admin_login', 'advanced:front_login'),
@@ -34,7 +34,7 @@
 													// "Summary & Logs" section
 													'in-portal:reports'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'summary_logs',
+																						'icon'			=>	'in-portal:summary_logs',
 																						'label'			=>	'la_tab_Reports',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -44,7 +44,7 @@
 
 													'in-portal:log_summary'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'summary',
+																						'icon'			=>	'in-portal:summary',
 																						'label'			=>	'la_tab_Summary',
 																						'url'			=>	Array('index_file' => 'logs/summary.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -54,7 +54,7 @@
 
 													'in-portal:searchlog'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'search_log',
+																						'icon'			=>	'in-portal:search_log',
 																						'label'			=>	'la_tab_SearchLog',
 																						'url'			=>	Array('index_file' => 'logs/searchlog.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -64,7 +64,7 @@
 
 													'in-portal:sessionlog'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'sessions_log',
+																						'icon'			=>	'in-portal:sessions_log',
 																						'label'			=>	'la_tab_SessionLog',
 																						'url'			=>	Array('index_file' => 'logs/session_list.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -74,7 +74,7 @@
 
 													'in-portal:emaillog'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'email_log',
+																						'icon'			=>	'in-portal:email_log',
 																						'label'			=>	'la_tab_EmailLog',
 																						'url'			=>	Array('index_file' => 'logs/email_log.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -84,7 +84,7 @@
 
 													'in-portal:visits'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'visits',
+																						'icon'			=>	'in-portal:visits',
 																						'label'			=>	'la_tab_Visits',
 																						'url'			=>	Array('t' => 'visits/visits_list', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -95,7 +95,7 @@
 													// "Configuration" section
 													'in-portal:system'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'conf',
+																						'icon'			=>	'in-portal:conf',
 																						'label'			=>	'la_tab_Sys_Config',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -105,9 +105,9 @@
 
 													'in-portal:configure_general'	=>	Array(
 																								'parent'		=>	'in-portal:system',
-																								'icon'			=>	'conf_general',
+																								'icon'			=>	'in-portal:conf_general',
 																								'label'			=>	'la_tab_General',
-																								'url'			=>	Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
+																								'url'			=>	Array('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'),
 																								'permissions'	=>	Array('view', 'edit'),
 																								'priority'		=>	1,
 																								'type'			=>	stTREE,
@@ -116,7 +116,7 @@
 													// "Tools" section
 													'in-portal:tools'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'tools',
+																						'icon'			=>	'in-portal:tools',
 																						'label'			=>	'la_tab_Tools',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -126,7 +126,7 @@
 
 													'in-portal:backup'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_backup',
+																						'icon'			=>	'in-portal:tool_backup',
 																						'label'			=>	'la_tab_Backup',
 																						'url'			=>	Array('index_file' => 'backup/backup1.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -136,7 +136,7 @@
 
 													'in-portal:restore'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_restore',
+																						'icon'			=>	'in-portal:tool_restore',
 																						'label'			=>	'la_tab_Restore',
 																						'url'			=>	Array('index_file' => 'backup/restore1.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -146,7 +146,7 @@
 
 													'in-portal:main_import'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_import',
+																						'icon'			=>	'in-portal:tool_import',
 																						'label'			=>	'la_tab_ImportData',
 																						'url'			=>	Array('index_file' => 'import/step1.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -156,7 +156,7 @@
 
 													'in-portal:sql_query'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_import',
+																						'icon'			=>	'in-portal:tool_import',
 																						'label'			=>	'la_tab_QueryDB',
 																						'url'			=>	Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'edit'),
@@ -166,7 +166,7 @@
 
 													'in-portal:server_info'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'server_info',
+																						'icon'			=>	'in-portal:server_info',
 																						'label'			=>	'la_tab_ServerInfo',
 																						'url'			=>	Array('index_file' => 'tools/server_info.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -177,7 +177,7 @@
 													// "Help" section
 													'in-portal:help'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'help',
+																						'icon'			=>	'in-portal:help',
 																						'label'			=>	'la_tab_Help',
 																						'url'			=>	Array('index_file' => 'help/manual.pdf', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -193,7 +193,7 @@
 	if ($application->isDebugMode()) {
 				$config['Sections']['in-portal:service'] = Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'conf_general',
+																						'icon'			=>	'in-portal:conf_general',
 																						'label'			=>	'la_tab_Service',
 																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),