diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
index 1a92477f2fd..c9d2f27d8fa 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
@@ -2422,7 +2422,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
             PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS, "true").equals("true"),
             PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_CONFIRM_EMPTY_MANA_POOL, "true").equals("true"),
             getUserSkipPrioritySteps(),
-            MageFrame.getPreferences().get(KEY_CONNECT_FLAG, "world.png"),                
+            MageFrame.getPreferences().get(KEY_CONNECT_FLAG, "world"),                
             PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_ASK_MOVE_TO_GRAVE_ORDER, "true").equals("true")
         );
     }
diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java
index cc26e5bedca..2ee392fe9ea 100644
--- a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java
+++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryCellRenderer.java
@@ -68,7 +68,7 @@ public class CountryCellRenderer extends DefaultTableCellRenderer {
     private ImageIcon getCountryFlagIcon(String countryCode) {
         ImageIcon flagIcon = flagIconCache.get(countryCode);
         if (flagIcon == null) {
-            flagIcon = new javax.swing.ImageIcon(getClass().getResource("/flags/" + countryCode +".png"));
+            flagIcon = new javax.swing.ImageIcon(getClass().getResource("/flags/" + countryCode + (countryCode.endsWith(".png") ? "" :".png")));
             if (flagIcon.getImage() == null) {
                 logger.warn("Country flag resource not found: " + countryCode);
             } else {