Index: trunk/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r8472 -r8491
--- trunk/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 8472)
+++ trunk/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 8491)
@@ -30,6 +30,13 @@
 				// allow sorting on front event without view permission
 				return true;
 			}
+
+			if ($event->Name == 'OnItemBuild') {
+				$category_id = $this->getPassedID($event);
+				if ($category_id == 0) {
+					return true;
+				}
+			}
 		}
 
 		if ($event->Name == 'OnEdit' || $event->Name == 'OnSave') {
Index: trunk/themes/default2007/platform/img/icon_popular.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/themes/default2007/platform/img/icon_favorite.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/themes/default2007/platform/categories/suggest_category.tpl
===================================================================
diff -u -N -r8451 -r8491
--- trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8451)
+++ trunk/themes/default2007/platform/categories/suggest_category.tpl	(.../suggest_category.tpl)	(revision 8491)
@@ -15,7 +15,7 @@
 		</inp2:m_DefineElement>
 		<inp2:m_RenderElement name="header" strip_nl="2" result_to_var="header"/>
 
-		Navigation Bar: <inp2:m_include template="platform/designs/navigation_bar"/><br /><br />
+		<inp2:m_include template="platform/designs/navigation_bar"/>
 
 		<inp2:m_if check="c_HasPermission" permissions="CATEGORY.ADD|CATEGORY.ADD.PENDING">
 			<inp2:c_PresetFormFields/>
Index: trunk/themes/default2007/platform/img/icon_hot.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/core/units/general/cat_tag_processor.php
===================================================================
diff -u -N -r8481 -r8491
--- trunk/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 8481)
+++ trunk/core/units/general/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 8491)
@@ -281,6 +281,19 @@
 			return isset($favorite_status[$object->GetDBField('ResourceId')]);
 		}
 
+		/**
+		 * Returns item's editors pick status (using not formatted value)
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function IsEditorsPick($params)
+		{
+			$object =& $this->getObject($params);
+
+			return $object->GetDBField('EditorsPick') == 1;
+		}
+
 		function FavoriteToggleLink($params)
 		{
 			$fav_prefix = $this->Prefix.'-fav';
Index: trunk/themes/default2007/platform/img/icon_pick.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/themes/default2007/platform/img/icon_new.gif
===================================================================
diff -u -N
Binary files differ