diff --git a/src/main/java/corgi/Main.java b/src/main/java/corgi/Main.java
index bc71ab9b97..e77a50db01 100644
--- a/src/main/java/corgi/Main.java
+++ b/src/main/java/corgi/Main.java
@@ -6,6 +6,7 @@
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
 
@@ -18,6 +19,11 @@ public class Main extends Application {
 
     @Override
     public void start(Stage stage) {
+        stage.setTitle("Corgi - The most intelligent chatbot");
+
+        Image icon = new Image(this.getClass().getResourceAsStream("/images/icon.jpg"));
+        stage.getIcons().add(icon);
+        
         try {
             FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml"));
             AnchorPane ap = fxmlLoader.load();
diff --git a/src/main/resources/images/icon.jpg b/src/main/resources/images/icon.jpg
new file mode 100644
index 0000000000..3d0c9ab4fc
Binary files /dev/null and b/src/main/resources/images/icon.jpg differ