diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java
@@ -8,12 +8,10 @@
 
 
 import com.google.common.collect.AbstractIterator;
-import org.mage.plugins.card.dl.DownloadJob;
-
 import java.io.File;
-import java.util.Iterator;
-
 import static java.lang.String.format;
+import java.util.Iterator;
+import org.mage.plugins.card.dl.DownloadJob;
 import static org.mage.plugins.card.dl.DownloadJob.fromURL;
 import static org.mage.plugins.card.dl.DownloadJob.toFile;
 
@@ -70,7 +68,9 @@ protected DownloadJob computeNext() {
                     sym = "" + (numeric++);
                 } else {
                     sizeIndex++;
-                    if(sizeIndex == sizes.length) return endOfData();
+                    if(sizeIndex == sizes.length) {
+                        return endOfData();
+                    }
 
                     symIndex = 0;
                     numeric = 0;
@@ -80,9 +80,17 @@ protected DownloadJob computeNext() {
                 String symbol = sym.replaceAll("/", "");
                 File dst = new File(dir, symbol + ".jpg");
 
-                if(symbol.equals("T")) symbol = "tap";
-                else if(symbol.equals("Q")) symbol = "untap";
-                else if(symbol.equals("S")) symbol = "snow";
+                switch (symbol) {
+                    case "T":
+                        symbol = "tap";
+                        break;
+                    case "Q":
+                        symbol = "untap";
+                        break;
+                    case "S":
+                        symbol = "snow";
+                        break;
+                }
 
                 String url = format(urlFmt, sizes[sizeIndex], symbol);
 

diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
@@ -1,8 +1,14 @@
 package org.mage.plugins.card.utils;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.HashMap;
+import java.util.prefs.Preferences;
+import mage.client.MageFrame;
 import mage.client.constants.Constants;
 import mage.client.dialog.PreferencesDialog;
+import mage.remote.Connection;
+import mage.remote.Connection.ProxyType;
 import net.java.truevfs.access.TFile;
 import org.apache.log4j.Logger;
 import org.mage.plugins.card.images.CardDownloadData;
@@ -150,4 +156,15 @@ public static String generateImagePath(CardDownloadData card) {
 
         return imageDir + TFile.separator + imageName;
     }
+
+    public static Proxy getProxyFromPreferences() {
+        Preferences prefs = MageFrame.getPreferences();
+        Connection.ProxyType proxyType = Connection.ProxyType.valueByText(prefs.get("proxyType", "None"));
+        if (!proxyType.equals(ProxyType.NONE)) {
+            String proxyServer = prefs.get("proxyAddress", "");
+            int proxyPort = Integer.parseInt(prefs.get("proxyPort", "0"));
+            return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyServer, proxyPort));
+        }
+        return null;
+    }
 }