diff --git a/components/Icons.tsx b/components/Icons.tsx
index 67f34a2..e26c711 100644
--- a/components/Icons.tsx
+++ b/components/Icons.tsx
@@ -16,7 +16,7 @@ import {
   PopiconsClipboardTextSolid as PasteIcon,
   PopiconsReloadLine as RefreshIcon,
   PopiconsReloadSolid as ResetIcon,
-  PopiconsSettingsMinimalLine as SettingsIcon,
+  PopiconsSettingsMinimalSolid as SettingsIcon,
   PopiconsShareSolid as ShareIcon,
   PopiconsLogoutSolid as SignOutIcon,
   PopiconsLoopSolid as SwapIcon,
diff --git a/lib/state/appStore.ts b/lib/state/appStore.ts
index a5fa0db..e56455a 100644
--- a/lib/state/appStore.ts
+++ b/lib/state/appStore.ts
@@ -16,9 +16,10 @@ interface AppState {
   setUnlocked: (unlocked: boolean) => void;
   setTheme: (theme: Theme) => void;
   setOnboarded: (isOnboarded: boolean) => void;
+  getNWCClient: (walletId: number) => NWCClient | undefined;
   setNWCClient: (nwcClient: NWCClient | undefined) => void;
-  updateCurrentWallet(wallet: Partial<Wallet>): void;
-  removeCurrentWallet(): void;
+  updateWallet(wallet: Partial<Wallet>, walletId?: number): void;
+  removeWallet(walletId?: number): void;
   setFiatCurrency(fiatCurrency: string): void;
   setSelectedWalletId(walletId: number): void;
   setSecurityEnabled(securityEnabled: boolean): void;
@@ -89,25 +90,22 @@ function loadAddressBookEntries(): AddressBookEntry[] {
 }
 
 export const useAppStore = create<AppState>()((set, get) => {
-  const updateCurrentWallet = (walletUpdate: Partial<Wallet>) => {
-    const selectedWalletId = get().selectedWalletId;
+  const updateWallet = (walletUpdate: Partial<Wallet>, walletId?: number) => {
+    walletId = walletId ?? get().selectedWalletId;
     const wallets = [...get().wallets];
 
     const wallet: Wallet = {
-      ...(wallets[selectedWalletId] || {}),
+      ...(wallets[walletId] || {}),
       ...walletUpdate,
     };
-    secureStorage.setItem(
-      getWalletKey(selectedWalletId),
-      JSON.stringify(wallet),
-    );
-    wallets[selectedWalletId] = wallet;
+    secureStorage.setItem(getWalletKey(walletId), JSON.stringify(wallet));
+    wallets[walletId] = wallet;
     set({
       wallets,
     });
   };
 
-  const removeCurrentWallet = () => {
+  const removeWallet = (walletId?: number) => {
     const wallets = [...get().wallets];
     if (wallets.length <= 1) {
       // set to initial wallet status
@@ -123,9 +121,10 @@ export const useAppStore = create<AppState>()((set, get) => {
       return;
     }
     const selectedWalletId = get().selectedWalletId;
+    walletId = walletId ?? selectedWalletId;
 
     // move existing wallets down one
-    for (let i = selectedWalletId; i < wallets.length - 1; i++) {
+    for (let i = walletId; i < wallets.length - 1; i++) {
       const nextWallet = secureStorage.getItem(getWalletKey(i + 1));
       if (!nextWallet) {
         throw new Error("Next wallet not found");
@@ -135,9 +134,14 @@ export const useAppStore = create<AppState>()((set, get) => {
 
     secureStorage.removeItem(getWalletKey(wallets.length - 1));
 
-    get().setSelectedWalletId(0);
+    if (walletId === selectedWalletId) {
+      get().setSelectedWalletId(0);
+    } else if (walletId < selectedWalletId) {
+      get().setSelectedWalletId(selectedWalletId - 1);
+    }
+
     set({
-      wallets: wallets.filter((_, i) => i !== selectedWalletId),
+      wallets: wallets.filter((_, i) => i !== walletId),
     });
   };
 
@@ -181,9 +185,10 @@ export const useAppStore = create<AppState>()((set, get) => {
     theme,
     isOnboarded: secureStorage.getItem(hasOnboardedKey) === "true",
     selectedWalletId: initialSelectedWalletId,
-    updateCurrentWallet,
-    removeCurrentWallet,
+    updateWallet,
+    removeWallet,
     removeAddressBookEntry,
+    getNWCClient,
     setUnlocked: (unlocked) => {
       set({ unlocked });
     },
diff --git a/pages/Home.tsx b/pages/Home.tsx
index ca4366c..b81d322 100644
--- a/pages/Home.tsx
+++ b/pages/Home.tsx
@@ -71,7 +71,7 @@ export function Home() {
         right={() => (
           <Link href="/settings" asChild>
             <TouchableOpacity>
-              <SettingsIcon className="text-foreground" />
+              <SettingsIcon className="text-muted-foreground" />
             </TouchableOpacity>
           </Link>
         )}
@@ -93,7 +93,7 @@ export function Home() {
               onPress={switchBalanceState}
               className="w-full flex flex-col items-center justify-center gap-4"
             >
-              {wallets.length && (
+              {wallets.length > 1 && (
                 <TouchableOpacity
                   onPress={() => {
                     router.push("/settings/wallets");
@@ -149,7 +149,7 @@ export function Home() {
           </View>
         </ScrollView>
         <View className="flex items-center justify-center">
-          <Link href="/transactions" asChild>
+          <Link href="/transactions">
             <ChevronUpIcon
               className="text-muted-foreground"
               width={32}
diff --git a/pages/settings/Wallets.tsx b/pages/settings/Wallets.tsx
index 24e806d..524b968 100644
--- a/pages/settings/Wallets.tsx
+++ b/pages/settings/Wallets.tsx
@@ -52,21 +52,19 @@ export function Wallets() {
                     {item.item.name || DEFAULT_WALLET_NAME}
                   </Text>
                 </View>
-                {active && (
-                  <Link
-                    href={`/settings/wallets/${selectedWalletId}`}
-                    className="absolute right-4"
-                    asChild
-                  >
-                    <TouchableOpacity>
-                      <SettingsIcon
-                        className="text-foreground"
-                        width={18}
-                        height={18}
-                      />
-                    </TouchableOpacity>
-                  </Link>
-                )}
+                <Link
+                  href={`/settings/wallets/${item.index}`}
+                  className="absolute right-4"
+                  asChild
+                >
+                  <TouchableOpacity>
+                    <SettingsIcon
+                      className="text-muted-foreground"
+                      width={18}
+                      height={18}
+                    />
+                  </TouchableOpacity>
+                </Link>
               </TouchableOpacity>
             );
           }}
diff --git a/pages/settings/wallets/EditWallet.tsx b/pages/settings/wallets/EditWallet.tsx
index c725f0b..999cc3e 100644
--- a/pages/settings/wallets/EditWallet.tsx
+++ b/pages/settings/wallets/EditWallet.tsx
@@ -1,8 +1,7 @@
-import { Link, router } from "expo-router";
+import * as Clipboard from "expo-clipboard";
+import { Link, router, useLocalSearchParams } from "expo-router";
 import { Pressable, Alert as RNAlert, View } from "react-native";
 import Toast from "react-native-toast-message";
-
-import * as Clipboard from "expo-clipboard";
 import Alert from "~/components/Alert";
 import {
   ExportIcon,
@@ -22,29 +21,30 @@ import { DEFAULT_WALLET_NAME, REQUIRED_CAPABILITIES } from "~/lib/constants";
 import { useAppStore } from "~/lib/state/appStore";
 
 export function EditWallet() {
-  const selectedWalletId = useAppStore((store) => store.selectedWalletId);
+  const { id } = useLocalSearchParams() as { id: string };
   const wallets = useAppStore((store) => store.wallets);
+
+  let walletId = parseInt(id);
+
   return (
     <View className="flex-1 flex flex-col p-4 gap-4">
       <Screen title="Edit Wallet" />
       {/* TODO: Do not allow notifications to be toggled without notifications capability */}
       {!REQUIRED_CAPABILITIES.every((capability) =>
-        (wallets[selectedWalletId].nwcCapabilities || []).includes(capability),
+        (wallets[walletId]?.nwcCapabilities || []).includes(capability),
       ) && (
         <Alert
           type="warn"
           title="This wallet might not work as expected"
           description={`Missing capabilities: ${REQUIRED_CAPABILITIES.filter(
             (capability) =>
-              !(wallets[selectedWalletId].nwcCapabilities || []).includes(
-                capability,
-              ),
+              !(wallets[walletId]?.nwcCapabilities || []).includes(capability),
           ).join(", ")}`}
           icon={TriangleAlertIcon}
           className="mb-0"
         />
       )}
-      <Link href={`/settings/wallets/${selectedWalletId}/name`} asChild>
+      <Link href={`/settings/wallets/${walletId}/name`} asChild>
         <Pressable>
           <Card className="w-full">
             <CardContent className="flex flex-row items-center gap-4">
@@ -52,17 +52,14 @@ export function EditWallet() {
               <View className="flex flex-1 flex-col">
                 <CardTitle>Wallet Name</CardTitle>
                 <CardDescription>
-                  {wallets[selectedWalletId].name || DEFAULT_WALLET_NAME}
+                  {wallets[walletId]?.name || DEFAULT_WALLET_NAME}
                 </CardDescription>
               </View>
             </CardContent>
           </Card>
         </Pressable>
       </Link>
-      <Link
-        href={`/settings/wallets/${selectedWalletId}/lightning-address`}
-        asChild
-      >
+      <Link href={`/settings/wallets/${walletId}/lightning-address`} asChild>
         <Pressable>
           <Card className="w-full">
             <CardContent className="flex flex-row items-center gap-4">
@@ -134,7 +131,7 @@ export function EditWallet() {
               {
                 text: "Confirm",
                 onPress: () => {
-                  useAppStore.getState().removeCurrentWallet();
+                  useAppStore.getState().removeWallet(walletId);
                   if (wallets.length !== 1) {
                     router.back();
                   }
diff --git a/pages/settings/wallets/LightningAddress.tsx b/pages/settings/wallets/LightningAddress.tsx
index 360e57a..3832af2 100644
--- a/pages/settings/wallets/LightningAddress.tsx
+++ b/pages/settings/wallets/LightningAddress.tsx
@@ -1,5 +1,5 @@
 import { LightningAddress } from "@getalby/lightning-tools";
-import { router } from "expo-router";
+import { router, useLocalSearchParams } from "expo-router";
 import React from "react";
 import { View } from "react-native";
 import Toast from "react-native-toast-message";
@@ -13,19 +13,20 @@ import { errorToast } from "~/lib/errorToast";
 import { useAppStore } from "~/lib/state/appStore";
 
 export function SetLightningAddress() {
-  const selectedWalletId = useAppStore((store) => store.selectedWalletId);
+  const { id } = useLocalSearchParams() as { id: string };
+  const walletId = parseInt(id);
   const wallets = useAppStore((store) => store.wallets);
   const [lightningAddress, setLightningAddress] = React.useState("");
   React.useEffect(() => {
-    setLightningAddress(wallets[selectedWalletId].lightningAddress || "");
-  }, [wallets, selectedWalletId]);
+    setLightningAddress(wallets[walletId].lightningAddress || "");
+  }, [wallets, walletId]);
   const [isLoading, setLoading] = React.useState(false);
 
   const updateLightningAddress = async () => {
     setLoading(true);
     try {
       if (lightningAddress) {
-        const nwcClient = useAppStore.getState().nwcClient;
+        const nwcClient = useAppStore.getState().getNWCClient(walletId);
         if (!nwcClient) {
           throw new Error("NWC client not connected");
         }
@@ -53,7 +54,7 @@ export function SetLightningAddress() {
         }
       }
 
-      useAppStore.getState().updateCurrentWallet({ lightningAddress });
+      useAppStore.getState().updateWallet({ lightningAddress }, walletId);
       Toast.show({
         type: "success",
         text1: "Lightning address updated",
diff --git a/pages/settings/wallets/RenameWallet.tsx b/pages/settings/wallets/RenameWallet.tsx
index 10abd27..663a106 100644
--- a/pages/settings/wallets/RenameWallet.tsx
+++ b/pages/settings/wallets/RenameWallet.tsx
@@ -1,4 +1,4 @@
-import { router } from "expo-router";
+import { router, useLocalSearchParams } from "expo-router";
 import React from "react";
 import { View } from "react-native";
 import Toast from "react-native-toast-message";
@@ -11,10 +11,11 @@ import { DEFAULT_WALLET_NAME } from "~/lib/constants";
 import { useAppStore } from "~/lib/state/appStore";
 
 export function RenameWallet() {
-  const selectedWalletId = useAppStore((store) => store.selectedWalletId);
+  const { id } = useLocalSearchParams() as { id: string };
+  const walletId = parseInt(id);
   const wallets = useAppStore((store) => store.wallets);
   const [walletName, setWalletName] = React.useState(
-    wallets[selectedWalletId].name || "",
+    wallets[walletId].name || "",
   );
   return (
     <DismissableKeyboardView>
@@ -35,9 +36,12 @@ export function RenameWallet() {
         <Button
           size="lg"
           onPress={() => {
-            useAppStore.getState().updateCurrentWallet({
-              name: walletName,
-            });
+            useAppStore.getState().updateWallet(
+              {
+                name: walletName,
+              },
+              walletId,
+            );
             Toast.show({
               type: "success",
               text1: "Wallet name updated",