diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6486db52..7a42eec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@ Changelog structure reference:
 
 ## [Unreleased]
 
+### Fixed
+
+- Renamed Zig new file task to "Zig File" and moved to the file creation group
+
 ## [20.0.3]
 
 ### Fixed
diff --git a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/execution/binary/ZigConfigTypeBinary.kt b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/execution/binary/ZigConfigTypeBinary.kt
index 774f847d..87d18e21 100644
--- a/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/execution/binary/ZigConfigTypeBinary.kt
+++ b/cidr/src/main/kotlin/com/falsepattern/zigbrains/debugger/execution/binary/ZigConfigTypeBinary.kt
@@ -33,7 +33,7 @@ class ZigConfigTypeBinary: ConfigurationTypeBase(
     IDENTIFIER,
     ZigDebugBundle.message("configuration.binary.name"),
     ZigDebugBundle.message("configuration.binary.description"),
-    Icons.ZIG
+    Icons.Zig
 ) {
     init {
         addFactory(ConfigFactoryBinary(this))
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/Icons.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/Icons.kt
index 54cf5a1a..d518563e 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/Icons.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/Icons.kt
@@ -27,6 +27,8 @@ import org.jetbrains.annotations.NonNls
 
 @NonNls
 object Icons {
-    val ZIG = IconLoader.getIcon("/icons/zig.svg", Icons::class.java)
-    val ZON = IconLoader.getIcon("/icons/zon.svg", Icons::class.java)
+    @JvmField
+    val Zig = IconLoader.getIcon("/icons/zig.svg", Icons::class.java)
+    @JvmField
+    val Zon = IconLoader.getIcon("/icons/zon.svg", Icons::class.java)
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/actions/ZigNewFileAction.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/actions/ZigNewFileAction.kt
index 27816e57..e43ecf09 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/actions/ZigNewFileAction.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/actions/ZigNewFileAction.kt
@@ -31,7 +31,7 @@ import com.intellij.psi.PsiDirectory
 class ZigNewFileAction: CreateFileFromTemplateAction() {
     override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
         builder.setTitle("Zig File")
-            .addKind("Empty file", Icons.ZIG, "blank_zig_file")
+            .addKind("Empty file", Icons.Zig, "blank_zig_file")
     }
 
     override fun getActionName(directory: PsiDirectory?, newName: String, templateName: String?): String {
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt
index 1e49f960..60ed7630 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/base/ZigProfileState.kt
@@ -64,7 +64,7 @@ abstract class ZigProfileState<T: ZigExecConfig<T>> (
 
         // TODO remove this check once JetBrains implements colored terminal in the debugger
         // https://youtrack.jetbrains.com/issue/CPP-11622/ANSI-color-codes-not-honored-in-Debug-Run-Configuration-output-window
-        val cli = if (configuration.emulateTerminal() && !debug) PtyCommandLine() else GeneralCommandLine()
+        val cli = if (configuration.emulateTerminal() && !debug) PtyCommandLine().withConsoleMode(true).withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE) else GeneralCommandLine()
         cli.exePath = zigExePath.pathString
         workingDir.path?.let { cli.withWorkingDirectory(it) }
         cli.charset = Charsets.UTF_8
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigConfigTypeBuild.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigConfigTypeBuild.kt
index ac5c41f1..022b84dc 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigConfigTypeBuild.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/build/ZigConfigTypeBuild.kt
@@ -33,7 +33,7 @@ class ZigConfigTypeBuild : ConfigurationTypeBase(
     IDENTIFIER,
     ZigBrainsBundle.message("configuration.build.name"),
     ZigBrainsBundle.message("configuration.build.description"),
-    Icons.ZIG
+    Icons.Zig
 ) {
     init {
         addFactory(ConfigFactoryRun(this))
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigConfigTypeRun.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigConfigTypeRun.kt
index bf975e0c..dfc22587 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigConfigTypeRun.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/run/ZigConfigTypeRun.kt
@@ -33,7 +33,7 @@ class ZigConfigTypeRun : ConfigurationTypeBase(
     IDENTIFIER,
     ZigBrainsBundle.message("configuration.run.name"),
     ZigBrainsBundle.message("configuration.run.description"),
-    Icons.ZIG
+    Icons.Zig
 ) {
     init {
         addFactory(ConfigFactoryRun(this))
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigConfigTypeTest.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigConfigTypeTest.kt
index 0bee020f..e7515e48 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigConfigTypeTest.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/execution/test/ZigConfigTypeTest.kt
@@ -33,7 +33,7 @@ class ZigConfigTypeTest : ConfigurationTypeBase(
     IDENTIFIER,
     ZigBrainsBundle.message("configuration.test.name"),
     ZigBrainsBundle.message("configuration.test.description"),
-    Icons.ZIG
+    Icons.Zig
 ) {
     init {
         addFactory(ConfigFactoryRun(this))
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/module/ZigModuleType.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/module/ZigModuleType.kt
index 7710e08d..270512ea 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/module/ZigModuleType.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/module/ZigModuleType.kt
@@ -40,6 +40,6 @@ object ZigModuleType: ModuleType<ZigModuleBuilder>("com.falsepattern.zigbrains.z
     }
 
     override fun getNodeIcon(isOpened: Boolean): Icon {
-        return Icons.ZIG
+        return Icons.Zig
     }
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigDirectoryProjectGenerator.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigDirectoryProjectGenerator.kt
index 3196abe6..7f9b8fad 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigDirectoryProjectGenerator.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigDirectoryProjectGenerator.kt
@@ -23,7 +23,6 @@
 package com.falsepattern.zigbrains.project.newproject
 
 import com.falsepattern.zigbrains.Icons
-import com.falsepattern.zigbrains.shared.coroutine.runModalOrBlocking
 import com.falsepattern.zigbrains.shared.zigCoroutineScope
 import com.intellij.facet.ui.ValidationResult
 import com.intellij.ide.util.projectWizard.AbstractNewProjectStep
@@ -44,7 +43,7 @@ class ZigDirectoryProjectGenerator: DirectoryProjectGenerator<ZigProjectConfigur
     }
 
     override fun getLogo(): Icon {
-        return Icons.ZIG
+        return Icons.Zig
     }
 
     override fun createPeer(): ProjectGeneratorPeer<ZigProjectConfigurationData> {
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectWizard.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectWizard.kt
index b7c4eebe..30258e76 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectWizard.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/newproject/ZigNewProjectWizard.kt
@@ -37,7 +37,7 @@ class ZigNewProjectWizard: LanguageGeneratorNewProjectWizard {
     override val name: String
         get() = "Zig"
     override val icon: Icon
-        get() = Icons.ZIG
+        get() = Icons.Zig
     override val ordinal: Int
         get() = 900
 
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
index a30a21d5..76414dcc 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/steps/ui/BuildToolWindowContext.kt
@@ -65,7 +65,7 @@ import javax.swing.tree.TreePath
 
 class BuildToolWindowContext(private val project: Project): Disposable {
     val rootNode: DefaultMutableTreeNode = DefaultMutableTreeNode(BaseNodeDescriptor<Any>(project, project.name, AllIcons.Actions.ProjectDirectory))
-    private val buildZig: DefaultMutableTreeNode = DefaultMutableTreeNode(BaseNodeDescriptor<Any>(project, ZigBrainsBundle.message("build.tool.window.tree.steps.label"), Icons.ZIG))
+    private val buildZig: DefaultMutableTreeNode = DefaultMutableTreeNode(BaseNodeDescriptor<Any>(project, ZigBrainsBundle.message("build.tool.window.tree.steps.label"), Icons.Zig))
     init {
         rootNode.add(buildZig)
     }
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/template/ZigProjectTemplate.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/template/ZigProjectTemplate.kt
index c7b56bb6..4ce098f2 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/template/ZigProjectTemplate.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/template/ZigProjectTemplate.kt
@@ -29,7 +29,7 @@ import javax.swing.Icon
 sealed class ZigProjectTemplate(
     @ListItem val name: String,
     val isBinary: Boolean,
-    val icon: Icon = Icons.ZIG
+    val icon: Icon = Icons.Zig
 ) {
     abstract fun fileTemplates(): Map<String, String>
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/stdlib/ZigSyntheticLibrary.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/stdlib/ZigSyntheticLibrary.kt
index 99602376..73995b5b 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/stdlib/ZigSyntheticLibrary.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/project/toolchain/stdlib/ZigSyntheticLibrary.kt
@@ -60,7 +60,7 @@ class ZigSyntheticLibrary(val project: Project) : SyntheticLibrary(), ItemPresen
     }
 
     override fun getIcon(unused: Boolean): Icon {
-        return Icons.ZIG
+        return Icons.Zig
     }
 
     override fun getSourceRoots(): Collection<VirtualFile> {
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/ZigFileType.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/ZigFileType.kt
index 962087dd..0eefb474 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/ZigFileType.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/ZigFileType.kt
@@ -33,5 +33,5 @@ object ZigFileType : LanguageFileType(ZigLanguage) {
 
     override fun getDefaultExtension() = "zig"
 
-    override fun getIcon() = Icons.ZIG
+    override fun getIcon() = Icons.Zig
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt
index ccb2bb83..416ea81c 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zig/highlighter/ZigColorSettingsPage.kt
@@ -38,7 +38,7 @@ class ZigColorSettingsPage: ColorSettingsPage {
 
     override fun getDisplayName() = ZigBrainsBundle.message("configurable.name.zig-color-settings-page")
 
-    override fun getIcon() = Icons.ZIG
+    override fun getIcon() = Icons.Zig
 
     override fun getHighlighter() = ZigSyntaxHighlighter()
 
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/ZonFileType.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/ZonFileType.kt
index c766648b..9edfe959 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/ZonFileType.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/ZonFileType.kt
@@ -33,5 +33,5 @@ object ZonFileType: LanguageFileType(ZonLanguage) {
 
     override fun getDefaultExtension() = "zon"
 
-    override fun getIcon() = Icons.ZON
+    override fun getIcon() = Icons.Zon
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonColorSettingsPage.kt b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonColorSettingsPage.kt
index 5b2726e0..488db942 100644
--- a/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonColorSettingsPage.kt
+++ b/core/src/main/kotlin/com/falsepattern/zigbrains/zon/highlighting/ZonColorSettingsPage.kt
@@ -35,7 +35,7 @@ class ZonColorSettingsPage: ColorSettingsPage {
 
     override fun getDisplayName() = ZigBrainsBundle.message("configurable.name.zon-color-settings-page")
 
-    override fun getIcon() = Icons.ZON
+    override fun getIcon() = Icons.Zon
 
     override fun getHighlighter() = ZonSyntaxHighlighter()
 
diff --git a/core/src/main/resources/META-INF/zigbrains-core.xml b/core/src/main/resources/META-INF/zigbrains-core.xml
index d0289283..4d5ed253 100644
--- a/core/src/main/resources/META-INF/zigbrains-core.xml
+++ b/core/src/main/resources/META-INF/zigbrains-core.xml
@@ -187,8 +187,9 @@
         <action
                 id="zigbrains.file.new"
                 class="com.falsepattern.zigbrains.project.actions.ZigNewFileAction"
+                icon="com.falsepattern.zigbrains.Icons.Zig"
         >
-            <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
+            <add-to-group group-id="NewGroup" anchor="after" relative-to-action="FileTemplateSeparatorGroup"/>
         </action>
     </actions>
     <!-- endregion Project -->