diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 9179078..68ecc96 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -3,6 +3,7 @@ package envoy.client.ui;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 
@@ -26,6 +27,7 @@ public final class Startup extends Application {
 		
 		var chatScene = new Scene(anchorPane);
 		primaryStage.setTitle("Envoy");
+		primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
 		primaryStage.setScene(chatScene);
 		primaryStage.show();
 	}
diff --git a/src/main/resources/envoy_logo.png b/src/main/resources/icons/envoy_logo.png
similarity index 100%
rename from src/main/resources/envoy_logo.png
rename to src/main/resources/icons/envoy_logo.png
diff --git a/src/main/resources/envoy_logo_alpha.png b/src/main/resources/icons/envoy_logo_alpha.png
similarity index 100%
rename from src/main/resources/envoy_logo_alpha.png
rename to src/main/resources/icons/envoy_logo_alpha.png