diff --git a/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml b/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
index 8151f88b441e..43f66b261f19 100644
--- a/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
+++ b/plugins/git4idea/frontend/resources/intellij.vcs.git.frontend.xml
@@ -11,9 +11,19 @@
     <action id="GitRdToolbarWidgetAction" class="com.intellij.vcs.git.frontend.widget.GitRdToolbarWidgetAction">
       <add-to-group group-id="MainToolbarVCSGroup" anchor="first"/>
     </action>
+
+    <group id="GitMainToolbarQuickActions" searchable="false" popup="false">
+      <add-to-group group-id="MainToolbarQuickActionsRaw" relative-to-action="MainToolbarQuickActions.Run" anchor="before"/>
+      <group id="MainToolbarQuickActions.VCS" class="com.intellij.ide.ui.customization.ToolbarQuickActionsGroup" searchable="false" popup="false"/>
+    </group>
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
     <postStartupActivity implementation="com.intellij.vcs.git.frontend.widget.GitWidgetStateHolder$Activator"/>
+
+    <toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.UpdatePushQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
+    <toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.CommitQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
+    <toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.HistoryQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
+    <toolbarQuickAction implementationClass="com.intellij.vcs.git.frontend.RollbackQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
   </extensions>
 </idea-plugin>
diff --git a/plugins/git4idea/frontend/resources/messages/GitFrontendBundle.properties b/plugins/git4idea/frontend/resources/messages/GitFrontendBundle.properties
index 074751e134ca..6515b2ba6f2c 100644
--- a/plugins/git4idea/frontend/resources/messages/GitFrontendBundle.properties
+++ b/plugins/git4idea/frontend/resources/messages/GitFrontendBundle.properties
@@ -3,4 +3,9 @@ action.GitRdToolbarWidgetAction.text=VCS Widget
 # Copied from GitBundle.properties
 git.toolbar.widget.no.loaded.repo=Git
 git.toolbar.widget.no.repo=Version control
-git.toolbar.widget.no.repo.tooltip=Configure a version control for the project
\ No newline at end of file
+git.toolbar.widget.no.repo.tooltip=Configure a version control for the project
+
+MainToolbarQuickActions.Git.UpdatePush.text=Update Project / Push
+MainToolbarQuickActions.Git.Commit.text=Commit\u2026
+MainToolbarQuickActions.Git.History.text=Show History\u2026
+MainToolbarQuickActions.Git.Rollback.text=Rollback\u2026
\ No newline at end of file
diff --git a/plugins/git4idea/src/git4idea/ui/toolbar/GitQuickActions.kt b/plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/GitQuickActions.kt
similarity index 51%
rename from plugins/git4idea/src/git4idea/ui/toolbar/GitQuickActions.kt
rename to plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/GitQuickActions.kt
index b1bc5073a182..8269a6439a98 100644
--- a/plugins/git4idea/src/git4idea/ui/toolbar/GitQuickActions.kt
+++ b/plugins/git4idea/frontend/src/com/intellij/vcs/git/frontend/GitQuickActions.kt
@@ -1,16 +1,15 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package git4idea.ui.toolbar
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.vcs.git.frontend
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.ui.customization.GroupEnd
 import com.intellij.ide.ui.customization.ToolbarAddQuickActionInfo
 import com.intellij.openapi.actionSystem.IdeActions
-import git4idea.i18n.GitBundle
 
 private val insertStrategy = GroupEnd("MainToolbarNewUI", "MainToolbarVCSGroup")
   .orElse(GroupEnd("MainToolbarNewUI", IdeActions.GROUP_MAIN_TOOLBAR_LEFT))
 
-class UpdatePushQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.UpdateProject", "Vcs.Push"), GitBundle.message("MainToolbarQuickActions.Git.UpdatePush.text"), AllIcons.Actions.CheckOut, insertStrategy)
-class CommitQuickAction: ToolbarAddQuickActionInfo(listOf("CheckinProject"), GitBundle.message("MainToolbarQuickActions.Git.Commit.text"), AllIcons.Actions.Commit, insertStrategy)
-class HistoryQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.ShowTabbedFileHistory"), GitBundle.message("MainToolbarQuickActions.Git.History.text"), AllIcons.Vcs.History, insertStrategy)
-class RollbackQuickAction: ToolbarAddQuickActionInfo(listOf("ChangesView.Revert"), GitBundle.message("MainToolbarQuickActions.Git.Rollback.text"), AllIcons.Diff.Revert, insertStrategy)
+class UpdatePushQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.UpdateProject", "Vcs.Push"), GitFrontendBundle.message("MainToolbarQuickActions.Git.UpdatePush.text"), AllIcons.Actions.CheckOut, insertStrategy)
+class CommitQuickAction: ToolbarAddQuickActionInfo(listOf("CheckinProject"), GitFrontendBundle.message("MainToolbarQuickActions.Git.Commit.text"), AllIcons.Actions.Commit, insertStrategy)
+class HistoryQuickAction: ToolbarAddQuickActionInfo(listOf("Vcs.ShowTabbedFileHistory"), GitFrontendBundle.message("MainToolbarQuickActions.Git.History.text"), AllIcons.Vcs.History, insertStrategy)
+class RollbackQuickAction: ToolbarAddQuickActionInfo(listOf("ChangesView.Revert"), GitFrontendBundle.message("MainToolbarQuickActions.Git.Rollback.text"), AllIcons.Diff.Revert, insertStrategy)
diff --git a/plugins/git4idea/resources/intellij.vcs.git.xml b/plugins/git4idea/resources/intellij.vcs.git.xml
index 9c25b544b28a..3f684e7b7a2b 100644
--- a/plugins/git4idea/resources/intellij.vcs.git.xml
+++ b/plugins/git4idea/resources/intellij.vcs.git.xml
@@ -510,11 +510,6 @@
       <reference ref="Git.Revert.Abort"/>
     </group>
 
-    <group id="GitMainToolbarQuickActions" searchable="false" popup="false">
-      <add-to-group group-id="MainToolbarQuickActionsRaw" relative-to-action="MainToolbarQuickActions.Run" anchor="before"/>
-      <group id="MainToolbarQuickActions.VCS" class="com.intellij.ide.ui.customization.ToolbarQuickActionsGroup" searchable="false" popup="false"/>
-    </group>
-
     <group id="Git.Hosting.Open.In.Browser.Group" popup="false">
       <add-to-group group-id="RevealGroup"/>
       <add-to-group group-id="Vcs.Log.ContextMenu" anchor="last"/>
@@ -853,11 +848,6 @@
     <postStartupActivity implementation="git4idea.commit.GitMergeCommitMessageActivity"/>
     <vcs.defaultCommitMessagePolicy implementation="git4idea.commit.GitMergeCommitMessagePolicy"/>
 
-    <toolbarQuickAction implementationClass="git4idea.ui.toolbar.UpdatePushQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
-    <toolbarQuickAction implementationClass="git4idea.ui.toolbar.CommitQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
-    <toolbarQuickAction implementationClass="git4idea.ui.toolbar.HistoryQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
-    <toolbarQuickAction implementationClass="git4idea.ui.toolbar.RollbackQuickAction" listGroupID="MainToolbarQuickActions.VCS"/>
-
     <changesViewContent tabName="Git Conflicts"
                         className="git4idea.conflicts.GitConflictsToolWindowManager$ContentProvider"
                         predicateClassName="git4idea.conflicts.GitConflictsToolWindowManager$ContentPredicate"
diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties
index 6da45eba7a18..b77e147236e2 100644
--- a/plugins/git4idea/resources/messages/GitBundle.properties
+++ b/plugins/git4idea/resources/messages/GitBundle.properties
@@ -1643,11 +1643,6 @@ vcs.log.status.bar.replacing.log.index.data=Replacing Git Log index data\u2026
 vcs.log.create.archive.with.log.index.data=Dump Git Log Index Data
 vcs.log.archiving.log.index.data=Archiving Git Log index data\u2026
 
-MainToolbarQuickActions.Git.UpdatePush.text=Update Project / Push
-MainToolbarQuickActions.Git.Commit.text=Commit\u2026
-MainToolbarQuickActions.Git.History.text=Show History\u2026
-MainToolbarQuickActions.Git.Rollback.text=Rollback\u2026
-
 open.in.browser.error=Cannot open in browser
 open.in.browser.getting.revision=Getting Last File Revision
 open.in.browser.getting.revision.error=Cannot retrieve latest revision for file