Index: branches/RC/core/units/general/helpers/sections_helper.php
===================================================================
diff -u -r11143 -r11154
--- branches/RC/core/units/general/helpers/sections_helper.php	(.../sections_helper.php)	(revision 11143)
+++ branches/RC/core/units/general/helpers/sections_helper.php	(.../sections_helper.php)	(revision 11154)
@@ -117,6 +117,14 @@
 
 				// this is to display HELP icon instead of missing one.. can be replaced with some other icon to draw attention
 				$icon_file = $module_folder.'/admin_templates/img/icons/icon24_'.$this->Tree[$section_name]['icon'];
+
+				/*$core_file = FULL_PATH.'/core/admin_templates/img/icons/icon24_' . $this->Tree[$section_name]['icon'].'.gif';
+				if ($module_folder != 'core' && file_exists($core_file) && file_exists(FULL_PATH.'/'.$icon_file.'.gif')) {
+					if (crc32(file_get_contents($core_file)) == crc32(file_get_contents(FULL_PATH.'/'.$icon_file.'.gif'))) {
+						trigger_error('Section "<strong>' . $section_name . '</strong>" uses icon copy from "Core" module', E_USER_NOTICE);
+					}
+				}*/
+
 				if (!file_exists(FULL_PATH.'/'.$icon_file.'.gif')) {
 					$this->Tree[$section_name]['icon'] = 'help';
 					$this->Tree[$section_name]['icon_module'] = 'core';
Index: branches/RC/core/admin_templates/img/link_arrow.gif
===================================================================
diff -u -r8929 -r11154
Binary files differ
Index: branches/RC/core/units/ban_rules/ban_rules_config.php
===================================================================
diff -u -r11143 -r11154
--- branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11143)
+++ branches/RC/core/units/ban_rules/ban_rules_config.php	(.../ban_rules_config.php)	(revision 11154)
@@ -36,7 +36,7 @@
 		'Sections' => Array (
 			'in-portal:user_banlist' => Array (
 				'parent'		=>	'in-portal:users',
-				'icon'			=>	'in-portal:banlist',
+				'icon'			=>	'banlist',
 				'label'			=>	'la_tab_BanList',
 				'url'			=>	Array('t' => 'ban_rules/ban_rule_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'add', 'edit', 'delete'),
Index: branches/RC/core/admin_templates/img/ic_pick.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -r10843 -r11154
--- branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 10843)
+++ branches/RC/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 11154)
@@ -29,7 +29,7 @@
 		'Sections' => Array (
 			'in-portal:email_queue' => Array (
 				'parent'		=>	'in-portal:email_folder',
-				'icon'			=>	'in-portal:email_log',
+				'icon'			=>	'email_log',
 				'label'			=>	'la_tab_EmailQueue',
 				'url'			=>	Array('t' => 'logs/email_logs/email_queue_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'delete'),
Index: branches/RC/core/units/logs/email_logs/email_logs_config.php
===================================================================
diff -u -r10843 -r11154
--- branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 10843)
+++ branches/RC/core/units/logs/email_logs/email_logs_config.php	(.../email_logs_config.php)	(revision 11154)
@@ -29,7 +29,7 @@
 		'Sections' => Array (
 			'in-portal:email_folder' => Array (
 				'parent'		=>	'in-portal:reports',
-				'icon'			=>	'in-portal:email_log',
+				'icon'			=>	'email_log',
 				'label'			=>	'la_tab_EmailLog',
 				'permissions'	=>	Array (),
 				'priority'		=>	4,
@@ -38,7 +38,7 @@
 
 			'in-portal:emaillog' => Array (
 				'parent'		=>	'in-portal:email_folder',
-				'icon'			=>	'in-portal:email_log',
+				'icon'			=>	'email_log',
 				'label'			=>	'la_tab_EmailLog',
 				'url'			=>	Array('t' => 'logs/email_logs/email_log_list', 'pass' => 'm'),
 				'permissions'	=>	Array ('view', 'delete'),
Index: branches/RC/core/admin_templates/img/ic_hot.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/units/logs/change_logs/change_logs_config.php
===================================================================
diff -u -r10294 -r11154
--- branches/RC/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 10294)
+++ branches/RC/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 11154)
@@ -40,7 +40,7 @@
 		'Sections' => Array (
 			'in-portal:change_logs' => Array (
 				'parent'		=>	'in-portal:reports',
-				'icon'			=>	'in-portal:change_logs',
+				'icon'			=>	'change_logs',
 				'label'			=>	'la_tab_ChangeLog',
 				'url'			=>	Array('t' => 'logs/change_logs/change_log_list', 'pass' => 'm'),
 				'permissions'	=>	Array('view', 'edit', 'delete'),
Index: branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl
===================================================================
diff -u -r10841 -r11154
--- branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl	(.../email_log_list.tpl)	(revision 10841)
+++ branches/RC/core/admin_templates/logs/email_logs/email_log_list.tpl	(.../email_log_list.tpl)	(revision 11154)
@@ -31,7 +31,7 @@
 
 				 			a_toolbar.AddButton(
 								new ToolBarButton(
-									'in-portal:reset',
+									'reset',
 									'<inp2:m_phrase label="la_ToolTip_DeleteAll" escape="1"/>',
 									function() {
 										if (inpConfirm('<inp2:m_Phrase name="la_Delete_Confirm" escape="1"/>')) {
Index: branches/RC/core/admin_templates/img/ic_new.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/img/ic_pop.gif
===================================================================
diff -u
Binary files differ
Index: branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl
===================================================================
diff -u -r10843 -r11154
--- branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 10843)
+++ branches/RC/core/admin_templates/logs/email_logs/email_queue_list.tpl	(.../email_queue_list.tpl)	(revision 11154)
@@ -41,7 +41,7 @@
 
 				 			a_toolbar.AddButton(
 								new ToolBarButton(
-									'in-portal:reset',
+									'reset',
 									'<inp2:m_phrase label="la_ToolTip_DeleteAll" escape="1"/>',
 									function() {
 										if (inpConfirm('<inp2:m_Phrase name="la_Delete_Confirm" escape="1"/>')) {
Index: branches/RC/core/admin_templates/tools/system_tools.tpl
===================================================================
diff -u -r9835 -r11154
--- branches/RC/core/admin_templates/tools/system_tools.tpl	(.../system_tools.tpl)	(revision 9835)
+++ branches/RC/core/admin_templates/tools/system_tools.tpl	(.../system_tools.tpl)	(revision 11154)
@@ -1,9 +1,6 @@
-<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="section_header" icon="icon46_modules" title="!la_title_SystemTools!"/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="system_tools"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="system_tools" module="in-portal" icon="icon46_modules"/>
-
 <script type="text/javascript">
 	function show_structure($prefix, $event) {
 		var $form = document.getElementById($form_name);