Index: branches/5.0.x/core/admin_templates/themes/extra_toolbar.tpl
===================================================================
diff -u -r12117 -r12246
--- branches/5.0.x/core/admin_templates/themes/extra_toolbar.tpl	(.../extra_toolbar.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/themes/extra_toolbar.tpl	(.../extra_toolbar.tpl)	(revision 12246)
@@ -15,10 +15,7 @@
 
 	<table cellpadding="0" cellspacing="0">
 		<tr>
-			<inp2:m_RenderElement name="edit_mode_element" editing_mode="1" image="show_structure" title="Browse Mode" strip_nl="2"/>
-			<inp2:m_RenderElement name="edit_mode_element" editing_mode="4" image="content_mode" title="Content Mode" strip_nl="2"/>
-			<inp2:m_RenderElement name="edit_mode_element" editing_mode="2" image="show_all" title="Layout Mode" strip_nl="2"/>
-			<inp2:m_RenderElement name="edit_mode_element" editing_mode="3" image="show_all" title="Design Mode" strip_nl="2" is_last="1"/>
+			<inp2:core-sections_PrintEditingModes render_as="edit_mode_element" strip_nl="2"/>
 		</tr>
 	</table>
 </div>
\ No newline at end of file