diff --git a/FModel/App.config b/FModel/App.config
index 3eb2abcf..7ec575e5 100644
--- a/FModel/App.config
+++ b/FModel/App.config
@@ -121,6 +121,9 @@
             <setting name="createIconForSTWHeroes" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="createIconForSTWCardPacks" serializeAs="String">
+                <value>True</value>
+            </setting>
         </FModel.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/FModel/Forms/IconGeneratorAssets.Designer.cs b/FModel/Forms/IconGeneratorAssets.Designer.cs
index 7a06b7fd..a52fe278 100644
--- a/FModel/Forms/IconGeneratorAssets.Designer.cs
+++ b/FModel/Forms/IconGeneratorAssets.Designer.cs
@@ -57,7 +57,8 @@
             "Variants",
             "Ammo",
             "STW Heroes",
-            "STW Defenders"});
+            "STW Defenders",
+            "STW Card Packs"});
             this.checkedAssets.Location = new System.Drawing.Point(12, 12);
             this.checkedAssets.Name = "checkedAssets";
             this.checkedAssets.Size = new System.Drawing.Size(307, 274);
diff --git a/FModel/Forms/IconGeneratorAssets.cs b/FModel/Forms/IconGeneratorAssets.cs
index b459790d..8aa18332 100644
--- a/FModel/Forms/IconGeneratorAssets.cs
+++ b/FModel/Forms/IconGeneratorAssets.cs
@@ -23,6 +23,7 @@ namespace FModel.Forms
             checkedAssets.SetItemChecked(5, Properties.Settings.Default.createIconForAmmo);
             checkedAssets.SetItemChecked(6, Properties.Settings.Default.createIconForSTWHeroes);
             checkedAssets.SetItemChecked(7, Properties.Settings.Default.createIconForSTWDefenders);
+            checkedAssets.SetItemChecked(8, Properties.Settings.Default.createIconForSTWCardPacks);
         }
 
         private void OKButton_Click(object sender, EventArgs e)
@@ -36,6 +37,7 @@ namespace FModel.Forms
             Properties.Settings.Default.createIconForAmmo = checkedAssets.GetItemChecked(5);
             Properties.Settings.Default.createIconForSTWHeroes = checkedAssets.GetItemChecked(6);
             Properties.Settings.Default.createIconForSTWDefenders = checkedAssets.GetItemChecked(7);
+            Properties.Settings.Default.createIconForSTWCardPacks = checkedAssets.GetItemChecked(8);
 
             Properties.Settings.Default.Save(); //SAVE
             Close();
diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs
index 19a3ca3e..26cf3f10 100644
--- a/FModel/MainWindow.cs
+++ b/FModel/MainWindow.cs
@@ -1323,7 +1323,12 @@ namespace FModel
             string toReturn = string.Empty;
 
             MyExtractor = new PakExtractor(Settings.Default.PAKsPath + "\\" + currentPak, Settings.Default.AESKey);
-            string[] results = Array.FindAll(MyExtractor.GetFileList().ToArray(), s => s.Contains("/" + currentItem + "."));
+
+            string[] results = null;
+            if (currentItem.Contains("."))
+                results = Array.FindAll(MyExtractor.GetFileList().ToArray(), s => s.Contains("/" + currentItem));
+            else
+                results = Array.FindAll(MyExtractor.GetFileList().ToArray(), s => s.Contains("/" + currentItem + "."));
 
             for (int i = 0; i < results.Length; i++)
             {
@@ -1444,19 +1449,21 @@ namespace FModel
                 for (int i = 0; i < itemId.Length; i++)
                 {
                     if (Settings.Default.createIconForCosmetics && (itemId[i].ExportType.Contains("Athena") && itemId[i].ExportType.Contains("Item") && itemId[i].ExportType.Contains("Definition")))
-                        CreateItemIcon(itemId[i], true);
+                        CreateItemIcon(itemId[i], "athIteDef");
                     else if (Settings.Default.createIconForConsumablesWeapons && (itemId[i].ExportType == "FortWeaponRangedItemDefinition" || itemId[i].ExportType == "FortWeaponMeleeItemDefinition"))
-                        CreateItemIcon(itemId[i], false, true);
+                        CreateItemIcon(itemId[i], "consAndWeap");
                     else if (Settings.Default.createIconForTraps && (itemId[i].ExportType == "FortTrapItemDefinition" || itemId[i].ExportType == "FortContextTrapItemDefinition"))
                         CreateItemIcon(itemId[i]);
                     else if (Settings.Default.createIconForVariants && (itemId[i].ExportType == "FortVariantTokenType"))
-                        CreateItemIcon(itemId[i], false, false, true);
+                        CreateItemIcon(itemId[i], "variant");
                     else if (Settings.Default.createIconForAmmo && (itemId[i].ExportType == "FortAmmoItemDefinition"))
-                        CreateItemIcon(itemId[i], false, false, false, "ammo");
+                        CreateItemIcon(itemId[i], "ammo");
                     else if (Settings.Default.createIconForSTWHeroes && (itemId[i].ExportType == "FortHeroType" && (questJson.Contains("ItemDefinition") || questJson.Contains("TestDefsSkydive") || questJson.Contains("GameplayPrototypes")))) //Contains x not to trigger HID from BR
-                        CreateItemIcon(itemId[i], false, false, false, "stwHeroes");
+                        CreateItemIcon(itemId[i], "stwHeroes");
                     else if (Settings.Default.createIconForSTWDefenders && (itemId[i].ExportType == "FortDefenderItemDefinition"))
-                        CreateItemIcon(itemId[i], false, false, false, "stwDefenders");
+                        CreateItemIcon(itemId[i], "stwDefenders");
+                    else if (Settings.Default.createIconForSTWCardPacks && (itemId[i].ExportType == "FortCardPackItemDefinition"))
+                        CreateItemIcon(itemId[i]);
                     else if (itemId[i].ExportType == "FortChallengeBundleItemDefinition")
                         CreateChallengesIcon(itemId[i], parsedJson, questJson);
                     else if (itemId[i].ExportType == "Texture2D")
@@ -1472,7 +1479,7 @@ namespace FModel
                 Console.WriteLine(ex.Message);
             }
         }
-        private void CreateItemIcon(ItemsIdParser theItem, bool athIteDef = false, bool consAndWeap = false, bool variant = false, string SpecialMode = null)
+        private void CreateItemIcon(ItemsIdParser theItem, string SpecialMode = null)
         {
             UpdateConsole(CurrentUsedItem + " is a Cosmetic ID", Color.FromArgb(255, 66, 244, 66), "Success");
 
@@ -1557,7 +1564,7 @@ namespace FModel
                 AppendText("Description ", Color.SteelBlue);
                 AppendText("found", Color.Black, true);
             } //DESCRIPTION
-            if (athIteDef)
+            if (SpecialMode == "athIteDef")
             {
                 try
                 {
@@ -1591,7 +1598,7 @@ namespace FModel
                     AppendText("found", Color.Black, true);
                 } //COSMETIC SOURCE
             }
-            if (consAndWeap)
+            if (SpecialMode == "consAndWeap")
             {
                 try
                 {
@@ -1634,7 +1641,7 @@ namespace FModel
                     getAmmoData(theItem.AmmoData.AssetPathName, g);
                 }
             }
-            if (variant)
+            if (SpecialMode == "variant")
             {
                 try
                 {
diff --git a/FModel/Properties/Settings.Designer.cs b/FModel/Properties/Settings.Designer.cs
index 8ee54138..4c3e1181 100644
--- a/FModel/Properties/Settings.Designer.cs
+++ b/FModel/Properties/Settings.Designer.cs
@@ -466,5 +466,17 @@ namespace FModel.Properties {
                 this["createIconForSTWHeroes"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool createIconForSTWCardPacks {
+            get {
+                return ((bool)(this["createIconForSTWCardPacks"]));
+            }
+            set {
+                this["createIconForSTWCardPacks"] = value;
+            }
+        }
     }
 }
diff --git a/FModel/Properties/Settings.settings b/FModel/Properties/Settings.settings
index bce4dfe7..a4e3ea11 100644
--- a/FModel/Properties/Settings.settings
+++ b/FModel/Properties/Settings.settings
@@ -113,5 +113,8 @@
     <Setting Name="createIconForSTWHeroes" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="createIconForSTWCardPacks" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file