Index: branches/5.0.x/core/admin_templates/languages/language_list.tpl
===================================================================
diff -u -r12495 -r12506
--- branches/5.0.x/core/admin_templates/languages/language_list.tpl	(.../language_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/languages/language_list.tpl	(.../language_list.tpl)	(revision 12506)
@@ -43,7 +43,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="lang" IdField="LanguageId" grid="LangManagement" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','primary_language','export_language') );
+	Grids['lang'].SetDependantToolbarButtons( new Array('edit','delete','setprimary','export_language') );
 </script>
 
 <inp2:m_if check="m_Recall" var="RefreshTopFrame" value="1">
Index: branches/5.0.x/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r12117 -r12506
--- branches/5.0.x/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 12506)
@@ -15,7 +15,7 @@
 	  			}
 
 	  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_user', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[u.admins]', 1);
 							std_precreate_item('u.admins', 'users/admins_edit')
Index: branches/5.0.x/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r12117 -r12506
--- branches/5.0.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 12506)
@@ -15,7 +15,7 @@
 	  			}
 
 	  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('new_user', '<inp2:m_phrase label="la_ToolTip_NewUser" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
+				a_toolbar.AddButton( new ToolBarButton('new_item, '<inp2:m_phrase label="la_ToolTip_NewUser" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
 							set_hidden_field('remove_specials[u.regular]', 1);
 							std_precreate_item('u.regular', 'users/users_edit')
Index: branches/5.0.x/core/units/logs/change_logs/change_logs_config.php
===================================================================
diff -u -r12495 -r12506
--- branches/5.0.x/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/logs/change_logs/change_logs_config.php	(.../change_logs_config.php)	(revision 12506)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: change_logs_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: change_logs_config.php 12506 2009-09-15 16:28:49Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -46,7 +46,7 @@
 
 			'change_log_list' => Array (
 				'prefixes' => Array('change-log_List'), 'format' => '!la_tab_ChangeLog!',
-				'toolbar_buttons' => Array ('view_item', 'view'),
+				'toolbar_buttons' => Array ('edit', 'view'),
 			),
 
 			'change_log_edit' => Array (
Index: branches/5.0.x/core/admin_templates/skins/skin_list.tpl
===================================================================
diff -u -r12495 -r12506
--- branches/5.0.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 12506)
@@ -66,7 +66,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="skin" IdField="SkinId" grid="Default" grid_filters="1"/>
 <script type="text/javascript">
-	Grids['skin'].SetDependantToolbarButtons( new Array('edit', 'delete', 'primary_theme', 'clone') );
+	Grids['skin'].SetDependantToolbarButtons( new Array('edit', 'delete', 'setprimary', 'clone') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl
===================================================================
diff -u -r12495 -r12506
--- branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/categories/xml/tree_categories.tpl	(.../tree_categories.tpl)	(revision 12506)
@@ -4,7 +4,7 @@
 		<folder
 			name="<inp2:Field name='Name'/>"
 			href="<inp2:CategoryLink template='catalog/catalog' pass='m' m_opener='r'/>"
-			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='IsMenu' value='1'>_system</inp2:m_if>.png"
+			icon="<inp2:c_ModulePath module='core'/>img/icons/icon24_section<inp2:m_if check='FieldEquals' name='IsSystem' value='1'>_system</inp2:m_if>.png"
 			onclick="checkCatalog(<inp2:m_if check="Field" name="SymLinkCategoryId" db="db"><inp2:Field name="SymLinkCategoryId" db="db"/><inp2:m_else/><inp2:Field name='CategoryId' db="db"/></inp2:m_if>, '<inp2:GetModulePrefix/>')"
 			load_url="<inp2:CategoryLink pass='m'/>">
 		</folder>
Index: branches/5.0.x/core/units/users/users_config.php
===================================================================
diff -u -r12495 -r12506
--- branches/5.0.x/core/units/users/users_config.php	(.../users_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/users/users_config.php	(.../users_config.php)	(revision 12506)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: users_config.php 12506 2009-09-15 16:28:49Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -132,7 +132,7 @@
 
 						'users_list' => Array (
 							'prefixes' => Array ('u_List'), 'format' => "!la_title_Users!",
-							'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view', 'dbl-click'),
+							'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'e-mail', 'export', 'view', 'dbl-click'),
 						),
 
 						'users_edit' => Array (
@@ -162,7 +162,7 @@
 
 						'admin_list' => Array (
 							'prefixes' => Array ('u.admins_List'), 'format' => "!la_title_Administrators!",
-							'toolbar_buttons' => Array ('new_user', 'edit', 'delete', 'clone', 'refresh', 'view', 'dbl-click'),
+							'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'clone', 'refresh', 'view', 'dbl-click'),
 							),
 
 						'admins_edit' => Array (
Index: branches/5.0.x/core/admin_templates/categories/categories_edit_images.tpl
===================================================================
diff -u -r12495 -r12506
--- branches/5.0.x/core/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/categories/categories_edit_images.tpl	(.../categories_edit_images.tpl)	(revision 12506)
@@ -67,7 +67,7 @@
 						}
 				 ) );
 
-				 a_toolbar.AddButton( new ToolBarButton('primary_image', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
+				 a_toolbar.AddButton( new ToolBarButton('setprimary', '<inp2:m_phrase label="la_ToolTip_SetPrimary" escape="1"/>', function() {
 							submit_event('c-img','OnSetPrimary');
 						}
 				 ) );
@@ -103,7 +103,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="c-img" IdField="ImageId" grid="Default" menu_filters="yes"/>
 <script type="text/javascript">
-	Grids['c-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','primary_image') );
+	Grids['c-img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl
===================================================================
diff -u -r12117 -r12506
--- branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 12506)
@@ -18,7 +18,7 @@
 								  	std_edit_item('change-log', 'logs/change_logs/change_log_edit');
 								}
 
-								a_toolbar.AddButton( new ToolBarButton('view_item', '<inp2:m_phrase label="la_ToolTip_ViewItem" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_View" escape="1"/>', edit) );
+								a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_ViewDetails" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Details" escape="1"/>', edit) );
 
 
 					  		a_toolbar.AddButton( new ToolBarSeparator('sep1') );
@@ -73,7 +73,7 @@
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="change-log" IdField="ChangeLogId" grid="Default" grid_filters="1" limited_heights="1" row_class_render_as="row_class"/>
 <script type="text/javascript">
-	Grids['change-log'].SetDependantToolbarButtons( new Array('view_item') );
+	Grids['change-log'].SetDependantToolbarButtons( new Array('edit') );
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file