diff --git a/src/keyfile.c b/src/keyfile.c

index 05373af..4143e75 100644

--- a/src/keyfile.c

+++ b/src/keyfile.c

@@ -78,7 +78,7 @@

 #elif defined(__APPLE__)

 #define GEANY_DEFAULT_TOOLS_TERMINAL	"open -a terminal %c"

 #else

-#define GEANY_DEFAULT_TOOLS_TERMINAL	"xterm -e \"/bin/sh %c\""

+#define GEANY_DEFAULT_TOOLS_TERMINAL	"xvt -e \"/bin/sh %c\""

 #endif

 #ifdef __APPLE__

 #define GEANY_DEFAULT_TOOLS_BROWSER		"open -a safari"

@@ -86,7 +86,7 @@

 #define GEANY_DEFAULT_FONT_MSG_WINDOW	"Menlo Medium 12"

 #define GEANY_DEFAULT_FONT_EDITOR		"Menlo Medium 12"

 #else

-#define GEANY_DEFAULT_TOOLS_BROWSER		"firefox"

+#define GEANY_DEFAULT_TOOLS_BROWSER		"xbrowser"

 #define GEANY_DEFAULT_FONT_SYMBOL_LIST	"Sans 9"

 #define GEANY_DEFAULT_FONT_MSG_WINDOW	"Monospace 9"

 #define GEANY_DEFAULT_FONT_EDITOR		"Monospace 10"