diff --git a/components/TransactionsNavigationHeader.tsx b/components/TransactionsNavigationHeader.tsx
index cc1feaa30..841fbfe6c 100644
--- a/components/TransactionsNavigationHeader.tsx
+++ b/components/TransactionsNavigationHeader.tsx
@@ -35,7 +35,8 @@ const TransactionsNavigationHeader: React.FC<TransactionsNavigationHeaderProps>
   unitSwitching = false,
 }) => {
   const { hideBalance } = wallet;
-  const [allowOnchainAddress, setAllowOnchainAddress] = useState(false);
+  const isLightningWallet = wallet.type === LightningCustodianWallet.type || wallet.type === LightningArkWallet.type;
+  const [allowOnchainAddress, setAllowOnchainAddress] = useState(isLightningWallet);
   const { preferredFiatCurrency } = useSettings();
   const { direction } = useLocale();
   const balanceOpacity = useSharedValue(1);
@@ -43,7 +44,7 @@ const TransactionsNavigationHeader: React.FC<TransactionsNavigationHeaderProps>
   const previousBalance = useRef<string | undefined>(undefined);
 
   const verifyIfWalletAllowsOnchainAddress = useCallback(() => {
-    if (wallet.type === LightningCustodianWallet.type || wallet.type === LightningArkWallet.type) {
+    if (isLightningWallet) {
       wallet
         .allowOnchainAddress()
         .then((value: boolean) => setAllowOnchainAddress(value))
@@ -52,7 +53,11 @@ const TransactionsNavigationHeader: React.FC<TransactionsNavigationHeaderProps>
           setAllowOnchainAddress(false);
         });
     }
-  }, [wallet]);
+  }, [isLightningWallet, wallet]);
+
+  useEffect(() => {
+    setAllowOnchainAddress(isLightningWallet);
+  }, [isLightningWallet]);
 
   useEffect(() => {
     verifyIfWalletAllowsOnchainAddress();
@@ -205,51 +210,55 @@ const TransactionsNavigationHeader: React.FC<TransactionsNavigationHeaderProps>
         <Text testID="WalletLabel" numberOfLines={1} style={[styles.walletLabel, { writingDirection: direction }]}>
           {wallet.getLabel()}
         </Text>
-        <Animated.View style={[styles.walletBalanceAndUnitContainer, balanceAnimatedStyle]}>
-          <ToolTipMenu
-            shouldOpenOnLongPress
-            isButton
-            enableAndroidRipple={false}
-            buttonStyle={styles.walletBalance}
-            onPressMenuItem={onPressMenuItem}
-            actions={toolTipWalletBalanceActions}
-          >
-            <View style={styles.walletBalance}>
-              {hideBalance ? (
-                <BlurredBalanceView />
-              ) : (
-                <View key={`wallet-balance-textwrap-${wallet.getID?.() ?? ''}-${String(balance)}`}>
-                  <Animated.Text
-                    key={`wallet-balance-text-${wallet.getID?.() ?? ''}-${String(balance)}`} // force recreation on balance change for RTL correctness
-                    testID="WalletBalance"
-                    numberOfLines={1}
-                    minimumFontScale={0.5}
-                    adjustsFontSizeToFit
-                    style={[styles.walletBalanceText, animatedBalanceTextStyle]}
-                  >
-                    {balance}
-                  </Animated.Text>
-                </View>
-              )}
+        <View style={styles.balanceSection}>
+          <Animated.View style={[styles.walletBalanceAndUnitContainer, balanceAnimatedStyle]}>
+            <ToolTipMenu
+              shouldOpenOnLongPress
+              isButton
+              enableAndroidRipple={false}
+              buttonStyle={styles.walletBalance}
+              onPressMenuItem={onPressMenuItem}
+              actions={toolTipWalletBalanceActions}
+            >
+              <View style={styles.walletBalance}>
+                {hideBalance ? (
+                  <BlurredBalanceView />
+                ) : (
+                  <View key={`wallet-balance-textwrap-${wallet.getID?.() ?? ''}-${String(balance)}`}>
+                    <Animated.Text
+                      key={`wallet-balance-text-${wallet.getID?.() ?? ''}-${String(balance)}`} // force recreation on balance change for RTL correctness
+                      testID="WalletBalance"
+                      numberOfLines={1}
+                      minimumFontScale={0.5}
+                      adjustsFontSizeToFit
+                      style={[styles.walletBalanceText, animatedBalanceTextStyle]}
+                    >
+                      {balance}
+                    </Animated.Text>
+                  </View>
+                )}
+              </View>
+            </ToolTipMenu>
+            <TouchableOpacity style={styles.walletPreferredUnitView} onPress={changeWalletBalanceUnit} disabled={unitSwitching}>
+              <Text style={styles.walletPreferredUnitText}>
+                {unit === BitcoinUnit.LOCAL_CURRENCY ? (preferredFiatCurrency?.endPointKey ?? FiatUnit.USD) : unit}
+              </Text>
+            </TouchableOpacity>
+          </Animated.View>
+          {(wallet.type === LightningCustodianWallet.type || wallet.type === LightningArkWallet.type) && allowOnchainAddress && (
+            <View style={styles.manageFundsSection}>
+              <ToolTipMenu
+                shouldOpenOnLongPress={false}
+                isButton
+                onPressMenuItem={handleManageFundsPressed}
+                actions={toolTipActions}
+                buttonStyle={styles.manageFundsButton}
+              >
+                <Text style={styles.manageFundsButtonText}>{loc.lnd.title}</Text>
+              </ToolTipMenu>
             </View>
-          </ToolTipMenu>
-          <TouchableOpacity style={styles.walletPreferredUnitView} onPress={changeWalletBalanceUnit} disabled={unitSwitching}>
-            <Text style={styles.walletPreferredUnitText}>
-              {unit === BitcoinUnit.LOCAL_CURRENCY ? (preferredFiatCurrency?.endPointKey ?? FiatUnit.USD) : unit}
-            </Text>
-          </TouchableOpacity>
-        </Animated.View>
-        {(wallet.type === LightningCustodianWallet.type || wallet.type === LightningArkWallet.type) && allowOnchainAddress && (
-          <ToolTipMenu
-            shouldOpenOnLongPress
-            isButton
-            onPressMenuItem={handleManageFundsPressed}
-            actions={toolTipActions}
-            buttonStyle={styles.manageFundsButton}
-          >
-            <Text style={styles.manageFundsButtonText}>{loc.lnd.title}</Text>
-          </ToolTipMenu>
-        )}
+          )}
+        </View>
         {wallet.type === MultisigHDWallet.type && (
           <TouchableOpacity style={styles.manageFundsButton} accessibilityRole="button" onPress={() => handleManageFundsPressed()}>
             <Text style={styles.manageFundsButtonText}>{loc.multisig.manage_keys}</Text>
@@ -268,6 +277,10 @@ const styles = StyleSheet.create({
   contentContainer: {
     padding: 15,
   },
+  balanceSection: {
+    flexDirection: 'column',
+    alignItems: 'flex-start',
+  },
   walletLabel: {
     backgroundColor: 'transparent',
     fontSize: 19,
@@ -288,6 +301,10 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  manageFundsSection: {
+    width: '100%',
+    alignItems: 'flex-start',
+  },
   manageFundsButtonText: {
     fontWeight: '500',
     fontSize: 14,
diff --git a/screen/wallets/WalletTransactions.tsx b/screen/wallets/WalletTransactions.tsx
index 254796708..991143936 100644
--- a/screen/wallets/WalletTransactions.tsx
+++ b/screen/wallets/WalletTransactions.tsx
@@ -104,7 +104,7 @@ const WalletTransactions: React.FC<WalletTransactionsProps> = ({ route }: { rout
       backgroundColor: colors.background,
     },
     gradientBackground: {
-      backgroundColor: headerHeight > 0 ? WalletGradient.headerColorFor(wallet.type) : colors.background,
+      backgroundColor: WalletGradient.headerColorFor(wallet.type),
       height: headerHeight > 0 ? headerHeight : '30%',
     },
     activityIndicatorStyle: {