Index: branches/RC/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -r9397 -r9544
--- branches/RC/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 9397)
+++ branches/RC/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 9544)
@@ -55,33 +55,26 @@
 				        <noscript>
 
 				        <inp2:m_get name="m_cat_id" result_to_var="current_category"/>
-				        
-				        	<inp2:m_DefineElement name="static_menu_design" link="" title="">
-				        		<div class="horz_nlsmenu horz_nlsitemcontainer horz_nlsitem">
-				        			<a class="horz_nlsitem" href="<inp2:m_Param name="link"/>"><inp2:m_Param name="title"/></a><br />			        		</div>
-				        	</inp2:m_DefineElement>
 
-
 				        	<inp2:m_DefineElement name="static_menu_element">
-										<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
+				        		<inp2:m_ModuleInfo key="Name" value="$module" return="RootCat" result_to_var="root_cat"/>
 										<inp2:m_Random result_to_var="rand"/>
 										<inp2:m_Set m_cat_id="$root_cat"/>
-
-										<inp2:m_DefineElement name="scat_menu_elem">
-											<inp2:CategoryLink template="__default__" result_to_var="link"/>
-											<inp2:Field name="Name" result_to_var="title"/>
-											<inp2:m_RenderElement name="static_menu_design" link="$link" title="$title"/>
-										</inp2:m_DefineElement>
-
-										<inp2:c.menu_ListCategories requery="0" no_special="1" render_as="scat_menu_elem" no_table="1" more_link_render_as="html:"/>
+										<inp2:c_CategoryLink template="__default__" module="$module" cat_id="Root" result_to_var="link"/>
+										<inp2:m_TemplatesBase module="$module" result_to_var="module_path"/>
+										<inp2:c_Field requery="1" name="Name" result_to_var="title"/>
+										<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/{$icon}"/>
 									</inp2:m_DefineElement>
-									
+
+									<table><tr>
 									<inp2:m_Link template="index" m_cat_id="0" result_to_var="link"/>
 									<inp2:m_RootCategoryName result_to_var="title"/>
-									<inp2:m_RenderElement name="static_menu_design" link="$link" title="$title"/>
+									<inp2:m_TemplatesBase module="In-portal" result_to_var="module_path"/>
+									<inp2:m_RenderElement name="menu_element" menu_href="$link" menu_title="$title" menu_icon_src="{$module_path}img/menu_home.gif" />
 
 				        	<inp2:m_ModuleInclude template="elements/static_menu" />
-							<inp2:m_Set m_cat_id="$current_category"/>
+				        	</tr></table>
+									<inp2:m_Set m_cat_id="$current_category"/>
 				        </noscript>
 					</td>
 				</tr>