diff --git a/app/build.gradle b/app/build.gradle
index ab79919..ca23267 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -83,8 +83,8 @@ dependencies {
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-rxjava2:$room_version" // RxJava support for Room
     // AAC Navigation
-    implementation "android.arch.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "android.arch.navigation:navigation-ui-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     // RxBindings
     implementation "com.jakewharton.rxbinding3:rxbinding:$rx_bindings_version"
     implementation "com.jakewharton.rxbinding3:rxbinding-material:$rx_bindings_version" // Material Components widgets
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 618526c..6137f1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
@@ -41,7 +41,10 @@
             android:name=".activities.MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Bitsy"
-            android:windowSoftInputMode="adjustPan"/>
+            android:windowSoftInputMode="adjustPan">
+
+            <nav-graph android:value="@navigation/mobile_navigation" />
+        </activity>
         <!-- Used to share Images like the QR code and the eReceipt -->
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
index 8906c46..f488e2c 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
@@ -256,6 +256,7 @@ class ReceiveTransactionFragment : ConnectedFragment() {
         }
     }
 
+    // TODO use coroutines to move this process to a background thread
     private fun updateQR() {
         if (mAsset == null) {
             ivQR.setImageDrawable(null)
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
index 6c26d43..224255e 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
@@ -200,8 +200,7 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
                 .debounce(500, TimeUnit.MILLISECONDS)
                 .map { it.toString().trim() }
                 .subscribe {
-                    val id = mNetworkService?.sendMessage(GetAccountByName(it!!), GetAccountByName.REQUIRED_API)
-                    if (id != null) responseMap[id] = RESPONSE_GET_ACCOUNT_BY_NAME
+                    validateAccount(it)
                 }
         )
 
@@ -213,6 +212,15 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe { validateAmount() }
         )
+
+        // Populates the To field if a Deep Link was used
+        if (args.to != " " && args.asset != " " && args.amount > 0 && args.memo != " ") {
+            val items = arrayOf(LineItem("transfer", 1, args.amount.toDouble()))
+            val invoice = Invoice(args.to, "", args.memo, args.asset, items, "", "")
+            Handler().postDelayed({
+                populatePropertiesFromQRCodeString(Invoice.toQrCode(invoice))
+            }, 2000) // Wait to let the other elements of the fragment initialize
+        }
     }
 
     /** Handles the selection of items in the Asset spinner, to keep track of the selectedAssetSymbol and show the
@@ -369,11 +377,16 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
         cameraPreview.stopCamera()
     }
 
-    /** Handles the result of the QR code read from the camera and tries to populate the Account, Amount and Memo fields
-     * and the Asset spinner with the obtained information */
+    /** Handles the result of the QR code read from the camera **/
     override fun handleResult(result: Result?) {
+        populatePropertiesFromQRCodeString(result!!.text)
+    }
+
+    /** Tries to populate the Account, Amount and Memo fields
+    * and the Asset spinner with the obtained information */
+    private fun populatePropertiesFromQRCodeString(qrString: String) {
         try {
-            val invoice = Invoice.fromQrCode(result!!.text)
+            val invoice = Invoice.fromQrCode(qrString)
 
             Log.d(TAG, "QR Code read: " + invoice.toJsonString())
 
@@ -422,6 +435,16 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
         }
     }
 
+    /**
+     * Sends a request to the node through the NetworkService to validate that accountName is a valid
+     * BitShares account.
+     */
+    private fun validateAccount(accountName: String) {
+        isToAccountCorrect = false
+        val id = mNetworkService?.sendMessage(GetAccountByName(accountName), GetAccountByName.REQUIRED_API)
+        if (id != null) responseMap[id] = RESPONSE_GET_ACCOUNT_BY_NAME
+    }
+
     private fun validateAmount() {
         val txtAmount = tietAmount.text.toString()
 
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 0195c99..65ffa16 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -97,6 +97,25 @@
             android:name="openCamera"
             app:argType="boolean"
             android:defaultValue="false" />
+
+        <argument
+            android:name="to"
+            android:defaultValue=" " />
+
+        <argument
+            android:name="amount"
+            app:argType="float"
+            android:defaultValue="0.0" />
+
+        <argument
+            android:name="asset"
+            android:defaultValue=" " />
+
+        <argument
+            android:name="memo"
+            android:defaultValue=" " />
+
+        <deepLink app:uri="www.bitshares.com/{to}/{amount}/{asset}/{memo}" />
     </fragment>
 
     <fragment
diff --git a/build.gradle b/build.gradle
index 2b6fb6b..c356596 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.3.21'
-    ext.nav_version = '1.0.0'
+    ext.nav_version = '2.0.0'
     repositories {
         google()
         jcenter()
@@ -14,7 +14,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'io.fabric.tools:gradle:1.27.1'