diff --git a/src/main/java/envoy/client/ui/ChatWindow.java b/src/main/java/envoy/client/ui/ChatWindow.java
index b43bb65..05da3c3 100644
--- a/src/main/java/envoy/client/ui/ChatWindow.java
+++ b/src/main/java/envoy/client/ui/ChatWindow.java
@@ -6,6 +6,7 @@ import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.Toolkit;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -59,7 +60,7 @@ public class ChatWindow extends JFrame {
 	private Chat		currentChat;
 
 	private JTextArea messageEnterTextArea;
-	
+
 	private static final Logger logger = Logger.getLogger(ChatWindow.class.getSimpleName());
 
 	public ChatWindow(Client client, LocalDB localDB) {
@@ -70,6 +71,7 @@ public class ChatWindow extends JFrame {
 		setBounds(100, 100, 600, 800);
 		setTitle("Envoy");
 		setLocationRelativeTo(null);
+		setIconImage(Toolkit.getDefaultToolkit().createImage(getClass().getClassLoader().getResource("envoy_logo.png")));
 
 		// Save chats when window closes
 		addWindowListener(new WindowAdapter() {
diff --git a/src/main/resources/envoy_logo.png b/src/main/resources/envoy_logo.png
index 35ef7d9..1606bd5 100644
Binary files a/src/main/resources/envoy_logo.png and b/src/main/resources/envoy_logo.png differ
diff --git a/src/main/resources/envoy_logo_alpha.png b/src/main/resources/envoy_logo_alpha.png
new file mode 100644
index 0000000..f1040c5
Binary files /dev/null and b/src/main/resources/envoy_logo_alpha.png differ
diff --git a/src/main/resources/envoy_logo_old.png b/src/main/resources/envoy_logo_old.png
new file mode 100644
index 0000000..35ef7d9
Binary files /dev/null and b/src/main/resources/envoy_logo_old.png differ