Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r8929 -r8964
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8929)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 8964)
@@ -114,7 +114,10 @@
 ALTER TABLE Category ADD INDEX (TreeLeft);
 ALTER TABLE Category ADD INDEX (TreeRight);
 
-INSERT INTO ConfigurationValues (`VariableId` , `VariableName` , `VariableValue` , `ModuleOwner` , `Section` ) VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
 
-UPDATE `ConfigurationAdmin` SET `element_type` = 'textarea' WHERE `VariableName` = 'Category_MetaKey';
-UPDATE `ConfigurationAdmin` SET `element_type` = 'textarea' WHERE `VariableName` = 'Category_MetaDesc';
\ No newline at end of file
+UPDATE ConfigurationAdmin SET `element_type` = 'textarea' WHERE `VariableName` = 'Category_MetaKey';
+UPDATE ConfigurationAdmin SET `element_type` = 'textarea' WHERE `VariableName` = 'Category_MetaDesc';
+
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
\ No newline at end of file
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -r8961 -r8964
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 8961)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 8964)
@@ -65,6 +65,8 @@
 INSERT INTO ConfigurationAdmin VALUES ('OutputCompressionLevel', 'la_Text_Website', 'la_config_OutputCompressionLevel', 'text', '', '', 10.19, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('MailFunctionHeaderSeparator', 'la_Text_smtp_server', 'la_config_MailFunctionHeaderSeparator', 'radio', NULL, '1=la_Linux,2=la_Windows', 30.08, 0, 0);
 
+INSERT INTO ConfigurationAdmin VALUES ('UseToolbarLabels', 'la_Text_Website', 'la_UseToolbarLabels', 'checkbox', NULL , NULL , 10.20, 0, 0);
+
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Columns_Category', '2', 'In-Portal', 'Categories');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'DomainSelect','1','In-Portal','in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Site_Path', '/', 'In-Portal', 'in-portal:configure_general');
@@ -202,6 +204,8 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailFunctionHeaderSeparator', 1, 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CategoriesRebuildSerial', '0', 'In-Portal', '');
 
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'UseToolbarLabels', '1', 'In-Portal', 'in-portal:configure_general');
+
 INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.add', 0);
 INSERT INTO Events VALUES (DEFAULT, 'USER.ADD', NULL, 2, 0, 'In-Portal:Users', 'la_event_user.add', 1);
 INSERT INTO Events VALUES (DEFAULT, 'USER.APPROVE', NULL, 1, 0, 'In-Portal:Users', 'la_event_user.approve', 0);