diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index f3ec8a751dde..7a661f332c0c 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -726,6 +726,7 @@ action.HideAllWindows.text=Hide All _Tool Windows
 action.HideAllWindows.description=Hide all tool windows
 action.JumpToLastWindow.text=_Jump to Last Tool Window
 action.JumpToLastWindow.description=Activate last focused tool window
+group.ActiveToolwindowGroup.text=Active Tool Window
 action.TogglePinnedMode.text=_Pinned Mode
 action.TogglePinnedMode.description=Pin/unpin active tool window
 action.ToggleDockMode.text=Dock_ed Mode
@@ -773,6 +774,7 @@ action.CloseAllUnpinnedEditors.text=Close All But Pinned
 action.CloseAllUnpinnedEditors.description=Close all editors which are not pinned
 action.CloseContent.text=Close
 action.CloseContent.description=Close currently focused content
+group.EditorTabsGroup.text=Editor _Tabs
 action.SplitVertically.text=Split _Vertically
 action.SplitVertically.description=Split editor area into 2 tab groups and move the current tab to the right group
 action.SplitHorizontally.text=Split _Horizontally
@@ -1202,7 +1204,7 @@ action.Graph.Current.Node.Dependencies.Filter.text=Show selected nodes with depe
 group.VcsToobarActions.text=VCS Actions
 action.StartupWizard.text=Configure Plugins...
 action.StartupWizard.description=Run a wizard for selecting the set of enabled plugins
-action.PopupHector.text=Per File Highlighting Settings...
+action.PopupHector.text=Configure Current File Analysis...
 action.PopupHector.description=Show panel to configure highlighting mode for the current file
 group.EditorTabPopupMenu.text=Editor Tab Popup Menu
 group.MainMenu.text=Main menu
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index e0224b4ab559..0c4185f97e52 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -136,10 +136,11 @@
 
     <!-- View -->
     <group id="QuickActions">
+      <separator/>
       <action id="QuickImplementations" class="com.intellij.codeInsight.hint.actions.ShowImplementationsAction"/>
       <action id="QuickJavaDoc" class="com.intellij.codeInsight.documentation.actions.ShowQuickDocInfoAction"/>
 
-      <add-to-group group-id="ViewMenu" anchor="first"/>
+      <add-to-group group-id="ViewMenu" anchor="after" relative-to-action="ToolWindowsGroup"/>
     </group>
 
     <group id="CodeEditorBaseGroup">
@@ -164,12 +165,6 @@
 
     <action id="ShowUsagesSettings" class="com.intellij.find.actions.ShowUsagesAction$ShowSettings"/>
 
-    <group id="ProjectViewGroup">
-      <action id="ProjectViewChangeView" class="com.intellij.ide.projectView.actions.ChangeProjectViewAction"/>
-      <action id="PopupHector" class="com.intellij.codeInsight.daemon.impl.PopupHectorAction"/>
-      <add-to-group group-id="ViewMenu" relative-to-action="QuickChangeScheme" anchor="after"/>
-    </group>
-
     <action id="RecentChanges" class="com.intellij.history.integration.ui.actions.RecentChangesAction">
       <keyboard-shortcut first-keystroke="alt shift C" keymap="$default"/>
       <add-to-group group-id="ViewRecentActions" anchor="last"/>
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 8215393b971d..e7a3c30a9c56 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -212,6 +212,8 @@
 
       <!-- View -->
       <group id="ViewMenu" popup="true">
+        <group id="ToolWindowsGroup" class="com.intellij.ide.actions.ToolWindowsGroup" popup="true"/>
+
         <action id="EditSource" class="com.intellij.ide.actions.EditSourceAction"/>
         <action id="ViewSource" class="com.intellij.ide.actions.ViewSourceAction"/>
         <separator/>
@@ -272,52 +274,56 @@
 
       <group id="WindowMenu" popup="true">
         <action id="MinimizeCurrentWindow" class="com.intellij.ide.actions.MinimizeCurrentWindowAction"/>
-        <group id="ToolWindowsGroup" class="com.intellij.ide.actions.ToolWindowsGroup" popup="true"/>
+        <action id="StoreDefaultLayout" class="com.intellij.ide.actions.StoreDefaultLayoutAction"/>
+        <action id="RestoreDefaultLayout" class="com.intellij.ide.actions.RestoreDefaultLayoutAction"/>
+        <separator/>
+        <group id="ActiveToolwindowGroup" popup="true">
+          <action id="HideActiveWindow" class="com.intellij.ide.actions.HideToolWindowAction"/>
+          <action id="HideSideWindows" class="com.intellij.ide.actions.HideSideWindowsAction"/>
+          <action id="HideAllWindows" class="com.intellij.ide.actions.HideAllToolWindowsAction"/>
+          <action id="JumpToLastWindow" class="com.intellij.ide.actions.JumpToLastWindowAction"/>
+          <separator/>
+          <action id="TogglePinnedMode" class="com.intellij.ide.actions.TogglePinnedModeAction"/>
+          <action id="ToggleDockMode" class="com.intellij.ide.actions.ToggleDockModeAction"/>
+          <action id="ToggleFloatingMode" class="com.intellij.ide.actions.ToggleFloatingModeAction"/>
+          <action id="ToggleSideMode" class="com.intellij.ide.actions.ToggleSideModeAction"/>
+          <action id="ToggleContentUiTypeMode" class="com.intellij.ide.actions.ToggleContentUiTypeAction"/>
+          <action id="ShowContent" class="com.intellij.ide.actions.ShowContentAction"/>
+          <group id="ResizeToolWindowGroup" popup="true">
+            <action id="ResizeToolWindowLeft" class="com.intellij.ide.actions.ResizeToolWindowAction$Left"/>
+            <action id="ResizeToolWindowRight" class="com.intellij.ide.actions.ResizeToolWindowAction$Right"/>
+            <action id="ResizeToolWindowUp" class="com.intellij.ide.actions.ResizeToolWindowAction$Up"/>
+            <action id="ResizeToolWindowDown" class="com.intellij.ide.actions.ResizeToolWindowAction$Down"/>
+          </group>
+        </group>
+
+        <group id="EditorTabsGroup" popup="true">
+          <action id="NextTab" class="com.intellij.ide.actions.NextTabAction"/>
+          <action id="PreviousTab" class="com.intellij.ide.actions.PreviousTabAction"/>
+          <action id="CloseActiveTab" class="com.intellij.ide.actions.CloseActiveTabAction"/>
+          <action id="PinActiveTab" class="com.intellij.ide.actions.PinActiveTabAction"/>
+          <separator/>
+          <group id="CloseEditorsGroup">
+            <action id="CloseContent" class="com.intellij.ide.actions.CloseAction"/>
+            <action id="CloseAllEditorsButActive" class="com.intellij.ide.actions.CloseAllEditorsButActiveAction"/>
+            <action id="CloseAllEditors" class="com.intellij.ide.actions.CloseAllEditorsAction"/>
+            <action id="CloseAllUnpinnedEditors" class="com.intellij.ide.actions.CloseAllUnpinnedEditorsAction"/>
+          </group>
+          <separator/>
+          <action id="SplitVertically" class="com.intellij.ide.actions.SplitVerticallyAction" icon="/actions/splitVertically.png"/>
+          <action id="SplitHorizontally" class="com.intellij.ide.actions.SplitHorizontallyAction" icon="/actions/splitHorizontally.png"/>
+          <action id="ChangeSplitOrientation" class="com.intellij.ide.actions.ChangeSplitterOrientationAction"/>
+          <action id="Unsplit" class="com.intellij.ide.actions.UnsplitAction"/>
+          <action id="UnsplitAll" class="com.intellij.ide.actions.UnsplitAllAction"/>
+          <action id="NextSplitter" class="com.intellij.ide.actions.NextSplitAction"/>
+          <action id="PrevSplitter" class="com.intellij.ide.actions.PrevSplitAction"/>
+        </group>
+
         <group id="BackgroundTasks" popup="true">
           <action id="ShowProcessWindow" class="com.intellij.openapi.wm.impl.status.ShowProcessWindowAction"/>
           <action id="AutoShowProcessWindow" class="com.intellij.openapi.wm.impl.status.AutoShowProcessPopupAction"/>
         </group>
-        <separator/>
-        <action id="StoreDefaultLayout" class="com.intellij.ide.actions.StoreDefaultLayoutAction"/>
-        <action id="RestoreDefaultLayout" class="com.intellij.ide.actions.RestoreDefaultLayoutAction"/>
-        <separator/>
-        <action id="HideActiveWindow" class="com.intellij.ide.actions.HideToolWindowAction"/>
-        <action id="HideSideWindows" class="com.intellij.ide.actions.HideSideWindowsAction"/>
-        <action id="HideAllWindows" class="com.intellij.ide.actions.HideAllToolWindowsAction"/>
-        <action id="JumpToLastWindow" class="com.intellij.ide.actions.JumpToLastWindowAction"/>
-        <separator/>
-        <action id="TogglePinnedMode" class="com.intellij.ide.actions.TogglePinnedModeAction"/>
-        <action id="ToggleDockMode" class="com.intellij.ide.actions.ToggleDockModeAction"/>
-        <action id="ToggleFloatingMode" class="com.intellij.ide.actions.ToggleFloatingModeAction"/>
-        <action id="ToggleSideMode" class="com.intellij.ide.actions.ToggleSideModeAction"/>
-        <action id="ToggleContentUiTypeMode" class="com.intellij.ide.actions.ToggleContentUiTypeAction"/>
-        <action id="ShowContent" class="com.intellij.ide.actions.ShowContentAction"/>
-        <group id="ResizeToolWindowGroup" popup="true">
-          <action id="ResizeToolWindowLeft" class="com.intellij.ide.actions.ResizeToolWindowAction$Left"/>
-          <action id="ResizeToolWindowRight" class="com.intellij.ide.actions.ResizeToolWindowAction$Right"/>
-          <action id="ResizeToolWindowUp" class="com.intellij.ide.actions.ResizeToolWindowAction$Up"/>
-          <action id="ResizeToolWindowDown" class="com.intellij.ide.actions.ResizeToolWindowAction$Down"/>
-        </group>
-        <separator/>
-        <action id="NextTab" class="com.intellij.ide.actions.NextTabAction"/>
-        <action id="PreviousTab" class="com.intellij.ide.actions.PreviousTabAction"/>
-        <action id="CloseActiveTab" class="com.intellij.ide.actions.CloseActiveTabAction"/>
-        <action id="PinActiveTab" class="com.intellij.ide.actions.PinActiveTabAction"/>
-        <separator/>
-        <group id="CloseEditorsGroup">
-          <action id="CloseContent" class="com.intellij.ide.actions.CloseAction"/>
-          <action id="CloseAllEditorsButActive" class="com.intellij.ide.actions.CloseAllEditorsButActiveAction"/>
-          <action id="CloseAllEditors" class="com.intellij.ide.actions.CloseAllEditorsAction"/>
-          <action id="CloseAllUnpinnedEditors" class="com.intellij.ide.actions.CloseAllUnpinnedEditorsAction"/>
-        </group>
-        <separator/>
-        <action id="SplitVertically" class="com.intellij.ide.actions.SplitVerticallyAction" icon="/actions/splitVertically.png"/>
-        <action id="SplitHorizontally" class="com.intellij.ide.actions.SplitHorizontallyAction" icon="/actions/splitHorizontally.png"/>
-        <action id="ChangeSplitOrientation" class="com.intellij.ide.actions.ChangeSplitterOrientationAction"/>
-        <action id="Unsplit" class="com.intellij.ide.actions.UnsplitAction"/>
-        <action id="UnsplitAll" class="com.intellij.ide.actions.UnsplitAllAction"/>
-        <action id="NextSplitter" class="com.intellij.ide.actions.NextSplitAction"/>
-        <action id="PrevSplitter" class="com.intellij.ide.actions.PrevSplitAction"/>
+
         <separator/>
         <group id="OpenProjectWindows" class="com.intellij.openapi.wm.impl.ProjectWindowActionGroup">
           <action id="NextProjectWindow" class="com.intellij.openapi.wm.impl.NextProjectWindow"/>
diff --git a/platform/platform-resources/src/idea/PlatformLangActionManager.xml b/platform/platform-resources/src/idea/PlatformLangActionManager.xml
index 103689de74f7..4d28345745a3 100644
--- a/platform/platform-resources/src/idea/PlatformLangActionManager.xml
+++ b/platform/platform-resources/src/idea/PlatformLangActionManager.xml
@@ -44,6 +44,7 @@
       <separator/>
       <action id="InspectCode" class="com.intellij.codeInspection.actions.CodeInspectionAction"/>
       <action id="RunInspection" class="com.intellij.codeInspection.actions.RunInspectionAction" />
+      <action id="PopupHector" class="com.intellij.codeInsight.daemon.impl.PopupHectorAction"/>
       <action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/>
 
       <add-to-group group-id="CodeMenu" anchor="last"/>
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index 31fb8f599315..83436c30f8db 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -85,6 +85,7 @@
     <group id="InspectCodeGroup" text="Inspect Code Actions">
       <action id="InspectCode" class="com.intellij.codeInspection.actions.CodeInspectionAction"/>
       <action id="RunInspection" class="com.intellij.codeInspection.actions.RunInspectionAction"/>
+      <action id="PopupHector" class="com.intellij.codeInsight.daemon.impl.PopupHectorAction"/>
       <action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/>
       <add-to-group group-id="AnalyzeMenu" anchor="first"/>
     </group>