diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift
index ae769aba3..270fb969f 100644
--- a/iOS/Account/FeedbinAccountViewController.swift
+++ b/iOS/Account/FeedbinAccountViewController.swift
@@ -82,7 +82,7 @@ class FeedbinAccountViewController: UITableViewController {
 		// When you fill in the email address via auto-complete it adds extra whitespace
 		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
 		
-		guard !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
+		guard account != nil || !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
 			showError(NSLocalizedString("There is already a Feedbin account with that username created.", comment: "Duplicate Error"))
 			return
 		}
diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index a9af4dfea..b260617c1 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -154,7 +154,7 @@ struct AppAssets {
 	}()
 	
 	static var masterFolderImage: IconImage = {
-		return IconImage(UIImage(systemName: "folder.fill")!)
+		return IconImage(UIImage(systemName: "folder.fill")!, isSymbol: true)
 	}()
 	
 	static var moreImage: UIImage = {
@@ -186,7 +186,7 @@ struct AppAssets {
 	}()
 	
 	static var searchFeedImage: IconImage = {
-		return IconImage(UIImage(systemName: "magnifyingglass")!)
+		return IconImage(UIImage(systemName: "magnifyingglass")!, isSymbol: true)
 	}()
 	
 	static var secondaryAccentColor: UIColor = {
diff --git a/iOS/IconView.swift b/iOS/IconView.swift
index 7ce9faf3f..a7d9f3e28 100644
--- a/iOS/IconView.swift
+++ b/iOS/IconView.swift
@@ -52,7 +52,7 @@ final class IconView: UIView {
 	}
 
 	private var isSymbolImage: Bool {
-		return imageView.image?.isSymbolImage ?? false
+		return iconImage?.isSymbol ?? false
 	}
 	
 	override init(frame: CGRect) {
@@ -75,7 +75,7 @@ final class IconView: UIView {
 
 	override func layoutSubviews() {
 		imageView.setFrameIfNotEqual(rectForImageView())
-		if (iconImage != nil && isVerticalBackgroundExposed && !isSymbolImage) || !isDisconcernable {
+		if !isSymbolImage && ((iconImage != nil && isVerticalBackgroundExposed) || !isDisconcernable) {
 			backgroundColor = AppAssets.iconBackgroundColor
 		} else {
 			backgroundColor = nil
diff --git a/iOS/SceneDelegate.swift b/iOS/SceneDelegate.swift
index 70c95a717..eb6a6438d 100644
--- a/iOS/SceneDelegate.swift
+++ b/iOS/SceneDelegate.swift
@@ -114,11 +114,11 @@ private extension SceneDelegate {
 		DispatchQueue.main.async {
 			switch AppDefaults.userInterfaceColorPalette {
 			case .automatic:
-				self.window!.overrideUserInterfaceStyle = .unspecified
+				self.window?.overrideUserInterfaceStyle = .unspecified
 			case .light:
-				self.window!.overrideUserInterfaceStyle = .light
+				self.window?.overrideUserInterfaceStyle = .light
 			case .dark:
-				self.window!.overrideUserInterfaceStyle = .dark
+				self.window?.overrideUserInterfaceStyle = .dark
 			}
 		}
 	}
diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
index 5069c364b..7a5663a23 100644
--- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
@@ -1,7 +1,7 @@
 
 // High Level Settings common to both the iOS application and any extensions we bundle with it
-MARKETING_VERSION = 5.0.4
-CURRENT_PROJECT_VERSION = 53
+MARKETING_VERSION = 5.0.5
+CURRENT_PROJECT_VERSION = 56
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon