Index: branches/RC/core/admin_templates/no_permission.tpl
===================================================================
diff -u -N -r11623 -r11724
--- branches/RC/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/no_permission.tpl	(.../no_permission.tpl)	(revision 11724)
@@ -1,29 +1,44 @@
-<inp2:m_Set m_wid="1"/>
 <inp2:m_include t="incs/header"/>
 <inp2:m_Set skip_last_template="1"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="no_permissions" module="in-portal" icon="icon46_banlist"/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:root" title_preset="no_permissions" parent="0"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
-  	<td>
-  		<script type="text/javascript">
-				a_toolbar = new ToolBar();
+  		<td id="toolbar_cell">
+  			<script type="text/javascript">
+  				function prepareToolbar() {
+					a_toolbar = new ToolBar();
 
-	  			a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Back" escape="1"/>',
-						function() {
-							if (getWindowOpener(window) != null) {
-								window_close();
-							}
-							else {
+					a_toolbar.AddButton(
+		  				new ToolBarButton(
+		  					'prev',
+		  					'<inp2:m_phrase label="la_ToolTip_Back" escape="1"/>',
+							function() {
 								history.back();
 							}
-						} ) );
+						)
+					);
 
-				a_toolbar.Render();
+					if (getWindowOpener(window) != null) {
+						a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
+						a_toolbar.AddButton(
+			  				new ToolBarButton(
+			  					'cancel',
+			  					'<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>',
+								function() {
+									window_close();
+								}
+							)
+						);
+					}
+
+					a_toolbar.Render( $('#toolbar_cell').get(0) );
+  				}
+
 				<inp2:m_ifnot check="m_LoggedIn">
 					$(document).ready(
 						function () {
@@ -34,6 +49,7 @@
 
 				$(document).ready(
 					function() {
+						prepareToolbar();
 						Application.removeDebuggerStatistics();
 						maximizeElement('#permission_error');
 
@@ -66,5 +82,4 @@
 	</inp2:m_if>
 </div>
 
-<inp2:m_Set _force_popup="1"/>
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file