diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPortalProfileMenuEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPortalProfileMenuEngine.php
--- a/src/applications/dashboard/engine/PhabricatorDashboardPortalProfileMenuEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardPortalProfileMenuEngine.php
@@ -20,6 +20,8 @@
   protected function getBuiltinProfileItems($object) {
     $items = array();
 
+    $items[] = $this->newDividerItem('tail');
+
     $items[] = $this->newManageItem();
 
     $items[] = $this->newItem()
diff --git a/src/applications/favorites/application/PhabricatorFavoritesApplication.php b/src/applications/favorites/application/PhabricatorFavoritesApplication.php
--- a/src/applications/favorites/application/PhabricatorFavoritesApplication.php
+++ b/src/applications/favorites/application/PhabricatorFavoritesApplication.php
@@ -15,12 +15,13 @@
   }
 
   public function getIcon() {
-    return 'fa-star';
+    return 'fa-bookmark';
   }
 
   public function getRoutes() {
     return array(
       '/favorites/' => array(
+        '' => 'PhabricatorFavoritesMenuItemController',
         'menu/' => $this->getProfileMenuRouting(
           'PhabricatorFavoritesMenuItemController'),
       ),
diff --git a/src/applications/favorites/controller/PhabricatorFavoritesMenuItemController.php b/src/applications/favorites/controller/PhabricatorFavoritesMenuItemController.php
--- a/src/applications/favorites/controller/PhabricatorFavoritesMenuItemController.php
+++ b/src/applications/favorites/controller/PhabricatorFavoritesMenuItemController.php
@@ -16,8 +16,7 @@
     $engine = id(new PhabricatorFavoritesProfileMenuEngine())
       ->setProfileObject($favorites)
       ->setCustomPHID($viewer->getPHID())
-      ->setController($this)
-      ->setShowNavigation(false);
+      ->setController($this);
 
     return $engine->buildResponse();
   }
diff --git a/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php b/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
--- a/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
+++ b/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
@@ -35,6 +35,10 @@
       }
     }
 
+    $items[] = $this->newDividerItem('tail');
+    $items[] = $this->newManageItem()
+      ->setMenuItemProperty('name', pht('Edit Favorites'));
+
     return $items;
   }
 
diff --git a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
--- a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
+++ b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php
@@ -26,7 +26,7 @@
     $favorites_menu = id(new PHUIButtonView())
       ->setTag('a')
       ->setHref('#')
-      ->setIcon('fa-star')
+      ->setIcon('fa-bookmark')
       ->addClass('phabricator-core-user-menu')
       ->setNoCSS(true)
       ->setDropdown(true)
@@ -71,20 +71,11 @@
       $action = id(new PhabricatorActionView())
         ->setName($item->getName())
         ->setHref($item->getHref())
+        ->setIcon($item->getIcon())
         ->setType($item->getType());
       $view->addAction($action);
     }
 
-    if ($viewer->isLoggedIn()) {
-      $view->addAction(
-        id(new PhabricatorActionView())
-          ->setType(PhabricatorActionView::TYPE_DIVIDER));
-      $view->addAction(
-        id(new PhabricatorActionView())
-          ->setName(pht('Edit Favorites'))
-          ->setHref('/favorites/menu/configure/'));
-    }
-
     return $view;
   }
 
diff --git a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
--- a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
+++ b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
@@ -67,11 +67,12 @@
         ->setMenuItemProperties($properties);
     }
 
-    // Hotlink to More Applications Launcher...
     $items[] = $this->newItem()
       ->setBuiltinKey(PhabricatorHomeConstants::ITEM_LAUNCHER)
       ->setMenuItemKey(PhabricatorHomeLauncherProfileMenuItem::MENUITEMKEY);
 
+    $items[] = $this->newDividerItem('tail');
+
     $items[] = $this->newManageItem();
 
     return $items;
diff --git a/src/applications/search/engine/PhabricatorProfileMenuEngine.php b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
--- a/src/applications/search/engine/PhabricatorProfileMenuEngine.php
+++ b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
@@ -8,7 +8,6 @@
   private $items;
   private $controller;
   private $navigation;
-  private $showNavigation = true;
   private $editMode;
   private $pageClasses = array();
   private $showContentCrumbs = true;
@@ -71,15 +70,6 @@
     return $this->controller;
   }
 
-  public function setShowNavigation($show) {
-    $this->showNavigation = $show;
-    return $this;
-  }
-
-  public function getShowNavigation() {
-    return $this->showNavigation;
-  }
-
   public function addContentPageClass($class) {
     $this->pageClasses[] = $class;
     return $this;
@@ -181,13 +171,19 @@
     $crumbs = $controller->buildApplicationCrumbsForEditEngine();
 
     if (!$is_view) {
+      $edit_mode = null;
+
       if ($selected_item) {
-        if ($selected_item->getCustomPHID()) {
-          $edit_mode = 'custom';
-        } else {
-          $edit_mode = 'global';
+        if ($selected_item->getBuiltinKey() !== self::ITEM_MANAGE) {
+          if ($selected_item->getCustomPHID()) {
+            $edit_mode = 'custom';
+          } else {
+            $edit_mode = 'global';
+          }
         }
-      } else {
+      }
+
+      if ($edit_mode === null) {
         $edit_mode = $request->getURIData('itemEditMode');
       }
 
@@ -309,9 +305,7 @@
       $page->setCrumbs($crumbs);
     }
 
-    if ($this->getShowNavigation()) {
-      $page->setNavigation($navigation);
-    }
+    $page->setNavigation($navigation);
 
     if ($is_view) {
       foreach ($this->pageClasses as $class) {
@@ -1133,6 +1127,13 @@
       ->setIsTailItem(true);
   }
 
+  protected function newDividerItem($key) {
+    return $this->newItem()
+      ->setBuiltinKey($key)
+      ->setMenuItemKey(PhabricatorDividerProfileMenuItem::MENUITEMKEY)
+      ->setIsTailItem(true);
+  }
+
   public function getDefaultMenuItemConfiguration() {
     $configs = $this->getItems();
     foreach ($configs as $config) {