diff --git a/Mage.Client/splash.jpg b/Mage.Client/splash.jpg
new file mode 100644
index 0000000000..75c7980b63
Binary files /dev/null and b/Mage.Client/splash.jpg differ
diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index f0bf9f4077..f32efdebfe 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -34,9 +34,12 @@
 
 package mage.client;
 
+import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Cursor;
+import java.awt.Graphics2D;
+import java.awt.SplashScreen;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.HashMap;
@@ -458,10 +461,25 @@ public class MageFrame extends javax.swing.JFrame {
 		return pickNumber;
 	}
 
+	static void renderSplashFrame(Graphics2D g) {
+        g.setComposite(AlphaComposite.Clear);
+        g.fillRect(120,140,200,40);
+        g.setPaintMode();
+        g.setColor(Color.BLACK);
+    }
+	
     /**
     * @param args the command line arguments
     */
     public static void main(String args[]) {
+    	final SplashScreen splash = SplashScreen.getSplashScreen();
+    	if (splash != null) {
+    		Graphics2D g = splash.createGraphics();
+    		if (g != null) {
+    			renderSplashFrame(g);
+    		}
+    	}
+    	
 		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
 			public void uncaughtException(Thread t, Throwable e) {
 				logger.log(Level.SEVERE, null, e);
diff --git a/Mage.Client/src/main/java/mage/client/components/MageUI.java b/Mage.Client/src/main/java/mage/client/components/MageUI.java
index 24e057b28e..27f3617093 100644
--- a/Mage.Client/src/main/java/mage/client/components/MageUI.java
+++ b/Mage.Client/src/main/java/mage/client/components/MageUI.java
@@ -3,7 +3,6 @@ package mage.client.components;
 import java.awt.Component;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
 
 import javax.swing.JButton;
 
@@ -60,12 +59,12 @@ public class MageUI {
 		while (!j.isEnabled()) {
 			Thread.sleep(10);
 		}
-    	Thread t = new Thread(new Runnable()  {
+		Thread t = new Thread(new Runnable()  {
 			@Override
 			public void run() {
 				j.doClick();
 			}
 		});
-    	t.start();
+		t.start();
 	}
 }
diff --git a/Mage.Client/src/main/resources/hardwoodfloor.png b/Mage.Client/src/main/resources/hardwoodfloor.png
deleted file mode 100644
index 47f46c9aed..0000000000
Binary files a/Mage.Client/src/main/resources/hardwoodfloor.png and /dev/null differ