Index: branches/5.1.x/core/admin_templates/themes/extra_toolbar.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/themes/extra_toolbar.tpl	(.../extra_toolbar.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/themes/extra_toolbar.tpl	(.../extra_toolbar.tpl)	(revision 12657)
@@ -5,7 +5,7 @@
 			</td>
 			<td>
 				<a class="kx-header-link" href="#<inp2:m_Param name='editing_mode'/>" onclick="getFrame('main').location.href = this.href; return false;">
-					<img src="<inp2:m_TemplatesBase/>/img/top_frame/icons/<inp2:m_Param name='image'/>.gif" alt="" border="0"/>
+					<img src="<inp2:m_TemplatesBase/>/img/top_frame/icons/<inp2:m_Param name='image'/>.png" alt="" border="0"/>
 				</a>&nbsp;
 			</td>
 			<td style="padding-right: 5px;<inp2:m_ifnot check='m_Param' name='is_last'> border-right: 1px solid #BBBBBB;</inp2:m_ifnot>">
@@ -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