Index: branches/5.2.x/core/admin_templates/languages/email_message_list.tpl
===================================================================
diff -u -N -r14244 -r15116
--- branches/5.2.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 14244)
+++ branches/5.2.x/core/admin_templates/languages/email_message_list.tpl	(.../email_message_list.tpl)	(revision 15116)
@@ -15,85 +15,48 @@
   				a_toolbar = new ToolBar();
 
   				<inp2:m_if check="m_IsDebugMode">
-	  				a_toolbar.AddButton(
-	  		  			new ToolBarButton(
-	  		  		  		'new_item',
-	  		  		  		'<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
-							function() {
-								std_precreate_item('emailevents', 'languages/email_message_edit');
-							}
-						)
-					);
+					<inp2:m_RenderElement design="toolbar_button" icon="new_item" title="la_ToolTip_Add">
+						std_precreate_item('emailevents', 'languages/email_message_edit');
+					</inp2:m_RenderElement>
 				</inp2:m_if>
 
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'edit',
-						'<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_Edit" escape="1"/>',
-						edit
-					)
-				);
+				<inp2:m_RenderElement design="toolbar_button" icon="edit" title="la_ToolTip_Edit" short_title="la_ShortToolTip_Edit">
+					edit();
+				</inp2:m_RenderElement>
 
 				<inp2:m_if check="m_IsDebugMode">
-					a_toolbar.AddButton(
-						new ToolBarButton(
-							'delete',
-							'<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
-							function() {
-								std_delete_items('emailevents');
-							}
-						)
-					);
+					<inp2:m_RenderElement design="toolbar_button" icon="delete" title="la_ToolTip_Delete">
+						std_delete_items('emailevents');
+					</inp2:m_RenderElement>
 				</inp2:m_if>
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				<inp2:m_if check="m_IsDebugMode">
-					a_toolbar.AddButton(
-						new ToolBarButton(
-							'approve',
-							'<inp2:m_phrase label="la_ToolTip_Enable" escape="1"/>',
-							function() {
-								submit_event('emailevents', 'OnMassApprove');
-							}
-						)
-					);
+					<inp2:m_RenderElement design="toolbar_button" icon="approve" title="la_ToolTip_Enable">
+						  submit_event('emailevents', 'OnMassApprove');
+					</inp2:m_RenderElement>
 
-					a_toolbar.AddButton(
-						new ToolBarButton(
-							'decline',
-							'<inp2:m_phrase label="la_ToolTip_Disable" escape="1"/>',
-							function() {
-								submit_event('emailevents', 'OnMassDecline');
-							}
-						)
-					);
+				  	<inp2:m_RenderElement design="toolbar_button" icon="decline" title="la_ToolTip_Disable">
+				  		submit_event('emailevents', 'OnMassDecline');
+				  	</inp2:m_RenderElement>
 				</inp2:m_if>
 
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'frontend_mail',
-						'<inp2:m_phrase label="la_ToolTip_Email_FrontOnly" escape="1"/>',
-						function() {
-							submit_event('emailevents', 'OnFrontOnly');
-						}
-					)
-				);
+				<inp2:m_RenderElement design="toolbar_button" icon="frontend_mail" title="la_ToolTip_Email_FrontOnly">
+					submit_event('emailevents', 'OnFrontOnly');
+				</inp2:m_RenderElement>
 
+				<inp2:m_RenderElement design="toolbar_button" icon="export" title="la_ToolTip_Export" short_title="la_ShortToolTip_Export">
+					open_popup('emailevents', 'OnExportEmailEvents', 'regional/languages_export');
+				</inp2:m_RenderElement>
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'view',
-						'<inp2:m_phrase label="la_ToolTip_View" escape="1"/>',
-						function() {
-							show_viewmenu(a_toolbar,'view');
-						}
-					)
-				);
+				<inp2:m_RenderElement design="toolbar_button" icon="view" title="la_ToolTip_View">
+					show_viewmenu(a_toolbar,'view');
+				</inp2:m_RenderElement>
 
 				a_toolbar.Render();
-
 			</script>
 		</td>
 		<inp2:m_RenderElement name="search_main_toolbar" prefix="emailevents" grid="Emails"/>