diff --git a/core/src/main/java/io/xpipe/core/process/ShellDialects.java b/core/src/main/java/io/xpipe/core/process/ShellDialects.java
index 01950809d..a034279b5 100644
--- a/core/src/main/java/io/xpipe/core/process/ShellDialects.java
+++ b/core/src/main/java/io/xpipe/core/process/ShellDialects.java
@@ -23,6 +23,7 @@ public class ShellDialects {
     public static ShellDialect CSH;
     public static ShellDialect FISH;
     public static ShellDialect NUSHELL;
+    public static ShellDialect XONSH;
 
     public static ShellDialect NO_INTERACTION;
     public static ShellDialect CISCO;
@@ -91,6 +92,7 @@ public class ShellDialects {
             ASH = byId("ash");
             SH = byId("sh");
             NUSHELL = byId("nushell");
+            XONSH = byId("xonsh");
             NO_INTERACTION = byId("noInteraction");
             CISCO = byId("cisco");
             MIKROTIK = byId("mikrotik");
diff --git a/dist/changelogs/17.0.md b/dist/changelogs/17.0.md
index 912779e01..00ed5f7b5 100644
--- a/dist/changelogs/17.0.md
+++ b/dist/changelogs/17.0.md
@@ -101,6 +101,7 @@ It has been reworked, and the following issues have been fixed:
 - Add notification when a password is copied to the clipboard
 - Add a new loading icon
 - Add support for nushell
+- Add support for xonsh
 - Add support for LXTerminal, the default on Raspberry Pi OS
 
 ## Fixes
diff --git a/img/proc/xonsh_icon.png b/img/proc/xonsh_icon.png
new file mode 100644
index 000000000..dcf0fb572
Binary files /dev/null and b/img/proc/xonsh_icon.png differ