diff --git a/icons/src/general/favorites.png b/icons/src/general/toolWindowFavorites.png
similarity index 100%
rename from icons/src/general/favorites.png
rename to icons/src/general/toolWindowFavorites.png
diff --git a/resources/src/idea/DefaultKeymap.xml b/resources/src/idea/DefaultKeymap.xml
index 43f41826a9e1..a2f62a09e790 100644
--- a/resources/src/idea/DefaultKeymap.xml
+++ b/resources/src/idea/DefaultKeymap.xml
@@ -692,6 +692,9 @@
     <action id="ActivateHierarchyToolWindow">
       <keyboard-shortcut first-keystroke="alt 8"/>
     </action>
+    <action id="ActivateFavoritesToolWindow">
+      <keyboard-shortcut first-keystroke="alt 9"/>
+    </action>
     <action id="NewElement">
       <keyboard-shortcut first-keystroke="alt INSERT"/>
     </action>
diff --git a/source/com/intellij/ide/actions/ToolWindowsGroup.java b/source/com/intellij/ide/actions/ToolWindowsGroup.java
index 081e2978b9de..59c42acc8e25 100644
--- a/source/com/intellij/ide/actions/ToolWindowsGroup.java
+++ b/source/com/intellij/ide/actions/ToolWindowsGroup.java
@@ -39,6 +39,7 @@ public final class ToolWindowsGroup extends ActionGroup{
     ourId2Text.put(ToolWindowId.TODO_VIEW, new MyDescriptor("TODO", IconLoader.getIcon("/general/toolWindowTodo.png")));
     ourId2Text.put(ToolWindowId.INSPECTION, new MyDescriptor("I&nspection", IconLoader.getIcon("/general/toolWindowInspection.png")));
     ourId2Text.put(ToolWindowId.ASPECTS_VIEW, new MyDescriptor("Aspects", IconLoader.getIcon("/general/toolWindowInspection.png")));
+    ourId2Text.put(ToolWindowId.FAVORITES_VIEW, new MyDescriptor("&Favorites", IconLoader.getIcon("/general/toolWindowFavorites.png")));
   }
 
   private final ArrayList<AnAction> myChildren;
diff --git a/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java b/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java
index f42c499e8310..70fde418a65d 100644
--- a/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java
+++ b/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java
@@ -74,7 +74,7 @@ public class FavoritesViewImpl extends ContentManagerImpl implements ProjectComp
       public void run() {
         ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
         ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.FAVORITES_VIEW, getComponent(), ToolWindowAnchor.RIGHT);
-        toolWindow.setIcon(IconLoader.getIcon("/general/favorites.png"));
+        toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowFavorites.png"));
         new ContentManagerWatcher(toolWindow, FavoritesViewImpl.this);
         final ContentFactory contentFactory = PeerFactory.getInstance().getContentFactory();
         final DefaultActionGroup favoritesActionsGroup = ((DefaultActionGroup)ActionManager.getInstance().getAction(IdeActions.ADD_TO_FAVORITES));