diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index 0b1538578..92bc2f106 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'zulu'
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 2df3c51a5..149fd4b4f 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'zulu'
diff --git a/src/main/java/org/mastodon/mamut/MainWindow.java b/src/main/java/org/mastodon/mamut/MainWindow.java
index 3e3ea15f4..63c73a478 100644
--- a/src/main/java/org/mastodon/mamut/MainWindow.java
+++ b/src/main/java/org/mastodon/mamut/MainWindow.java
@@ -111,7 +111,7 @@ public MainWindow( final ProjectModel appModel )
 
 		// Main Panel
 		final JPanel buttonsPanel = new JPanel();
-		buttonsPanel.setLayout( new MigLayout( "wrap 2", "[150px!]10[150px!]" ) );
+		buttonsPanel.setLayout( new MigLayout( "wrap 2", "[170px!]10[170px!]" ) );
 
 		// Project:
 		final JPanel titlePanel = new JPanel();
diff --git a/src/main/java/org/mastodon/mamut/launcher/MastodonLauncher.java b/src/main/java/org/mastodon/mamut/launcher/MastodonLauncher.java
index 324b059bc..a2ebc3d87 100644
--- a/src/main/java/org/mastodon/mamut/launcher/MastodonLauncher.java
+++ b/src/main/java/org/mastodon/mamut/launcher/MastodonLauncher.java
@@ -28,6 +28,7 @@
  */
 package org.mastodon.mamut.launcher;
 
+import java.awt.Font;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DropTarget;
@@ -47,6 +48,7 @@
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
+import javax.swing.UIManager;
 
 import org.jdom2.JDOMException;
 import org.mastodon.app.MastodonIcons;
@@ -94,6 +96,7 @@ public class MastodonLauncher extends JFrame
 	public MastodonLauncher( final Context context )
 	{
 		super( "Mastodon launcher" );
+		setFont();
 		this.context = Optional.ofNullable( context ).orElse( new Context() );
 
 		System.setProperty( "apple.laf.useScreenMenuBar", "true" );
@@ -123,6 +126,27 @@ public MastodonLauncher( final Context context )
 		setDropTarget( new LauncherDropTarget() );
 	}
 
+	private static void setFont()
+	{
+		// Determine the OS and set the font
+		String os = System.getProperty( "os.name" ).toLowerCase();
+
+		if ( os.contains( "nix" ) || os.contains( "nux" ) )
+		{
+			Font defaultFont = new Font( "Arial", Font.PLAIN, 12 );
+			// Set the font for UI components
+			UIManager.put( "Label.font", defaultFont );
+			UIManager.put( "Button.font", defaultFont );
+			UIManager.put( "TextField.font", defaultFont );
+			UIManager.put( "TextArea.font", defaultFont );
+			UIManager.put( "ComboBox.font", defaultFont );
+			UIManager.put( "List.font", defaultFont );
+			UIManager.put( "Table.font", defaultFont );
+			UIManager.put( "Menu.font", defaultFont );
+			UIManager.put( "MenuItem.font", defaultFont );
+		}
+	}
+
 	private void importSimi()
 	{
 		gui.clearLog();