diff --git a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift
index 94744cdfdc..434b19bd6b 100644
--- a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift
+++ b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails+View.swift
@@ -74,10 +74,13 @@ public extension AddressDetails {
 			Group {
 				switch store.qrImage {
 				case let .success(value):
-					Image(decorative: value, scale: 1)
-						.resizable()
-						.aspectRatio(1, contentMode: .fit)
-						.transition(.scale(scale: 0.95).combined(with: .opacity))
+					GeometryReader { proxy in
+						Image(decorative: value, scale: 1)
+							.resizable()
+							.frame(width: proxy.size.height, height: proxy.size.height)
+							.frame(maxWidth: .infinity)
+							.transition(.scale(scale: 0.95).combined(with: .opacity))
+					}
 				case .failure:
 					Text(L10n.AddressDetails.qrCodeFailure)
 						.textStyle(.body1HighImportance)
@@ -220,15 +223,6 @@ private extension AddressDetails.View {
 }
 
 private extension AddressDetails.State {
-	var showQrCode: Bool {
-		switch address {
-		case .account:
-			true
-		default:
-			false
-		}
-	}
-
 	var showVerifyOnLedger: Bool {
 		switch address {
 		case let .account(_, isLedgerHWAccount):
diff --git a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift
index 037416dc19..82e8c19b44 100644
--- a/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift
+++ b/RadixWallet/Core/FeaturePrelude/AddressView/AddressDetails.swift
@@ -129,6 +129,9 @@ public struct AddressDetails: Sendable, FeatureReducer {
 	}
 
 	private func loadQrCodeEffect(state: inout State) -> Effect<Action> {
+		guard state.showQrCode else {
+			return .none
+		}
 		state.qrImage = .loading
 		let content = QR.addressPrefix + state.address.address
 		return .run { send in
@@ -142,6 +145,17 @@ public struct AddressDetails: Sendable, FeatureReducer {
 
 // MARK: - Helpers
 
+extension AddressDetails.State {
+	var showQrCode: Bool {
+		switch address {
+		case .account:
+			true
+		default:
+			false
+		}
+	}
+}
+
 private extension OnLedgerEntity.Resource {
 	var resourceTitle: String? {
 		guard let name = metadata.name else {
diff --git a/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift b/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift
index 2ad199ba69..cb11ed1027 100644
--- a/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift
+++ b/RadixWallet/Features/AssetsFeature/Components/NonFungibleAssetList/Components/Details/NonFungibleTokenDetails+View.swift
@@ -14,7 +14,7 @@ extension NonFungibleTokenDetails.State {
 				resourceAddress: resourceAddress,
 				isXRD: false,
 				validatorAddress: nil,
-				resourceName: resourceDetails.metadata.title,
+				resourceName: resourceDetails.metadata.name,
 				currentSupply: resourceDetails.totalSupply.map { $0?.formatted() },
 				arbitraryDataFields: resourceDetails.metadata.arbitraryItems.asDataFields,
 				behaviors: resourceDetails.behaviors,