diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index ca3e208f597..fe4476349b4 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -131,20 +131,22 @@ public class MageFrame extends javax.swing.JFrame {
 			disableButtons();
 		
 		//TODO:
+		if (Plugins.getInstance().isCardPluginLoaded()) {
 		Separator separator = new javax.swing.JToolBar.Separator();
-		mageToolbar.add(separator);
-		
-		JButton btnDownload = new JButton("Images");
-		btnDownload.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-		btnDownload.setFocusable(false);
-		btnDownload.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-		btnDownload.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-		btnDownload.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnImagesActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnDownload);
+			mageToolbar.add(separator);
+			
+			JButton btnDownload = new JButton("Images");
+			btnDownload.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+			btnDownload.setFocusable(false);
+			btnDownload.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+			btnDownload.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+			btnDownload.addActionListener(new java.awt.event.ActionListener() {
+	            public void actionPerformed(java.awt.event.ActionEvent evt) {
+	                btnImagesActionPerformed(evt);
+	            }
+	        });
+	        mageToolbar.add(btnDownload);
+		}
     }
     
     private void  btnImagesActionPerformed(java.awt.event.ActionEvent evt) {
diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java
index 5e2000eee1b..d7213920b2c 100644
--- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java
+++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java
@@ -11,7 +11,6 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -111,7 +110,7 @@ public class CardPanel extends MagePermanent {
 		overlayPanel.setScalingMultiPassType(MultipassType.none);
 		
 		//TODO: Image sickness = ImageManager.getSicknessImage();
-		Image sickness = null;
+		BufferedImage sickness = null;
 		overlayPanel.setImage(sickness, sickness);
 
 		imagePanel = new ScaledImagePanel();
@@ -129,6 +128,7 @@ public class CardPanel extends MagePermanent {
 				try {
 					tappedAngle = gameCard.isTapped() ? CardPanel.TAPPED_ANGLE : 0;
 					BufferedImage srcImage = ImageCache.getImageOriginal(gameCard);
+					srcImage = ImageCache.getNormalSizeImage(srcImage);
 					if (srcImage != null) {
 						hasImage = true;
 						setText(gameCard);
@@ -510,7 +510,7 @@ public class CardPanel extends MagePermanent {
 
 	@Override
 	public Image getImage() {
-		return this.imagePanel.getSrcImage();
+		return ImageCache.getImageOriginal(gameCard);
 	}
 
 }
diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java
index 53217e2c2f5..d6bbf7580b6 100644
--- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -12,6 +12,7 @@ import javax.imageio.ImageIO;
 import mage.view.CardView;
 
 import org.apache.log4j.Logger;
+import org.mage.plugins.card.constants.Constants;
 import org.mage.plugins.card.utils.CardImageUtils;
 
 import com.google.common.base.Function;
@@ -138,16 +139,16 @@ public class ImageCache {
 
 		return image;
 	}
-
+	
 	/**
 	 * Returns an image scaled to the size given
 	 */
-	/*private static BufferedImage getNormalSizeImage(BufferedImage original) {
+	public static BufferedImage getNormalSizeImage(BufferedImage original) {
 		int srcWidth = original.getWidth();
 		int srcHeight = original.getHeight();
 		
-		int tgtWidth = SettingsManager.getManager().getCardSize().width;
-		int tgtHeight = SettingsManager.getManager().getCardSize().height;
+		int tgtWidth = Constants.CARD_SIZE_FULL.width;
+		int tgtHeight = Constants.CARD_SIZE_FULL.height;
 		
 		if (srcWidth == tgtWidth && srcHeight == tgtHeight)
 			return original;
@@ -155,7 +156,7 @@ public class ImageCache {
 		ResampleOp resampleOp = new ResampleOp(tgtWidth, tgtHeight);
 		BufferedImage image = resampleOp.filter(original, null);
 		return image;
-	}*/
+	}
 
 	/**
 	 * Returns an image scaled to the size appropriate for the card picture
@@ -173,7 +174,7 @@ public class ImageCache {
 	 * Returns an image scaled to the size appropriate for the card picture
 	 * panel
 	 */
-	private static BufferedImage getResizedImage(BufferedImage original, Rectangle sizeNeed) {
+	public static BufferedImage getResizedImage(BufferedImage original, Rectangle sizeNeed) {
 		ResampleOp resampleOp = new ResampleOp(sizeNeed.width, sizeNeed.height);
 		BufferedImage image = resampleOp.filter(original, null);
 		return image;