diff --git a/platform/vcs-log/api/resources/messages/VcsLogBundle.properties b/platform/vcs-log/api/resources/messages/VcsLogBundle.properties
index 3084fa3313e5..f5469a66d411 100644
--- a/platform/vcs-log/api/resources/messages/VcsLogBundle.properties
+++ b/platform/vcs-log/api/resources/messages/VcsLogBundle.properties
@@ -10,7 +10,7 @@ vcs.log.action.description.show.long.edges=Show long branch edges even if commit
 vcs.log.action.description.show.only.affected.changes=Only show changes that affect files selected in the "Paths" menu
 vcs.log.action.description.show.tag.names=Show Tag Names in the Table
 vcs.log.action.description.open.new.tab.with.log=Open new tab with {0} Log
-vcs.log.action.show.all.branches=Show All Branches
+vcs.log.action.show.all.branches=All Branches
 vcs.log.action.show.diff.preview=Show Diff Preview
 action.Vcs.Log.MoveDiffPreviewToBottom.text=Bottom
 action.Vcs.Log.MoveDiffPreviewToBottom.description=Locate Diff Preview in the bottom
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 5cd4b32a3745..489ad91b9185 100644
--- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml
+++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
@@ -218,24 +218,24 @@
       <reference id="Vcs.Log.AnnotateRevisionAction"/>
       <reference id="VcsHistoryActionsGroup"/>
     </group>
-    <group id="Vcs.FileHistory.PresentationSettings" class="com.intellij.vcs.log.ui.actions.VcsLogToolbarPopupActionGroup"
-           icon="AllIcons.Actions.Show"
+    <group id="Vcs.FileHistory.PresentationSettings"
+           class="com.intellij.vcs.log.ui.actions.VcsLogToolbarPopupActionGroup"
+           icon="AllIcons.Actions.GroupBy"
            popup="true">
+      <separator key="action.vcs.log.show.separator"/>
+      <reference id="Vcs.Log.ShowOtherBranches"/>
       <reference id="Vcs.Log.PreferCommitDate"/>
       <reference id="Vcs.Log.ToggleColumns"/>
+      <reference id="Vcs.Log.LayoutConfiguration"/>
     </group>
     <group id="Vcs.FileHistory.Toolbar">
       <reference id="Vcs.Log.Refresh"/>
       <reference id="Diff.ShowDiff"/>
       <reference id="Vcs.Log.ShowAllAffected"/>
       <separator/>
-      <reference id="Vcs.Log.ShowOtherBranches"/>
       <reference id="Vcs.FileHistory.PresentationSettings"/>
       <separator/>
-      <reference id="Vcs.Log.LayoutConfiguration"/>
-      <separator/>
       <reference id="VcsHistoryActionsGroup.Toolbar"/>
-      <separator/>
     </group>
 
     <group id="Log.KeymapGroup" searchable="false">