diff --git a/src/RootNavigation.tsx b/src/RootNavigation.tsx
index 1a3df937f..4181b0af1 100644
--- a/src/RootNavigation.tsx
+++ b/src/RootNavigation.tsx
@@ -34,7 +34,7 @@ const InjectedScreens = {
   ActivityScreen: InjectSelectedWallet(Screens.ActivityScreen),
   ActivityDetailsScreen: InjectSelectedWallet(Screens.ActivityDetailsScreen),
   SignMessageScreen: InjectSelectedWallet(Screens.SignMessageScreen),
-  WalletInfoScreen: InjectSelectedWallet(Screens.WalletInfoScreen),
+  ManuallyDeployScreen: InjectSelectedWallet(Screens.ManuallyDeployScreen),
   KeysInfoScreen: InjectSelectedWallet(Screens.KeysInfoScreen),
   SignTypedDataScreen: InjectSelectedWallet(Screens.SignTypedDataScreen),
   WalletConnectNavigationScreen: InjectSelectedWallet(
@@ -68,7 +68,7 @@ type RootStackParamList = {
   SignMessage: undefined
   SignTypedData: undefined
   TransactionReceived: undefined
-  WalletInfo: undefined
+  ManuallyDeployScreen: undefined
   CreateKeysUX: undefined
   KeysInfo: undefined
   WalletConnect: undefined
@@ -263,8 +263,8 @@ export const RootNavigation: React.FC<{
           />
 
           <RootStack.Screen
-            name="WalletInfo"
-            component={InjectedScreens.WalletInfoScreen}
+            name="ManuallyDeployScreen"
+            component={InjectedScreens.ManuallyDeployScreen}
             options={sharedOptions}
           />
           <RootStack.Screen name="KeysInfo" options={sharedOptions}>
diff --git a/src/screens/devMenu/DevMenuScreen.tsx b/src/screens/devMenu/DevMenuScreen.tsx
index b63173bf4..3e88fb5a1 100644
--- a/src/screens/devMenu/DevMenuScreen.tsx
+++ b/src/screens/devMenu/DevMenuScreen.tsx
@@ -84,12 +84,6 @@ const WalletRow = ({
         />
       </View>
 
-      <View style={styles.subsection}>
-        <Button
-          title={t('Wallet info')}
-          onPress={() => navigation.navigate('WalletInfo')}
-        />
-      </View>
       <View style={styles.subsection}>
         <Button
           onPress={() => navigation.navigate('WalletConnect')}
diff --git a/src/screens/index.ts b/src/screens/index.ts
index 5fe013139..22c2a4c6c 100644
--- a/src/screens/index.ts
+++ b/src/screens/index.ts
@@ -8,7 +8,7 @@ export { ActivityDetailsScreen } from './activity/ActivityDetailsScreen'
 export { SignMessageScreen } from './signatures/SignMessageScreen'
 export { SignTypedDataScreen } from './signatures/SignTypedDataScreen'
 export { KeysInfoScreen } from './info/KeysInfoScreen'
-export { WalletInfoScreen } from './info/WalletInfoScreen'
+export { ManuallyDeployScreen } from './settings/ManuallyDeployScreen'
 export { TransactionReceivedScreen } from './TransactionReceivedScreen'
 export { WalletConnectNavigationScreen } from './walletConnect'
 export { ChangeLanguageScreen } from './settings/ChangeLanguageScreen'
diff --git a/src/screens/info/WalletInfoScreen.tsx b/src/screens/info/WalletInfoScreen.tsx
deleted file mode 100644
index 98da9728d..000000000
--- a/src/screens/info/WalletInfoScreen.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React, { useState } from 'react'
-import { ScrollView } from 'react-native-gesture-handler'
-import { Transaction, BigNumber } from 'ethers'
-import { Trans, useTranslation } from 'react-i18next'
-
-import { ERC20Token } from '../../lib/token/ERC20Token'
-
-import {
-  Address,
-  Button,
-  CopyComponent,
-  Header2,
-  Paragraph,
-} from '../../components'
-import { ScreenWithWallet } from '../types'
-import { DevSettings } from 'react-native'
-
-export const WalletInfoScreen: React.FC<ScreenWithWallet> = ({
-  wallet,
-  isWalletDeployed,
-}) => {
-  const [eoaBalance, setEoaBalance] = useState<null | BigNumber>(null)
-  const [isDeploying, setIsDeploying] = useState(false)
-
-  const [smartWalletDeployTx, setSmartWalletDeployTx] =
-    useState<null | Transaction>(null)
-
-  const [rifBalance, setRifBalance] = useState<null | BigNumber>(null)
-  const [sendRifTx, setSendRifTx] = useState<null | Transaction>(null)
-  const [sendRifResponse, setSendRifResponse] = useState<null | string>(null)
-  const { t } = useTranslation()
-
-  const rif = new ERC20Token(
-    '0x19f64674d8a5b4e652319f5e239efd3bc969a1fe',
-    wallet,
-    'RIF',
-    'null.jpg',
-  )
-
-  const getInfo = async () => {
-    Promise.all([
-      wallet.smartWallet.signer.getBalance().then(setEoaBalance),
-      rif.balance().then(setRifBalance),
-    ]).catch((err: Error) => {
-      console.log(err)
-    })
-  }
-
-  const deploy = async () => {
-    try {
-      setIsDeploying(true)
-      const txPromise = await wallet.smartWalletFactory.deploy()
-      setSmartWalletDeployTx(txPromise)
-
-      await txPromise.wait()
-
-      DevSettings.reload('Smart wallet deployed')
-    } catch (error) {
-      setIsDeploying(false)
-    }
-  }
-
-  const sendRif = async () => {
-    setSendRifResponse(null)
-    rif
-      .transfer(
-        '0x248b320687ebf655f9ee7f62f0388c79fbb7b2f4',
-        BigNumber.from('10000000000000000000'),
-      )
-      .then((tx: Transaction) => {
-        setSendRifTx(tx)
-        setSendRifResponse('Transaction sent.')
-      })
-      .catch((err: Error) =>
-        setSendRifResponse(`Transaction Err: ${err.message}`),
-      )
-  }
-
-  return (
-    <ScrollView>
-      <Header2>Smart Wallet</Header2>
-      <Paragraph>EOA:</Paragraph>
-      <Address>{wallet.address}</Address>
-      <Paragraph>Smart Wallet Address:</Paragraph>
-      <Address>{wallet.smartWalletAddress}</Address>
-
-      <Button title={t('Get info')} onPress={getInfo} />
-      <Paragraph>
-        <Trans>RBTC Balance (EOA)</Trans>: {eoaBalance && eoaBalance.toString()}
-      </Paragraph>
-
-      <Paragraph>
-        <Trans>Is Deployed?</Trans>: {isWalletDeployed.toString()}
-      </Paragraph>
-      {isDeploying && (
-        <Paragraph>
-          <Trans>Deploying</Trans>
-        </Paragraph>
-      )}
-      {!isWalletDeployed && (
-        <Button
-          title={t('Deploy')}
-          onPress={deploy}
-          disabled={isWalletDeployed || isDeploying}
-        />
-      )}
-      <Paragraph>
-        <Trans>RIF Token balance</Trans>: {rifBalance && rifBalance.toString()}
-      </Paragraph>
-      {smartWalletDeployTx && (
-        <>
-          <Paragraph>Deploy tx: {smartWalletDeployTx.hash}</Paragraph>
-        </>
-      )}
-      {isWalletDeployed && (
-        <>
-          <Button title={t('Send RIF back to faucet')} onPress={sendRif} />
-          {sendRifResponse && <Paragraph>{sendRifResponse}</Paragraph>}
-          {sendRifTx && (
-            <>
-              <Paragraph>
-                <Trans>Send RIF hash</Trans>:
-              </Paragraph>
-              <CopyComponent value={sendRifTx.hash || ''} />
-            </>
-          )}
-        </>
-      )}
-    </ScrollView>
-  )
-}
diff --git a/src/screens/settings/ManuallyDeployScreen.tsx b/src/screens/settings/ManuallyDeployScreen.tsx
new file mode 100644
index 000000000..e84c15f06
--- /dev/null
+++ b/src/screens/settings/ManuallyDeployScreen.tsx
@@ -0,0 +1,157 @@
+import React, { useEffect, useState } from 'react'
+import { ScrollView } from 'react-native-gesture-handler'
+import { Transaction, BigNumber } from 'ethers'
+import { ScreenWithWallet } from '../types'
+import { Linking, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
+import Clipboard from '@react-native-community/clipboard'
+import { colors, grid } from '../../styles'
+import SecondaryButton from '../../components/button/SecondaryButton'
+import { CopyIcon } from '../../components/icons'
+
+export const ManuallyDeployScreen: React.FC<ScreenWithWallet> = ({
+  wallet,
+  isWalletDeployed,
+}) => {
+  const [eoaBalance, setEoaBalance] = useState<BigNumber>(BigNumber.from(0))
+  const [isDeploying, setIsDeploying] = useState<boolean>(false)
+  const [deployError, setDeployError] = useState<string | null>(null)
+  const [isDeployed, setIsDeployed] = useState<boolean>(isWalletDeployed)
+
+  const [smartWalletDeployTx, setSmartWalletDeployTx] =
+    useState<null | Transaction>(null)
+
+  useEffect(() => {
+    getInfo()
+  }, [])
+
+  const getInfo = () =>
+    wallet.smartWallet.signer.getBalance().then(setEoaBalance)
+
+  const deploy = async () => {
+    setDeployError(null)
+    setIsDeploying(true)
+
+    try {
+      const txPromise = await wallet.smartWalletFactory.deploy()
+      setSmartWalletDeployTx(txPromise)
+
+      await txPromise.wait()
+      await wallet.smartWalletFactory.isDeployed().then(setIsDeployed)
+      setIsDeploying(false)
+    } catch (error: any) {
+      setDeployError(error.toString())
+      setIsDeploying(false)
+    }
+  }
+
+  const hasBalance = eoaBalance.toString() !== '0'
+
+  return (
+    <ScrollView style={styles.background}>
+      <Text style={styles.heading}>Deploy Smart Wallet</Text>
+
+      {isDeployed && (
+        <Text style={styles.text}>Your smart wallet has been deployed!</Text>
+      )}
+
+      {!isDeployed && (
+        <View>
+          <Text style={styles.text}>
+            This is a temporary step that is needed before RIF Relay Server is
+            ready.
+          </Text>
+          <Text style={styles.heading}>Step 1: Fund your EOA account</Text>
+          <View>
+            <Text style={styles.text}>
+              Fund your Externally Owned Account (EOA) with rBTC. Copy your
+              address below and paste it in the rBTC Faucet.
+            </Text>
+
+            <View style={grid.row}>
+              <View style={grid.column3}>
+                <Text style={styles.text}>Address:</Text>
+              </View>
+
+              <View style={grid.column8}>
+                <Text style={styles.text}>{wallet.address}</Text>
+              </View>
+              <View style={grid.column1}>
+                <TouchableOpacity
+                  style={styles.button}
+                  onPress={() => Clipboard.setString(wallet.address)}>
+                  <CopyIcon width={25} height={25} color="white" />
+                </TouchableOpacity>
+              </View>
+            </View>
+
+            <View style={grid.row}>
+              <View style={grid.column3}>
+                <Text style={styles.text}>Balance:</Text>
+              </View>
+              <View style={grid.column8}>
+                <Text style={styles.text}>
+                  {eoaBalance ? eoaBalance.toString() : '0'}
+                </Text>
+              </View>
+            </View>
+
+            {!hasBalance && (
+              <SecondaryButton
+                onPress={() => Linking.openURL('https://faucet.rsk.co/')}
+                style={styles.button}>
+                <Text>Open the RBTC Faucet in your browser</Text>
+              </SecondaryButton>
+            )}
+          </View>
+
+          <Text style={styles.heading}>Step 2: Deploy the wallet</Text>
+          <SecondaryButton
+            disabled={!hasBalance}
+            onPress={deploy || isDeploying}
+            style={!hasBalance ? styles.buttonDisabled : styles.button}>
+            <Text>Deploy Wallet</Text>
+          </SecondaryButton>
+
+          {isDeploying && <Text style={styles.text}>Deploying...</Text>}
+
+          {smartWalletDeployTx && (
+            <TouchableOpacity
+              onPress={() =>
+                Clipboard.setString(smartWalletDeployTx.hash || '')
+              }>
+              <Text style={styles.text}>
+                {smartWalletDeployTx.hash || ''}
+                <CopyIcon />
+              </Text>
+            </TouchableOpacity>
+          )}
+          {deployError && <Text style={styles.text}>{deployError}</Text>}
+        </View>
+      )}
+    </ScrollView>
+  )
+}
+
+const styles = StyleSheet.create({
+  background: {
+    backgroundColor: colors.darkPurple3,
+    paddingHorizontal: 20,
+  },
+  heading: {
+    color: colors.white,
+    fontSize: 18,
+    marginVertical: 10,
+  },
+  text: {
+    color: colors.white,
+    marginVertical: 10,
+  },
+  button: {
+    width: 'auto',
+    marginVertical: 10,
+  },
+  buttonDisabled: {
+    width: 'auto',
+    backgroundColor: colors.darkPurple4,
+  },
+})
diff --git a/src/screens/settings/SettingsScreen.tsx b/src/screens/settings/SettingsScreen.tsx
index e38ebc41b..8fd79490e 100644
--- a/src/screens/settings/SettingsScreen.tsx
+++ b/src/screens/settings/SettingsScreen.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import { ScreenProps } from '../../RootNavigation'
 import { StyleSheet, View, TouchableOpacity } from 'react-native'
+import Icon from 'react-native-vector-icons/Ionicons'
 import { version } from '../../../package.json'
 import { getWalletSetting, SETTINGS } from '../../core/config'
 import { colors, spacing } from '../../styles'
@@ -29,7 +30,8 @@ export const SettingsScreen: React.FC<ScreenProps<'Settings'>> = ({
   const goToSecurityConfiguration = () =>
     navigation.navigate('SecurityConfigurationScreen' as any)
 
-  const goToDevMenu = () => navigation.navigate('DevMenu' as any)
+  const goToDeploy = () => navigation.navigate('ManuallyDeployScreen')
+
   return (
     <View style={styles.container}>
       <View style={styles.mainView}>
@@ -56,9 +58,10 @@ export const SettingsScreen: React.FC<ScreenProps<'Settings'>> = ({
             Security
           </SemiBoldText>
         </TouchableOpacity>
-        <TouchableOpacity style={styles.rowComponent} onPress={goToDevMenu}>
+        <TouchableOpacity style={styles.rowComponent} onPress={goToDeploy}>
+          <Icon name="wallet-outline" color={colors.white} size={20} />
           <SemiBoldText style={[styles.textColor, spacing.ml6]}>
-            Dev Menu
+            Smart Wallet Deploy
           </SemiBoldText>
         </TouchableOpacity>
       </View>