diff --git a/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift b/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift
index 07c089c4b..a0b930be0 100644
--- a/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift
+++ b/Backpack-SwiftUI/Icons/Classes/BPKIcon.swift
@@ -16,15 +16,13 @@
  * limitations under the License.
  */
 
-import Backpack_Common
-
 public struct BPKIcon {
     public let name: String
     let bundle: Bundle?
 
     init(name: String, bundle: Bundle? = nil) {
         self.name = name
-        self.bundle = bundle ?? BPKCommonBundle.iconsBundle
+        self.bundle = bundle
     }
     
     public enum Size {
diff --git a/Backpack-SwiftUI/Icons/Classes/BPKIconView.swift b/Backpack-SwiftUI/Icons/Classes/BPKIconView.swift
index c257ab57e..d3b9aca33 100644
--- a/Backpack-SwiftUI/Icons/Classes/BPKIconView.swift
+++ b/Backpack-SwiftUI/Icons/Classes/BPKIconView.swift
@@ -83,10 +83,11 @@ private extension BPKIcon.Size {
 private extension Image {
     init(icon: BPKIcon, size: BPKIcon.Size = .small, shouldEnableAccessibility: Bool) {
         let iconName = "\(icon.name)-\(size.suffix)"
+        let bundle = icon.bundle ?? BPKCommonBundle.iconsBundle
         if shouldEnableAccessibility {
-            self.init(iconName, bundle: icon.bundle)
+            self.init(iconName, bundle: bundle)
         } else {
-            self.init(decorative: iconName, bundle: icon.bundle)
+            self.init(decorative: iconName, bundle: bundle)
         }
     }
 }
diff --git a/Backpack-SwiftUI/Icons/Classes/Generated/BPKIcons.swift b/Backpack-SwiftUI/Icons/Classes/Generated/BPKIcons.swift
index 7da93a87a..d55a71fcd 100644
--- a/Backpack-SwiftUI/Icons/Classes/Generated/BPKIcons.swift
+++ b/Backpack-SwiftUI/Icons/Classes/Generated/BPKIcons.swift
@@ -297,12 +297,12 @@ public extension BPKIcon {
 }
 
 public extension BPKIcon {
-    // swiftlint:disable function_body_length cyclomatic_complexity
-    static func named(_ iconName: String, bundle: Bundle? = nil) -> BPKIcon? {
-        if let bundle {
-            return BPKIcon(name: iconName, bundle: bundle)
-        }
+    static func named(_ iconName: String, bundle: Bundle) -> BPKIcon {
+    BPKIcon(name: iconName, bundle: bundle)
+    }
 
+    // swiftlint:disable function_body_length cyclomatic_complexity
+    static func named(_ iconName: String) -> BPKIcon? {
         switch iconName {
         case "accessibility": return .accessibility
         case "account--add": return .accountAdd
diff --git a/templates/swiftui/BPKIcons.njk b/templates/swiftui/BPKIcons.njk
index 156b0845d..b40ddbd50 100644
--- a/templates/swiftui/BPKIcons.njk
+++ b/templates/swiftui/BPKIcons.njk
@@ -24,12 +24,12 @@ public extension BPKIcon {
 }
 
 public extension BPKIcon {
-    // swiftlint:disable function_body_length cyclomatic_complexity
-    static func named(_ iconName: String, bundle: Bundle? = nil) -> BPKIcon? {
-        if let bundle {
-            return BPKIcon(name: iconName, bundle: bundle)
-        }
+    static func named(_ iconName: String, bundle: Bundle) -> BPKIcon {
+    BPKIcon(name: iconName, bundle: bundle)
+    }
 
+    // swiftlint:disable function_body_length cyclomatic_complexity
+    static func named(_ iconName: String) -> BPKIcon? {
         switch iconName {
         {% for icon in icons -%}
         case "{{icon.file}}": return .{{icon.name}}