diff --git a/mobile/src/navigation/AppNavigator.tsx b/mobile/src/navigation/AppNavigator.tsx
index 177d9507..1247c71b 100644
--- a/mobile/src/navigation/AppNavigator.tsx
+++ b/mobile/src/navigation/AppNavigator.tsx
@@ -5,6 +5,7 @@ import { NavigationContainer } from '@react-navigation/native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useAuth } from '../contexts/AuthContext'; // Import useAuth
 import { KurdistanColors } from '../theme/colors';
+import { SimpleHeader } from '../components/navigation/SharedHeader';
 
 // Screens
 import WelcomeScreen from '../screens/WelcomeScreen';
@@ -147,14 +148,18 @@ const AppNavigator: React.FC = () => {
               component={SettingsScreen}
               options={{
                 presentation: 'modal',
-                headerShown: false,
+                headerShown: true,
+                headerTitle: 'Settings',
+                header: (props) => <SimpleHeader {...props} />,
               }}
             />
             <Stack.Screen
               name="BeCitizenChoice"
               component={BeCitizenChoiceScreen}
               options={{
-                headerShown: false,
+                headerShown: true,
+                headerTitle: 'Citizenship',
+                header: (props) => <SimpleHeader {...props} />,
               }}
             />
             <Stack.Screen
@@ -179,149 +184,253 @@ const AppNavigator: React.FC = () => {
               name="EditProfile"
               component={EditProfileScreen}
               options={{
-                headerShown: false,
+                headerShown: true,
+                headerTitle: 'Edit Profile',
+                header: (props) => <SimpleHeader {...props} />,
               }}
             />
             <Stack.Screen
               name="Wallet"
               component={WalletScreen}
               options={{
-                headerShown: false,
+                headerShown: true,
+                headerTitle: 'Wallet',
+                header: (props) => <SimpleHeader {...props} />,
               }}
             />
             <Stack.Screen
               name="WalletSetup"
               component={WalletSetupScreen}
               options={{
-                headerShown: false,
+                headerShown: true,
+                headerTitle: 'Wallet Setup',
+                header: (props) => <SimpleHeader {...props} />,
               }}
             />
             <Stack.Screen
               name="Swap"
               component={SwapScreen}
               options={{
-                headerShown: false,
+                headerShown: true,
+                headerTitle: 'Swap',
+                header: (props) => <SimpleHeader {...props} />,
               }}
             />
             <Stack.Screen
               name="P2P"
               component={P2PScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'P2P Market',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Forum"
               component={ForumScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Forum',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="TaxZekat"
               component={TaxZekatScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Tax & Zekat',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Launchpad"
               component={LaunchpadScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Launchpad',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="President"
               component={PresidentScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Serok',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Vote"
               component={VoteScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Vote',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Validators"
               component={ValidatorsScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Validators',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Proposals"
               component={ProposalsScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Proposals',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Identity"
               component={IdentityScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Identity',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="KurdMedia"
               component={KurdMediaScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'KurdMedia',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Perwerde"
               component={PerwerdeScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Perwerde',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="B2B"
               component={B2BScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'B2B Marketplace',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Bank"
               component={BankScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Bank',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Assembly"
               component={AssemblyScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Assembly',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Justice"
               component={JusticeScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Justice',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Polls"
               component={PollsScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Polls',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="WhatsKURD"
               component={WhatsKURDScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'whatsKURD',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Events"
               component={EventsScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Events',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Help"
               component={HelpScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Help',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Music"
               component={MusicScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Music',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="VPN"
               component={VPNScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'VPN',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="University"
               component={UniversityScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'University',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Certificates"
               component={CertificatesScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Certificates',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
             <Stack.Screen
               name="Research"
               component={ResearchScreen}
-              options={{ headerShown: false }}
+              options={{
+                headerShown: true,
+                headerTitle: 'Research',
+                header: (props) => <SimpleHeader {...props} />,
+              }}
             />
           </>
         )}
diff --git a/mobile/src/screens/AppsScreen.tsx b/mobile/src/screens/AppsScreen.tsx
index 7f2e67cf..61991f32 100644
--- a/mobile/src/screens/AppsScreen.tsx
+++ b/mobile/src/screens/AppsScreen.tsx
@@ -72,7 +72,7 @@ const CATEGORIES: { name: CategoryType; icon: string }[] = [
 
 const AppsScreen: React.FC = () => {
   const navigation = useNavigation<any>();
-  const { selectedAccount, connectWallet } = usePezkuwi();
+  const { selectedAccount, accounts, connectWallet } = usePezkuwi();
   const isConnected = !!selectedAccount;
 
   const [searchQuery, setSearchQuery] = useState('');
@@ -94,12 +94,18 @@ const AppsScreen: React.FC = () => {
   });
 
   const handleConnectWallet = async () => {
+    // If no wallets exist, navigate to wallet setup first
+    if (accounts.length === 0) {
+      navigation.navigate('WalletSetup');
+      return;
+    }
+
     try {
       await connectWallet();
-      Alert.alert('Connected', 'Your wallet has been connected successfully!');
+      Alert.alert('Girêdayî / Connected', 'Cîzdanê te bi serkeftî girêdayî bû!\nYour wallet has been connected successfully!');
     } catch (error) {
       if (__DEV__) console.error('Wallet connection error:', error);
-      Alert.alert('Error', 'Failed to connect wallet. Please try again.');
+      Alert.alert('Çewtî / Error', 'Cîzdan nehat girêdan. Dîsa biceribîne.\nFailed to connect wallet. Please try again.');
     }
   };
 
diff --git a/mobile/src/screens/DashboardScreen.tsx b/mobile/src/screens/DashboardScreen.tsx
index 6279325c..c31fc069 100644
--- a/mobile/src/screens/DashboardScreen.tsx
+++ b/mobile/src/screens/DashboardScreen.tsx
@@ -84,7 +84,7 @@ interface DashboardScreenProps {}
 const DashboardScreen: React.FC<DashboardScreenProps> = () => {
   const navigation = useNavigation<NavigationProp<BottomTabParamList & RootStackParamList>>();
   const { user } = useAuth();
-  const { api, isApiReady, selectedAccount } = usePezkuwi();
+  const { api, isApiReady, selectedAccount, accounts, connectWallet } = usePezkuwi();
   const [profileData, setProfileData] = useState<any>(null);
   const [loading, setLoading] = useState(true);
   const [avatarModalVisible, setAvatarModalVisible] = useState(false);
@@ -167,6 +167,21 @@ const DashboardScreen: React.FC<DashboardScreenProps> = () => {
 
   // Check if user is a visitor (default when no blockchain wallet or no tikis)
   const isVisitor = !selectedAccount || tikis.length === 0;
+
+  // Handle wallet connection
+  const handleConnectWallet = async () => {
+    if (accounts.length === 0) {
+      navigation.navigate('WalletSetup');
+      return;
+    }
+    try {
+      await connectWallet();
+      Alert.alert('Girêdayî / Connected', 'Cîzdanê te bi serkeftî girêdayî bû!\nYour wallet has been connected successfully!');
+    } catch (error) {
+      if (__DEV__) console.error('Wallet connection error:', error);
+      Alert.alert('Çewtî / Error', 'Cîzdan nehat girêdan.\nFailed to connect wallet.');
+    }
+  };
   const primaryRole = tikis.length > 0 ? getPrimaryRole(tikis) : 'Visitor';
 
   const showComingSoon = (featureName: string) => {
@@ -463,10 +478,10 @@ const DashboardScreen: React.FC<DashboardScreenProps> = () => {
               {!selectedAccount && (
                 <TouchableOpacity
                   style={styles.connectWalletBadge}
-                  onPress={() => navigation.navigate('Wallet')}
+                  onPress={handleConnectWallet}
                 >
                   <Text style={styles.connectWalletIcon}>👛</Text>
-                  <Text style={styles.connectWalletText}>Connect</Text>
+                  <Text style={styles.connectWalletText}>Girêde</Text>
                 </TouchableOpacity>
               )}
             </View>