diff --git a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
index fdd6de9c5..b740ba242 100644
--- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
+++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
@@ -125,14 +125,15 @@ public class AppLayoutModel {
                         new LabelGraphic.IconGraphic("mdi2b-book-open-variant"),
                         null,
                         () -> Hyperlinks.open(Hyperlinks.DOCS),
-                        null),
-                new Entry(
-                        AppI18n.observable("webtop"),
-                        new LabelGraphic.IconGraphic("mdi2d-desktop-mac"),
-                        null,
-                        () -> Hyperlinks.open(Hyperlinks.GITHUB_WEBTOP),
                         null)));
-
+        if (AppDistributionType.get() != AppDistributionType.WEBTOP) {
+            l.add(new Entry(
+                            AppI18n.observable("webtop"),
+                            new LabelGraphic.IconGraphic("mdi2d-desktop-mac"),
+                            null,
+                            () -> Hyperlinks.open(Hyperlinks.GITHUB_WEBTOP),
+                            null));
+        }
         return l;
     }
 
diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
index 9325345ef..41c4286f3 100644
--- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.terminal;
 
+import io.xpipe.app.core.AppDistributionType;
 import io.xpipe.app.ext.PrefsChoiceValue;
 import io.xpipe.app.ext.ProcessControlProvider;
 import io.xpipe.app.prefs.ExternalApplicationType;
@@ -413,6 +414,41 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
             return CommandBuilder.of().add("-c").addFile(configuration.getScriptFile());
         }
     };
+    ExternalTerminalType UXTERM = new SimplePathType("app.uxterm", "uxterm", true) {
+        @Override
+        public String getWebsite() {
+            return "https://invisible-island.net/xterm/";
+        }
+
+        @Override
+        public TerminalOpenFormat getOpenFormat() {
+            return TerminalOpenFormat.NEW_WINDOW;
+        }
+
+        @Override
+        public boolean isRecommended() {
+            return false;
+        }
+
+        @Override
+        public boolean useColoredTitle() {
+            return true;
+        }
+
+        @Override
+        public boolean supportsUnicode() {
+            return true;
+        }
+
+        @Override
+        protected CommandBuilder toCommand(TerminalLaunchConfiguration configuration) {
+            return CommandBuilder.of()
+                    .add("-title")
+                    .addQuoted(configuration.getColoredTitle())
+                    .add("-e")
+                    .addFile(configuration.getScriptFile());
+        }
+    };
     ExternalTerminalType XTERM = new SimplePathType("app.xterm", "xterm", true) {
         @Override
         public String getWebsite() {
@@ -612,6 +648,7 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
             TILIX,
             GUAKE,
             TILDA,
+            UXTERM,
             XTERM,
             DEEPIN_TERMINAL,
             FOOT,
@@ -664,6 +701,10 @@ public interface ExternalTerminalType extends PrefsChoiceValue {
             return existing;
         }
 
+        if (existing == null && AppDistributionType.get() == AppDistributionType.WEBTOP) {
+            return ExternalTerminalType.KONSOLE;
+        }
+
         var r = ALL.stream()
                 .filter(externalTerminalType -> !externalTerminalType.equals(CUSTOM))
                 .filter(terminalType -> terminalType.isAvailable())
diff --git a/app/src/main/resources/io/xpipe/app/resources/style/popup-menu.css b/app/src/main/resources/io/xpipe/app/resources/style/popup-menu.css
index 5e76fc5bd..7456cffc8 100644
--- a/app/src/main/resources/io/xpipe/app/resources/style/popup-menu.css
+++ b/app/src/main/resources/io/xpipe/app/resources/style/popup-menu.css
@@ -63,7 +63,7 @@
     -fx-border-radius: 0;
 }
 
-.root:performance .context-menu {
+.root:performance .context-menu, .root:performance .combo-box-popup .list-view {
     -fx-effect: NONE;
     -fx-background-radius: 0;
     -fx-border-radius: 0;