diff --git a/.gitignore b/.gitignore
index 93d23f6..0eea59b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ test-ledger/
 # General cache directories
 **/Cache/
 **/cache/
+x1-app icons
\ No newline at end of file
diff --git a/android/App.js b/android/App.js
index 95c5132..073a6a0 100644
--- a/android/App.js
+++ b/android/App.js
@@ -38,6 +38,7 @@ import {
   Animated,
   Switch,
   BackHandler,
+  ActivityIndicator,
 } from "react-native";
 import NetInfo from "@react-native-community/netinfo";
 import {
@@ -58,6 +59,7 @@ import bs58 from "bs58";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import {
   SafeAreaProvider,
+  SafeAreaView as SafeAreaViewContext,
   useSafeAreaInsets,
 } from "react-native-safe-area-context";
 import { LinearGradient } from "expo-linear-gradient";
@@ -3448,15 +3450,15 @@ function AppContent() {
   // Show loading screen
   if (authState === "loading" || (authState === "unlocked" && !walletsLoaded)) {
     return (
-      <View
-        style={{
-          flex: 1,
-          backgroundColor: easterEggMode ? "#111827" : "#000",
-          justifyContent: "center",
-          alignments: "center",
-        }}
-      >
-        <Text style={{ color: "#FFFFFF", fontSize: 18 }}>Loading...</Text>
+      <View style={styles.loadingContainer}>
+        <Image
+          source={require("./assets/bg.png")}
+          style={styles.loadingBackground}
+          resizeMode="cover"
+        />
+        <View style={styles.loadingOverlay}>
+          <ActivityIndicator size="large" color="#4A90E2" />
+        </View>
       </View>
     );
   }
@@ -4011,7 +4013,7 @@ function AppContent() {
           ref={networkSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             {/* Header */}
             <View style={styles.bottomSheetHeader}>
               <TouchableOpacity
@@ -4144,7 +4146,7 @@ function AppContent() {
         >
           <ScrollView
             testID="wallet-list-sheet"
-            contentContainerStyle={styles.bottomSheetScrollContent}
+            contentContainerStyle={[styles.bottomSheetScrollContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}
             showsVerticalScrollIndicator={false}
           >
             {/* Header */}
@@ -4246,7 +4248,7 @@ function AppContent() {
           ref={accountSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             {/* Header */}
             <View style={styles.bottomSheetHeader}>
               <TouchableOpacity
@@ -4341,7 +4343,7 @@ function AppContent() {
           ref={receiveSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             {/* Header */}
             <View style={styles.bottomSheetHeader}>
               <Text style={styles.bottomSheetTitle}>
@@ -4401,7 +4403,7 @@ function AppContent() {
           ref={sendSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             {/* Header */}
             <View style={styles.bottomSheetHeader}>
               <TouchableOpacity onPress={() => sendSheetRef.current?.dismiss()}>
@@ -4486,7 +4488,7 @@ function AppContent() {
           ref={addressSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             {/* Header */}
             <View style={styles.bottomSheetHeader}>
               <Text style={styles.bottomSheetTitle}>Select Address</Text>
@@ -4533,7 +4535,11 @@ function AppContent() {
         >
           {/* Activity List with BottomSheetScrollView */}
           <ScrollView
-            contentContainerStyle={styles.sheetScrollContent}
+            contentContainerStyle={
+              transactions.length === 0
+                ? styles.emptyStateScrollContent
+                : styles.sheetScrollContent
+            }
             showsVerticalScrollIndicator={false}
           >
             {/* Header */}
@@ -4551,12 +4557,15 @@ function AppContent() {
 
             {/* Transactions List */}
             {transactions.length === 0 ? (
-              <View style={styles.emptyStateContainer}>
-                <Text style={styles.emptyStateText}>No transactions yet</Text>
-                <Text style={styles.emptyStateSubtext}>
-                  Your transaction history will appear here
-                </Text>
-              </View>
+              <>
+                <View style={styles.emptyStateSpacer} />
+                <View style={styles.emptyStateContainer}>
+                  <Text style={styles.emptyStateText}>No transactions yet</Text>
+                  <Text style={styles.emptyStateSubtext}>
+                    Your transaction history will appear here
+                  </Text>
+                </View>
+              </>
             ) : (
               transactions.map((tx) => (
                 <TouchableOpacity
@@ -4628,7 +4637,7 @@ function AppContent() {
             onPress={() => setShowAddWalletModal(false)}
           >
             <Pressable
-              style={styles.settingsDrawerContent}
+              style={[styles.settingsDrawerContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}
               onPress={(e) => e.stopPropagation()}
             >
               <View style={styles.settingsDrawerContentArea}>
@@ -4675,7 +4684,7 @@ function AppContent() {
             onPress={() => setShowCreateWalletModal(false)}
           >
             <Pressable
-              style={styles.settingsDrawerContent}
+              style={[styles.settingsDrawerContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}
               onPress={(e) => e.stopPropagation()}
             >
               <View style={styles.settingsDrawerContentArea}>
@@ -4741,7 +4750,7 @@ function AppContent() {
             onPress={() => setShowImportWalletModal(false)}
           >
             <Pressable
-              style={styles.settingsDrawerContent}
+              style={[styles.settingsDrawerContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}
               onPress={(e) => e.stopPropagation()}
             >
               <View style={styles.settingsDrawerContentArea}>
@@ -4987,14 +4996,18 @@ function AppContent() {
           <Pressable
             style={styles.settingsDrawerOverlay}
             onPress={() => {
-              console.log("OVERLAY PRESSED - Closing all modals");
+              console.log("OVERLAY PRESSED - Cancelling changes");
+              // Reset to original name
+              if (editingWallet) {
+                setEditWalletName(editingWallet.name);
+              }
               setShowChangeNameModal(false);
               editWalletSheetRef.current?.dismiss();
               setEditingWallet(null);
             }}
           >
             <Pressable
-              style={styles.settingsDrawerContent}
+              style={[styles.settingsDrawerContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}
               onPress={(e) => e.stopPropagation()}
             >
               <View style={styles.settingsDrawerContentArea}>
@@ -5002,8 +5015,12 @@ function AppContent() {
                   <TouchableOpacity
                     onPress={() => {
                       console.log(
-                        "BACK BUTTON PRESSED (<) - Closing all modals"
+                        "BACK BUTTON PRESSED (<) - Cancelling changes"
                       );
+                      // Reset to original name
+                      if (editingWallet) {
+                        setEditWalletName(editingWallet.name);
+                      }
                       setShowChangeNameModal(false);
                       editWalletSheetRef.current?.dismiss();
                       setEditingWallet(null);
@@ -5014,7 +5031,11 @@ function AppContent() {
                   <Text style={styles.settingsDrawerTitle}>Change Name</Text>
                   <TouchableOpacity
                     onPress={() => {
-                      console.log("X BUTTON PRESSED - Closing all modals");
+                      console.log("X BUTTON PRESSED - Cancelling changes");
+                      // Reset to original name
+                      if (editingWallet) {
+                        setEditWalletName(editingWallet.name);
+                      }
                       setShowChangeNameModal(false);
                       editWalletSheetRef.current?.dismiss();
                       setEditingWallet(null);
@@ -5033,52 +5054,62 @@ function AppContent() {
                   value={editWalletName}
                   onChangeText={(text) => {
                     setEditWalletName(text);
-                    if (editingWallet && text.trim()) {
-                      const updatedWallets = wallets.map((w) =>
-                        w.id === editingWallet.id
-                          ? { ...w, name: text.trim() }
-                          : w
-                      );
-                      setWallets(updatedWallets);
-                      saveWalletsToStorage(updatedWallets);
-                    }
                   }}
                   autoCorrect={false}
                 />
 
-                <TouchableOpacity
-                  style={{ paddingVertical: 16, paddingHorizontal: 20 }}
-                  onPress={() => {
-                    console.log("SAVE BUTTON PRESSED");
-                    console.log("editingWallet:", editingWallet);
-                    console.log("editWalletName:", editWalletName);
-                    if (editingWallet && editWalletName.trim()) {
-                      console.log("Saving wallet name:", editWalletName.trim());
-                      const updatedWallets = wallets.map((w) =>
-                        w.id === editingWallet.id
-                          ? { ...w, name: editWalletName.trim() }
-                          : w
-                      );
-                      setWallets(updatedWallets);
-                      saveWalletsToStorage(updatedWallets);
-                      console.log("Closing both modals");
+                <View style={styles.changeNameButtonContainer}>
+                  <TouchableOpacity
+                    style={styles.changeNameCancelButton}
+                    onPress={() => {
+                      console.log("CANCEL BUTTON PRESSED - Discarding changes");
+                      // Reset to original name
+                      if (editingWallet) {
+                        setEditWalletName(editingWallet.name);
+                      }
                       setShowChangeNameModal(false);
                       editWalletSheetRef.current?.dismiss();
                       setEditingWallet(null);
-                    } else {
-                      console.log("Not saving - wallet or name is empty");
-                    }
-                  }}
-                >
-                  <Text
+                    }}
+                  >
+                    <Text style={styles.changeNameCancelButtonText}>
+                      Cancel
+                    </Text>
+                  </TouchableOpacity>
+
+                  <TouchableOpacity
                     style={[
-                      styles.settingsDrawerTitle,
-                      { fontSize: 18, fontWeight: "600" },
+                      styles.changeNameConfirmButton,
+                      !editWalletName.trim() && styles.changeNameConfirmButtonDisabled,
                     ]}
+                    onPress={() => {
+                      console.log("CONFIRM BUTTON PRESSED");
+                      console.log("editingWallet:", editingWallet);
+                      console.log("editWalletName:", editWalletName);
+                      if (editingWallet && editWalletName.trim()) {
+                        console.log("Saving wallet name:", editWalletName.trim());
+                        const updatedWallets = wallets.map((w) =>
+                          w.id === editingWallet.id
+                            ? { ...w, name: editWalletName.trim() }
+                            : w
+                        );
+                        setWallets(updatedWallets);
+                        saveWalletsToStorage(updatedWallets);
+                        console.log("Closing both modals");
+                        setShowChangeNameModal(false);
+                        editWalletSheetRef.current?.dismiss();
+                        setEditingWallet(null);
+                      } else {
+                        console.log("Not saving - wallet or name is empty");
+                      }
+                    }}
+                    disabled={!editWalletName.trim()}
                   >
-                    Save
-                  </Text>
-                </TouchableOpacity>
+                    <Text style={styles.changeNameConfirmButtonText}>
+                      Confirm
+                    </Text>
+                  </TouchableOpacity>
+                </View>
               </View>
             </Pressable>
           </Pressable>
@@ -5089,7 +5120,7 @@ function AppContent() {
           ref={privateKeySheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             <View style={styles.bottomSheetHeader}>
               <View style={{ width: 32 }} />
               <Text style={styles.bottomSheetTitle}>Private Key</Text>
@@ -5142,7 +5173,7 @@ function AppContent() {
           ref={seedPhraseSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             <View style={styles.bottomSheetHeader}>
               <View style={{ width: 32 }} />
               <Text style={styles.bottomSheetTitle}>Seed Phrase</Text>
@@ -5210,8 +5241,8 @@ function AppContent() {
           ref={ledgerSheetRef}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
-            <View style={styles.bottomSheetHeader}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
+            <View style={[styles.bottomSheetHeader, { paddingTop: Math.max(insets.top, 8) }]}>
               <View style={{ width: 32 }} />
               <Text style={styles.bottomSheetTitle}>Connect Ledger</Text>
               <TouchableOpacity
@@ -5326,7 +5357,7 @@ function AppContent() {
           snapPoints={["45%"]}
           backgroundColor={easterEggMode ? "#111827" : "#000"}
         >
-          <View style={styles.bottomSheetContent}>
+          <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
             <View style={styles.bottomSheetHeader}>
               <View style={{ width: 32 }} />
               <Text style={styles.bottomSheetTitle}>Confirm Transaction</Text>
@@ -5476,7 +5507,10 @@ function AppContent() {
         </SimpleActionSheet>
 
         {/* Browser BottomSheet */}
-        <SimpleActionSheet ref={browserSheetRef}>
+        <SimpleActionSheet
+          ref={browserSheetRef}
+          backgroundColor={easterEggMode ? "#111827" : "#000"}
+        >
           <View style={{ flex: 1 }}>
             <View style={styles.sheetHeader}>
               <Text style={styles.sheetTitle}>Browser</Text>
@@ -5674,8 +5708,12 @@ function AppContent() {
           visible={showQRScanner}
           animationType="slide"
           onRequestClose={() => setShowQRScanner(false)}
+          statusBarTranslucent
         >
-          <View style={styles.qrScannerContainer}>
+          <SafeAreaViewContext 
+            style={styles.qrScannerContainer}
+            edges={['top']}
+          >
             <CameraView
               onBarcodeScanned={handleQRCodeScanned}
               barcodeScannerSettings={{
@@ -5688,10 +5726,12 @@ function AppContent() {
             <View style={styles.qrOverlayContainer}>
               {/* Top overlay */}
               <View style={styles.qrOverlayTop}>
-                <Text style={styles.qrScannerTitle}>Scan QR Code</Text>
-                <Text style={styles.qrScannerSubtitle}>
-                  Align QR code within the frame
-                </Text>
+                <View style={styles.qrScannerTopContent}>
+                  <Text style={styles.qrScannerTitle}>Scan QR Code</Text>
+                  <Text style={styles.qrScannerSubtitle}>
+                    Align QR code within the frame
+                  </Text>
+                </View>
               </View>
 
               {/* Middle section with scanning frame */}
@@ -5717,7 +5757,7 @@ function AppContent() {
                 </TouchableOpacity>
               </View>
             </View>
-          </View>
+          </SafeAreaViewContext>
         </Modal>
       )}
 
@@ -6166,7 +6206,7 @@ function AppContent() {
                   settingsNavigationStack.length - 1
                 ] === "exportSeed" ? (
                 // Export Seed Phrase Screen
-                <View style={styles.bottomSheetContent}>
+                <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
                   {masterSeedPhrase ? (
                     <>
                       <Text style={styles.seedPhraseTitle}>
@@ -6203,7 +6243,7 @@ function AppContent() {
                 </View>
               ) : (
                 // Change Seed Phrase Screen
-                <View style={styles.bottomSheetContent}>
+                <View style={[styles.bottomSheetContent, { backgroundColor: easterEggMode ? "#111827" : "#000" }]}>
                   {/* Mode Selector */}
                   <View
                     style={{
@@ -6595,22 +6635,35 @@ const styles = StyleSheet.create({
     fontSize: 13,
     fontWeight: "500",
   },
+  emptyStateScrollContent: {
+    flexGrow: 1,
+    paddingHorizontal: 16,
+    paddingBottom: 16,
+    paddingTop: 0,
+  },
+  emptyStateSpacer: {
+    height: 40,
+  },
   emptyStateContainer: {
     flex: 1,
     justifyContent: "center",
     alignItems: "center",
-    paddingVertical: 60,
+    paddingBottom: 40,
+    paddingHorizontal: 32,
   },
   emptyStateText: {
     color: "#FFFFFF",
     fontSize: 16,
     fontWeight: "600",
     marginBottom: 8,
+    textAlign: "center",
+    width: "100%",
   },
   emptyStateSubtext: {
     color: "#999999",
     fontSize: 14,
     textAlign: "center",
+    width: "100%",
   },
   badge: {
     width: 32,
@@ -7143,19 +7196,18 @@ const styles = StyleSheet.create({
   bottomSheetContent: {
     flex: 1,
     paddingHorizontal: 20,
-    backgroundColor: "#000",
   },
   bottomSheetScrollContent: {
     paddingHorizontal: 20,
     paddingTop: 30,
     paddingBottom: 20,
-    backgroundColor: "#000",
   },
   bottomSheetHeader: {
     flexDirection: "row",
     justifyContent: "space-between",
     alignItems: "center",
     marginBottom: 20,
+    paddingTop: 8,
   },
   bottomSheetClose: {
     fontSize: 24,
@@ -7366,7 +7418,6 @@ const styles = StyleSheet.create({
   },
   settingsDrawerContent: {
     height: "95%",
-    backgroundColor: "#000",
     borderTopLeftRadius: 20,
     borderTopRightRadius: 20,
   },
@@ -7740,6 +7791,42 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: "#333333",
   },
+  changeNameButtonContainer: {
+    flexDirection: "row",
+    gap: 12,
+    marginTop: 24,
+    paddingHorizontal: 4,
+  },
+  changeNameCancelButton: {
+    flex: 1,
+    backgroundColor: "#1a1a1a",
+    borderRadius: 8,
+    paddingVertical: 14,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  changeNameCancelButtonText: {
+    color: "#FFFFFF",
+    fontSize: 16,
+    fontWeight: "600",
+  },
+  changeNameConfirmButton: {
+    flex: 1,
+    backgroundColor: "#4A90E2",
+    borderRadius: 8,
+    paddingVertical: 14,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  changeNameConfirmButtonDisabled: {
+    backgroundColor: "#333333",
+    opacity: 0.5,
+  },
+  changeNameConfirmButtonText: {
+    color: "#FFFFFF",
+    fontSize: 16,
+    fontWeight: "600",
+  },
   showPrivateKeyButton: {
     backgroundColor: "#333333",
     borderRadius: 8,
@@ -8096,6 +8183,13 @@ const styles = StyleSheet.create({
   qrOverlayTop: {
     flex: 1,
     backgroundColor: "rgba(0, 0, 0, 0.6)",
+    justifyContent: "flex-start",
+    alignItems: "center",
+    paddingTop: 60,
+  },
+  qrScannerTopContent: {
+    alignItems: "center",
+    paddingHorizontal: 20,
   },
   qrOverlayMiddle: {
     flexDirection: "row",
@@ -8122,6 +8216,7 @@ const styles = StyleSheet.create({
     fontWeight: "bold",
     color: "#FFFFFF",
     marginBottom: 10,
+    textAlign: "center",
   },
   qrScannerSubtitle: {
     fontSize: 14,
@@ -8180,6 +8275,25 @@ const styles = StyleSheet.create({
     borderRightWidth: 4,
     borderColor: "#888888",
   },
+  loadingContainer: {
+    flex: 1,
+    position: "relative",
+  },
+  loadingBackground: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    width: "100%",
+    height: "100%",
+  },
+  loadingOverlay: {
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center",
+    backgroundColor: "rgba(0, 0, 0, 0.3)",
+  },
 });
 
 // Export App with SafeAreaProvider and ApolloProvider wrappers
diff --git a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..4aea750
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index 7fae0cc..0000000
Binary files a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
index ac03dbf..bb6b0bc 100644
Binary files a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4aea750
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index afa0a4e..0000000
Binary files a/android/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..49a8886
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 78aaf45..0000000
Binary files a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
index e1173a9..e35de65 100644
Binary files a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..49a8886
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index c4f6e10..0000000
Binary files a/android/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..12a3fc3
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 7a0f085..0000000
Binary files a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
index ff086fd..2082425 100644
Binary files a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..12a3fc3
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 6c2d40b..0000000
Binary files a/android/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..1fd9e91
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 730e3fa..0000000
Binary files a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
index f7f1d06..98463c4 100644
Binary files a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1fd9e91
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 3452615..0000000
Binary files a/android/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..d296b5c
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index b11a322..0000000
Binary files a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
index 49a464e..a21eda4 100644
Binary files a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d296b5c
Binary files /dev/null and b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index b51fd15..0000000
Binary files a/android/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/assets/bg.png b/android/assets/bg.png
index df8463a..841dc7e 100644
Binary files a/android/assets/bg.png and b/android/assets/bg.png differ
diff --git a/android/components/SimpleActionSheet.js b/android/components/SimpleActionSheet.js
index f019195..bc17186 100644
--- a/android/components/SimpleActionSheet.js
+++ b/android/components/SimpleActionSheet.js
@@ -38,6 +38,12 @@ const SimpleActionSheet = forwardRef(
     const [visible, setVisible] = useState(false);
     const translateY = useRef(new Animated.Value(SCREEN_HEIGHT)).current;
     const opacity = useRef(new Animated.Value(0)).current;
+    
+    // Calculate backdrop color based on backgroundColor
+    // If it's easter egg mode (#111827), use a matching backdrop
+    const backdropColor = backgroundColor === "#111827" 
+      ? "rgba(17, 24, 39, 0.5)" 
+      : "rgba(0, 0, 0, 0.5)";
 
     const panResponder = useRef(
       PanResponder.create({
@@ -146,7 +152,7 @@ const SimpleActionSheet = forwardRef(
           {/* Backdrop */}
           <TouchableWithoutFeedback onPress={handleBackdropPress}>
             <Animated.View
-              style={[styles.backdrop, { opacity }]}
+              style={[styles.backdrop, { opacity, backgroundColor: backdropColor }]}
               pointerEvents="auto"
             />
           </TouchableWithoutFeedback>
@@ -162,6 +168,12 @@ const SimpleActionSheet = forwardRef(
                 borderTopRightRadius: cornerRadius,
                 paddingBottom: 20 + insets.bottom,
                 transform: [{ translateY }],
+                // Shadow/glow effect - more visible in both modes
+                shadowColor: backgroundColor === "#111827" ? "#888888" : "#AAAAAA",
+                shadowOffset: { width: 0, height: -4 },
+                shadowOpacity: backgroundColor === "#111827" ? 0.4 : 0.6,
+                shadowRadius: 16,
+                elevation: 20,
               },
             ]}
           >
@@ -185,7 +197,7 @@ const styles = StyleSheet.create({
   },
   backdrop: {
     ...StyleSheet.absoluteFillObject,
-    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    // backgroundColor will be set dynamically based on easter egg mode
   },
   sheet: {
     height: SCREEN_HEIGHT * 0.9,
diff --git a/android/package-lock.json b/android/package-lock.json
index 43d4105..fbb1b6c 100644
--- a/android/package-lock.json
+++ b/android/package-lock.json
@@ -77,7 +77,6 @@
       "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.14.0.tgz",
       "integrity": "sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@graphql-typed-document-node/core": "^3.1.1",
         "@wry/caches": "^1.0.0",
@@ -143,7 +142,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -3225,7 +3223,6 @@
       "integrity": "sha512-gXlD85hqDDC0C1e2on0pTJoV6pOL3ZJBRDbAzAqSa8Q6Y76tHWqsNTTBuipTjzr/9yFxqPp96p/i/P6lMMsvLg==",
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "canvaskit-wasm": "0.40.0",
         "react-reconciler": "0.31.0"
@@ -3483,7 +3480,6 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.17.tgz",
       "integrity": "sha512-Qec1E3mhALmaspIrhWt9jkQMNdw6bReVu64mjvhbhq2NFPftLPVr+l1SZgmw/66WwBNpDh7ao5AT6gF5v41PFA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -4319,7 +4315,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.19",
         "caniuse-lite": "^1.0.30001751",
@@ -5433,7 +5428,6 @@
       "resolved": "https://registry.npmjs.org/expo/-/expo-54.0.23.tgz",
       "integrity": "sha512-b4uQoiRwQ6nwqsT2709RS15CWYNGF3eJtyr1KyLw9WuMAK7u4jjofkhRiO0+3o1C2NbV+WooyYTOZGubQQMBaQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.20.0",
         "@expo/cli": "54.0.16",
@@ -5943,7 +5937,6 @@
       "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-14.0.9.tgz",
       "integrity": "sha512-xCoQbR/36qqB6tew/LQ6GWICpaBmHLhg/Loix5Rku/0ZtNaXMJv08M9o1AcrdiGTn/Xf/BnLu6DgS45cWQEHZg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fontfaceobserver": "^2.1.0"
       },
@@ -6429,7 +6422,6 @@
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
       "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -9448,7 +9440,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
       "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9486,7 +9477,6 @@
       "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.81.5.tgz",
       "integrity": "sha512-1w+/oSjEXZjMqsIvmkCRsOc8UBYv163bTWKTI8+1mxztvQPhCRYGTvZ/PL1w16xXHneIj/SLGfxWg2GWN2uexw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/create-cache-key-function": "^29.7.0",
         "@react-native/assets-registry": "0.81.5",
@@ -9568,7 +9558,6 @@
       "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.28.0.tgz",
       "integrity": "sha512-0msfJ1vRxXKVgTgvL+1ZOoYw3/0z1R+Ked0+udoJhyplC2jbVKIJ8Z1bzWdpQRCV3QcQ87Op0zJVE5DhKK2A0A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@egjs/hammerjs": "^2.0.17",
         "hoist-non-react-statics": "^3.3.0",
@@ -9681,7 +9670,6 @@
       "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-4.1.3.tgz",
       "integrity": "sha512-GP8wsi1u3nqvC1fMab/m8gfFwFyldawElCcUSBJQgfrXeLmsPPUOpDw44lbLeCpcwUuLa05WTVePdTEwCLTUZg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "react-native-is-edge-to-edge": "^1.2.1",
         "semver": "7.7.2"
@@ -9710,7 +9698,6 @@
       "resolved": "git+ssh://git@github.com/AppAndFlow/react-native-safe-area-context.git",
       "integrity": "sha512-4XGqMNj5qjUTYywJqpdWZ9IG8jgkS3h06sfVjfw5yZQZfWnRFXczi0GnYyFyCc2EBps/qFmoCH8fez//WumdVg==",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "*",
         "react-native": "*"
@@ -9735,7 +9722,6 @@
       "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-15.12.1.tgz",
       "integrity": "sha512-vCuZJDf8a5aNC2dlMovEv4Z0jjEUET53lm/iILFnFewa15b4atjVxU6Wirm6O9y6dEsdjDZVD7Q3QM4T1wlI8g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "css-select": "^5.1.0",
         "css-tree": "^1.1.3",
@@ -9761,7 +9747,6 @@
       "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.16.0.tgz",
       "integrity": "sha512-Nh13xKZWW35C0dbOskD7OX01nQQavOzHbCw9XoZmar4eXCo7AvrYJ0jlUfRVVIJzqINxHlpECYLdmAdFsl9xDA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "escape-string-regexp": "^4.0.0",
         "invariant": "2.2.4"
@@ -9776,7 +9761,6 @@
       "resolved": "https://registry.npmjs.org/react-native-worklets/-/react-native-worklets-0.5.1.tgz",
       "integrity": "sha512-lJG6Uk9YuojjEX/tQrCbcbmpdLCSFxDK1rJlkDhgqkVi1KZzG7cdcBFQRqyNOOzR9Y0CXNuldmtWTGOyM0k0+w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
         "@babel/plugin-transform-class-properties": "^7.0.0-0",
@@ -9907,7 +9891,6 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
       "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11232,7 +11215,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11681,7 +11663,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
       "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -11869,7 +11850,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/android/screens/ActivityScreen.js b/android/screens/ActivityScreen.js
index eb802d0..1daa58d 100644
--- a/android/screens/ActivityScreen.js
+++ b/android/screens/ActivityScreen.js
@@ -29,7 +29,11 @@ export default function ActivityScreen({
         </TouchableOpacity>
       </View>
 
-      <ScrollView style={styles.content} showsVerticalScrollIndicator={false}>
+      <ScrollView 
+        style={styles.content} 
+        contentContainerStyle={transactions.length === 0 ? styles.emptyStateScrollContent : undefined}
+        showsVerticalScrollIndicator={false}
+      >
         {transactions.length === 0 ? (
           <View style={styles.emptyStateContainer}>
             <Text style={styles.emptyStateText}>No transactions yet</Text>
@@ -128,7 +132,15 @@ const styles = StyleSheet.create({
   },
   content: {
     flex: 1,
-    padding: 16,
+  },
+  emptyStateScrollContent: {
+    flexGrow: 1,
+    paddingHorizontal: 16,
+    paddingBottom: 16,
+    paddingTop: 0,
+  },
+  emptyStateSpacer: {
+    height: 40,
   },
   activityCard: {
     backgroundColor: "#0a0a0a",
@@ -181,16 +193,21 @@ const styles = StyleSheet.create({
     flex: 1,
     justifyContent: "center",
     alignItems: "center",
-    paddingVertical: 60,
+    paddingBottom: 40,
+    paddingHorizontal: 32,
   },
   emptyStateText: {
     color: "#FFFFFF",
     fontSize: 16,
     fontWeight: "600",
     marginBottom: 8,
+    textAlign: "center",
+    width: "100%",
   },
   emptyStateSubtext: {
     color: "#999999",
     fontSize: 14,
+    textAlign: "center",
+    width: "100%",
   },
 });