Index: trunk/themes/default2007/platform/img/menu_my_account.gif
===================================================================
diff -u
Binary files differ
Index: trunk/themes/default2007/platform/elements/menu.tpl
===================================================================
diff -u -r8514 -r8526
--- trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8514)
+++ trunk/themes/default2007/platform/elements/menu.tpl	(.../menu.tpl)	(revision 8526)
@@ -8,28 +8,28 @@
 					<inp2:m_DefineElement name="menu_href1">
 						<inp2:m_Link template="index" m_cat_id="0"/>
 					</inp2:m_DefineElement>
-					
+
 					<inp2:m_RenderElement name="menu_href1" strip_nl="2" result_to_var="menu_href"/>
 
 
 					<inp2:m_DefineElement name="menu_icon1">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_home.gif" width="23" height="20" alt="" /><br />
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_icon1" strip_nl="2" result_to_var="menu_icon"/>
-			
+
 					<inp2:m_DefineElement name="menu_title1">
 						Home
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_title1" strip_nl="2" result_to_var="menu_title"/>
-					
-					
-			
+
+
+
 					<inp2:m_IsActive template="index" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 					<!-- // menu: Home -->
-			
+
 					<inp2:m_ModuleInclude template="elements/menu"/>
-			
+
 				</tr>
 			</table>
 
@@ -43,44 +43,44 @@
 						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_href10" strip_nl="2" result_to_var="menu_href"/>
-			
+
 					<inp2:m_DefineElement name="menu_icon10">
-						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_my_account.gif" alt="" /><br />
+						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu_my_account.gif" alt="" /><br />
 					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon10" strip_nl="2" result_to_var="menu_icon"/>			
-			
+					<inp2:m_RenderElement name="menu_icon10" strip_nl="2" result_to_var="menu_icon"/>
+
 					<inp2:m_DefineElement name="menu_title10">
 						My Account
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_title10" strip_nl="2" result_to_var="menu_title"/>
-			
+
 					<inp2:m_IsActive template=".*/my_account" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
 					<!-- // menu: My Account -->
-					
+
 					<!-- menu: ShoppingCart -->
 					<inp2:m_DefineElement name="menu_href11">
 						<inp2:m_Link template="platform/my_account/my_account" m_cat_id="0"/>
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_href11" strip_nl="2" result_to_var="menu_href"/>
-			
+
 					<inp2:m_DefineElement name="menu_icon11">
 						<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/menu_shopping_cart.gif" alt="" />
 					</inp2:m_DefineElement>
-					<inp2:m_RenderElement name="menu_icon11" strip_nl="2" result_to_var="menu_icon"/>			
-			
+					<inp2:m_RenderElement name="menu_icon11" strip_nl="2" result_to_var="menu_icon"/>
+
 					<inp2:m_DefineElement name="menu_title11">
 						Shopping Cart
 					</inp2:m_DefineElement>
 					<inp2:m_RenderElement name="menu_title11" strip_nl="2" result_to_var="menu_title"/>
-			
+
 					<inp2:m_IsActive template="in-commerce/checkout/shopping_cart" result_to_var="current"/>
 					<inp2:m_RenderElement name="__this__" design="menu_element"/>
-					<!-- // menu: ShoppingCart -->					
+					<!-- // menu: ShoppingCart -->
 				</tr>
-			</table>				
-					
-		</td>		
+			</table>
+
+		</td>
 	</tr>
 </table>
 
Index: trunk/themes/default2007/platform/my_account/my_favorites.tpl
===================================================================
diff -u -r8428 -r8526
--- trunk/themes/default2007/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 8428)
+++ trunk/themes/default2007/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 8526)
@@ -14,8 +14,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
-	<!-- my favorites -->
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_MyAccount,lu_title_MyFavorites" templates="platform/my_account/my_account,platform/my_account/my_favorites"/>
 
+	<!-- my favorites -->
 	<inp2:m_DefineElement name="users_content">
 		<inp2:m_DefineElement name="header">
 			<inp2:m_phrase name="lu_title_MyFavorites"/>
Index: trunk/themes/default2007/platform/categories/suggest_category.tpl
===================================================================
diff -u -r8521 -r8526
--- trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8521)
+++ trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8526)
@@ -8,15 +8,15 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="content">
+	<inp2:m_include template="platform/elements/navigation_bar" titles="lu_title_SuggestCategory" templates="platform/categories/suggest_category"/>
+
 	<!-- phrases -->
 	<inp2:m_DefineElement name="suggest_category_content">
 		<inp2:m_DefineElement name="header">
 			<inp2:m_phrase name="lu_title_SuggestCategory"/>
 		</inp2:m_DefineElement>
 		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
 
-		<inp2:m_include template="platform/elements/navigation_bar"/>
-
 		<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
 			<inp2:c_PresetFormFields/>
 			<inp2:m_if check="c_HasError" field="any">