diff --git a/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties b/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
index af539469f026..052c000c327b 100644
--- a/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
+++ b/platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
@@ -971,8 +971,9 @@ status.text.unversioned.files.available=Unversioned files available.
 plugins.configurable.show=status.text.Show
 
 action.filter.filter.by.text=Filter By
-action.filter.moved.files.text=Hide files moved without changes
-action.filter.non.important.files.text=Hide files with non-important changes
+action.filter.separator.text=Hide Files
+action.filter.moved.files.text=Moved without changes
+action.filter.non.important.files.text=With non-important changes
 
 group.mainmenu.vcs.current.file.text=Current File
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt
index 6c8a757d86d2..0c172b99c8de 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt
@@ -9,6 +9,8 @@ import com.intellij.openapi.vcs.changes.ui.ChangesGroupingSupport
 class SelectChangesGroupingActionGroup : DefaultActionGroup(), DumbAware {
 
   override fun update(e: AnActionEvent) {
+    val fromActionToolbar = e.isFromActionToolbar
+    e.presentation.isPopupGroup = fromActionToolbar
     e.presentation.isEnabled = e.getData(ChangesGroupingSupport.KEY) != null
   }
 }
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/browser/ChangesFilterer.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/browser/ChangesFilterer.kt
index e22174b746e2..c580eb7d2892 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/browser/ChangesFilterer.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/browser/ChangesFilterer.kt
@@ -295,7 +295,7 @@ class ChangesFilterer(val project: Project?, val listener: Listener) : Disposabl
 
   class FilterGroup : DefaultActionGroup(), Toggleable, DumbAware {
     init {
-      isPopup = true
+      isPopup = false
       templatePresentation.text = VcsBundle.message("action.filter.filter.by.text")
       templatePresentation.icon = AllIcons.General.Filter
     }
@@ -315,7 +315,7 @@ class ChangesFilterer(val project: Project?, val listener: Listener) : Disposabl
     override fun getChildren(e: AnActionEvent?): Array<AnAction> {
       val filterer = e?.getData(DATA_KEY) ?: return AnAction.EMPTY_ARRAY
 
-      return listOf(MovesOnlyFilter, NonImportantFilter)
+      return arrayOf<AnAction>(Separator(VcsBundle.message("action.filter.separator.text"))) + listOf(MovesOnlyFilter, NonImportantFilter)
         .filter { it.isAvailable(filterer) }
         .map { ToggleFilterAction(filterer, it) }
         .toTypedArray()
diff --git a/platform/vcs-log/api/resources/messages/VcsLogBundle.properties b/platform/vcs-log/api/resources/messages/VcsLogBundle.properties
index ee77e21db214..3084fa3313e5 100644
--- a/platform/vcs-log/api/resources/messages/VcsLogBundle.properties
+++ b/platform/vcs-log/api/resources/messages/VcsLogBundle.properties
@@ -96,6 +96,7 @@ group.Vcs.Log.PresentationSettings.description=Configure presentation of the Log
 group.Vcs.Log.TextFilterSettings.text=Text Filter Settings
 group.Vcs.Log.TextFilterSettings.description=Select text filter options
 group.Vcs.Log.LayoutConfiguration.text=Configure Layout
+group.Vcs.Log.LayoutConfiguration.separator.text=Layout
 group.Vcs.Log.LayoutConfiguration.description=Configure window layout
 group.Vcs.FileHistory.PresentationSettings.text=Presentation Settings
 group.Vcs.FileHistory.PresentationSettings.description=Configure presentation of the File History
diff --git a/platform/vcs-log/impl/src/META-INF/vcs-log.xml b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
index fd75b1e21b19..5cd4b32a3745 100644
--- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml
+++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
@@ -183,19 +183,23 @@
       <reference id="Vcs.Log.MoveDiffPreviewToRight"/>
     </group>
     <group id="Vcs.Log.LayoutConfiguration" class="com.intellij.vcs.log.ui.actions.VcsLogToolbarPopupActionGroup"
-           icon="AllIcons.Debugger.RestoreLayout" popup="true">
+           icon="AllIcons.Debugger.RestoreLayout" popup="false">
+      <separator key="group.Vcs.Log.LayoutConfiguration.separator.text"/>
       <reference id="Vcs.Log.ShowDetailsAction"/>
       <reference id="Vcs.Log.ShowDiffPreview"/>
       <reference id="Vcs.Log.Diff.Preview.Location"/>
     </group>
+    <group id="Vcs.Log.ChangesBrowser.PresentationSettings"
+           icon="AllIcons.Actions.GroupBy"
+           popup="true">
+      <reference id="ChangesView.GroupBy"/>
+      <reference id="ChangesBrowser.FiltererGroup"/>
+      <reference id="Vcs.Log.LayoutConfiguration"/>
+    </group>
     <group id="Vcs.Log.ChangesBrowser.Toolbar">
       <reference id="Vcs.RepositoryChangesBrowserToolbar"/>
       <reference id="Vcs.Log.ShowOnlyAffectedChanges"/>
-      <separator/>
-      <reference id="ChangesView.GroupBy"/>
-      <reference id="ChangesBrowser.FiltererGroup"/>
-      <separator/>
-      <reference id="Vcs.Log.LayoutConfiguration"/>
+      <reference id="Vcs.Log.ChangesBrowser.PresentationSettings"/>
     </group>
     <group id="Vcs.Log.ChangesBrowser.Popup">
       <reference id="Vcs.RepositoryChangesBrowserMenu"/>