diff --git a/Makefile b/Makefile
index b859507a6e..909095f818 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,11 @@ android-ports-avd: ##@other Add reverse proxy to Android Device/Simulator
 	adb -e reverse tcp:3449 tcp:3449
 	adb -e reverse tcp:4567 tcp:4567
 
+android-ports-genymotion: ##@other Add reverse proxy to Android Device/Simulator
+	adb -e reverse tcp:8081 tcp:8081
+	adb -e reverse tcp:3449 tcp:3449
+	adb -e reverse tcp:4567 tcp:4567
+
 android-ports-real: ##@other Add reverse proxy to Android Device/Simulator
 	adb -d reverse tcp:8081 tcp:8081
 	adb -d reverse tcp:3449 tcp:3449
diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs
index 5040217fb2..fcf8f80235 100644
--- a/src/status_im/ui/screens/profile/user/views.cljs
+++ b/src/status_im/ui/screens/profile/user/views.cljs
@@ -67,15 +67,15 @@
 (defview qr-viewer []
   (letsubs [{:keys [value contact]} [:get :qr-modal]]
     [react/view styles/qr-code-viewer
-     [status-bar/status-bar {:type :modal}]
+     [status-bar/status-bar {:type :modal-white}]
      [qr-viewer-toolbar (:name contact) value]
      [qr-code-viewer/qr-code-viewer {:style styles/qr-code}
       value (i18n/label :t/qr-code-public-key-hint) (str value)]]))
 
 (defn- show-qr [contact source value]
-  #(re-frame/dispatch [:navigate-to :profile-qr-viewer {:contact contact
-                                                        :source  source
-                                                        :value   value}]))
+  #(re-frame/dispatch [:navigate-to-modal :profile-qr-viewer {:contact contact
+                                                              :source  source
+                                                              :value   value}]))
 
 (defn share-contact-code [current-account public-key]
   [react/touchable-highlight {:on-press (show-qr current-account :public-key public-key)}
diff --git a/src/status_im/ui/screens/views.cljs b/src/status_im/ui/screens/views.cljs
index 84eaa71803..8bf8afb421 100644
--- a/src/status_im/ui/screens/views.cljs
+++ b/src/status_im/ui/screens/views.cljs
@@ -151,13 +151,13 @@
     :recent-recipients recent-recipients
     :recipient-qr-code recipient-qr-code
     :contact-code contact-code
-    :profile-qr-viewer profile.user/qr-viewer
     :backup-seed backup-seed
     [react/view [react/text (str "Unknown view: " view-id)]]))
 
 (defn get-modal-component [modal-view]
   (case modal-view
     :qr-scanner qr-scanner
+    :profile-qr-viewer profile.user/qr-viewer
     :wallet-transactions-filter wallet-transactions/filter-history
     :wallet-settings-assets wallet-settings/manage-assets
     :wallet-send-transaction-modal send-transaction-modal