diff --git a/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletContainer.kt b/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletContainer.kt
index 30390810b..d52ef30b4 100644
--- a/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletContainer.kt
+++ b/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletContainer.kt
@@ -309,6 +309,9 @@ private fun SelectedWalletLoadingScreen(
     val primaryText = MaterialTheme.colorScheme.onSurface
     val secondaryText = MaterialTheme.colorScheme.onSurfaceVariant
     val canGoBack = app.canGoBack()
+    val showsShieldIcon =
+        metadata.walletType == WalletType.COLD ||
+            metadata.walletType == WalletType.XPUB_ONLY
 
     ForceLightStatusBarIcons()
 
@@ -329,7 +332,7 @@ private fun SelectedWalletLoadingScreen(
                         horizontalArrangement = Arrangement.Center,
                         verticalAlignment = Alignment.CenterVertically,
                     ) {
-                        if (metadata.walletType == WalletType.COLD) {
+                        if (showsShieldIcon) {
                             BitcoinShieldIcon(size = 13.dp, color = Color.White)
                             Spacer(modifier = Modifier.size(8.dp))
                         }
diff --git a/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt b/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
index d2fa60a1e..e63557eb6 100644
--- a/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
+++ b/android/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
@@ -191,7 +191,9 @@ fun SelectedWalletScreen(
 
     // state for wallet name rename dropdown
     var showRenameMenu by remember { mutableStateOf(false) }
-    val isColdWallet = manager.walletMetadata?.walletType == WalletType.COLD
+    val showsShieldIcon =
+        manager.walletMetadata?.walletType == WalletType.COLD ||
+            manager.walletMetadata?.walletType == WalletType.XPUB_ONLY
     val isWatchOnly = manager.walletMetadata?.walletType == WalletType.WATCH_ONLY
 
     // force white status bar icons for midnight blue background
@@ -231,7 +233,7 @@ fun SelectedWalletScreen(
                             horizontalArrangement = Arrangement.Center,
                             verticalAlignment = Alignment.CenterVertically,
                         ) {
-                            if (isColdWallet) {
+                            if (showsShieldIcon) {
                                 BitcoinShieldIcon(size = 13.dp, color = Color.White)
                                 Spacer(modifier = Modifier.size(8.dp))
                             }
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 19ebe9154..862421686 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="label_wallet_account_number">Account number</string>
     <string name="label_wallet_fingerprint">Fingerprint</string>
     <string name="label_wallet_type">Wallet type</string>
+    <string name="label_wallet_address_type">Address type</string>
     <string name="title_wallet_settings">Settings</string>
     <string name="label_wallet_name">Name</string>
     <string name="change_name">Change Name</string>
diff --git a/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContainer.swift b/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContainer.swift
index fe76c423a..85e916322 100644
--- a/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContainer.swift
+++ b/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContainer.swift
@@ -105,7 +105,7 @@ private struct SelectedWalletLoadingScreen: View {
 
     private var titleContent: some View {
         HStack(spacing: 10) {
-            if case .cold = metadata.walletType {
+            if metadata.walletType == .cold || metadata.walletType == .xpubOnly {
                 BitcoinShieldIcon(width: 13, color: toolbarTextColor)
             }
 
diff --git a/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContentViews.swift b/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContentViews.swift
index b5a532e0c..9a8a8edae 100644
--- a/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContentViews.swift
+++ b/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletContentViews.swift
@@ -58,7 +58,7 @@ struct SelectedWalletTitleContent: View {
 
     var body: some View {
         HStack(spacing: 10) {
-            if case .cold = metadata.walletType {
+            if metadata.walletType == .cold || metadata.walletType == .xpubOnly {
                 BitcoinShieldIcon(width: 13, color: toolbarTextColor)
             }
 
diff --git a/ios/Cove/Flows/SendFlow/Common/SendFlowAccountSection.swift b/ios/Cove/Flows/SendFlow/Common/SendFlowAccountSection.swift
index e0133f143..fd70966b8 100644
--- a/ios/Cove/Flows/SendFlow/Common/SendFlowAccountSection.swift
+++ b/ios/Cove/Flows/SendFlow/Common/SendFlowAccountSection.swift
@@ -50,7 +50,7 @@ struct SendFlowAccountSection: View {
                 .padding(.trailing, 6)
         }
 
-        if case .cold = metadata.walletType {
+        if metadata.walletType == .cold || metadata.walletType == .xpubOnly {
             BitcoinShieldIcon(width: 24, color: .orange)
         }