diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index dda059252cd..025e12a5e9b 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -185,6 +185,18 @@ public class MageFrame extends javax.swing.JFrame {
 			e.printStackTrace();
 		}
 		
+		filename = "/icon-mage.png";
+		try {
+			InputStream is = this.getClass().getResourceAsStream(filename);
+			
+	    	if (is != null) {
+	    		BufferedImage image = ImageIO.read(is);
+	    		setIconImage(image);
+	    	}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
 		desktopPane.add(ArrowBuilder.getArrowsPanel(), JLayeredPane.DRAG_LAYER);
 		
 		desktopPane.addComponentListener(new ComponentAdapter(){
diff --git a/Mage.Client/src/main/resources/icon-mage.png b/Mage.Client/src/main/resources/icon-mage.png
new file mode 100644
index 00000000000..a882d56f00b
Binary files /dev/null and b/Mage.Client/src/main/resources/icon-mage.png differ