diff --git a/src/RootNavigation.tsx b/src/RootNavigation.tsx
index 5ec36f36a..2c7234c8d 100644
--- a/src/RootNavigation.tsx
+++ b/src/RootNavigation.tsx
@@ -78,6 +78,7 @@ export type ScreenProps<T extends keyof RootStackParamList> = StackScreenProps<
 
 export const RootNavigation: React.FC<{
   currentScreen: string
+  hasKeys: boolean
   rifWalletServicesSocket: IRifWalletServicesSocket
   keyManagementProps: CreateKeysProps
   balancesScreenProps: BalancesScreenProps
@@ -89,6 +90,7 @@ export const RootNavigation: React.FC<{
   dappsScreenProps: DappsScreenScreenProps
 }> = ({
   currentScreen,
+  hasKeys,
   keyManagementProps,
   balancesScreenProps,
   activityScreenProps,
@@ -100,8 +102,8 @@ export const RootNavigation: React.FC<{
 }) => {
   return (
     <View style={styles.parent}>
-      <AppHeader />
-      <RootStack.Navigator>
+      {hasKeys && <AppHeader />}
+      <RootStack.Navigator initialRouteName={hasKeys ? 'Home' : 'CreateKeysUX'}>
         <RootStack.Screen
           name="Home"
           component={Screens.HomeScreen}
@@ -127,7 +129,9 @@ export const RootNavigation: React.FC<{
           options={{ ...sharedOptions, headerShown: false }}
         />
 
-        <RootStack.Screen name="CreateKeysUX" options={sharedOptions}>
+        <RootStack.Screen
+          name="CreateKeysUX"
+          options={{ ...sharedOptions, headerShown: false }}>
           {props => <CreateKeysNavigation {...props} {...keyManagementProps} />}
         </RootStack.Screen>
         <RootStack.Screen
@@ -236,7 +240,7 @@ export const RootNavigation: React.FC<{
           )}
         </RootStack.Screen>
       </RootStack.Navigator>
-      <AppFooterMenu currentScreen={currentScreen} />
+      {hasKeys && <AppFooterMenu currentScreen={currentScreen} />}
     </View>
   )
 }
diff --git a/src/components/icons/MenuIcon.tsx b/src/components/icons/MenuIcon.tsx
new file mode 100644
index 000000000..adeede6dc
--- /dev/null
+++ b/src/components/icons/MenuIcon.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react'
+import Svg, { Line } from 'react-native-svg'
+import { SVGIconInterface } from '.'
+
+export const MenuIcon: React.FC<SVGIconInterface> = ({
+  width,
+  height,
+  color,
+}) => (
+  <Svg
+    width={width || '18.727'}
+    height={height || 18.735}
+    viewBox="0 0 18.727 18.735">
+    <Line
+      x1="0"
+      y1="0.5"
+      x2="17"
+      y2="0.5"
+      stroke={color || '#707070'}
+      strokeWidth="2"
+    />
+    <Line
+      x1="0"
+      y1="12.5"
+      x2="17"
+      y2="12.5"
+      stroke={color || '#707070'}
+      strokeWidth="2"
+    />
+    <Line
+      x1="0"
+      y1="6.5"
+      x2="17"
+      y2="6.5"
+      stroke={color || '#707070'}
+      strokeWidth="2"
+    />
+  </Svg>
+)
diff --git a/src/core/Core.tsx b/src/core/Core.tsx
index f999fbb16..e0798683a 100644
--- a/src/core/Core.tsx
+++ b/src/core/Core.tsx
@@ -154,10 +154,13 @@ export const Core = () => {
     })
   }, [])
 
+  if (state.loading) {
+    return <LoadingScreen reason="Getting things setup" />
+  }
+
   return (
     <SafeAreaView>
       <StatusBar />
-      {state.loading && <LoadingScreen reason="Please wait..." />}
       {!active && <Cover />}
       {state.hasKeys && !unlocked && <RequestPIN unlock={unlockApp} />}
       <AppContext.Provider
@@ -173,6 +176,7 @@ export const Core = () => {
               abiEnhancer={abiEnhancer}>
               <RootNavigation
                 currentScreen={currentScreen}
+                hasKeys={state.hasKeys}
                 rifWalletServicesSocket={rifWalletServicesSocket}
                 keyManagementProps={{
                   generateMnemonic: () => KeyManagementSystem.create().mnemonic,
diff --git a/src/ux/appHeader/MenuIcon.tsx b/src/ux/appHeader/MenuIcon.tsx
deleted file mode 100644
index ff1fd0f4a..000000000
--- a/src/ux/appHeader/MenuIcon.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import * as React from 'react'
-import Svg, { Line } from 'react-native-svg'
-
-export default () => (
-  <Svg width="18.727" height="18.735" viewBox="0 0 18.727 18.735">
-    <Line x1="0" y1="0.5" x2="17" y2="0.5" stroke="#707070" strokeWidth="2" />
-    <Line x1="0" y1="12.5" x2="17" y2="12.5" stroke="#707070" strokeWidth="2" />
-    <Line x1="0" y1="6.5" x2="17" y2="6.5" stroke="#707070" strokeWidth="2" />
-  </Svg>
-)
diff --git a/src/ux/appHeader/index.tsx b/src/ux/appHeader/index.tsx
index b18e56860..73daa6f2c 100644
--- a/src/ux/appHeader/index.tsx
+++ b/src/ux/appHeader/index.tsx
@@ -3,8 +3,8 @@ import React from 'react'
 import { View, StyleSheet, TouchableOpacity, Text } from 'react-native'
 import { AddressCopyComponent } from '../../components/copy/AddressCopyComponent'
 import { useSelectedWallet } from '../../Context'
-import MenuIcon from './MenuIcon'
 import { Network } from '@ethersproject/networks'
+import { MenuIcon } from '../../components/icons/MenuIcon'
 
 export const networks: Record<number, Network> = {
   30: {