diff --git a/css/main.css b/css/main.css
index 62045d634..4b98dc87b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -925,6 +925,18 @@ button, .button, p {
   margin-left: 0;
 }
 
+.addresses .list-addr i {
+  position: absolute;
+  top: -25px;
+  left: 6px;
+  cursor: pointer;
+}
+
+.addresses .list-addr contact {
+  margin-left: 42px;
+  cursor: text;
+}
+
 .pointer {
   cursor: pointer;
 }
diff --git a/js/controllers/join.js b/js/controllers/join.js
index 41ee28f36..425e15106 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('JoinController',
     controllerUtils.redirIfLogged();
     $rootScope.fromSetup = false;
     $scope.loading = false;
+    $scope.isMobile = !!window.cordova;
 
    // QR code Scanner
     var cameraInput;
diff --git a/js/controllers/open.js b/js/controllers/open.js
index ccf0ebb92..9af583833 100644
--- a/js/controllers/open.js
+++ b/js/controllers/open.js
@@ -14,6 +14,7 @@ angular.module('copayApp.controllers').controller('OpenController',
     $scope.wallets = walletFactory.getWallets().sort(cmp);
     $scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id);
     $scope.openPassword = '';
+    $scope.isMobile = !!window.cordova;
 
     $scope.open = function(form) {
       if (form && form.$invalid) {
diff --git a/js/controllers/setup.js b/js/controllers/setup.js
index ee9d48d33..2c353c209 100644
--- a/js/controllers/setup.js
+++ b/js/controllers/setup.js
@@ -40,6 +40,7 @@ angular.module('copayApp.controllers').controller('SetupController',
     $rootScope.videoInfo = {};
     $scope.loading = false;
     $scope.walletPassword = $rootScope.walletPassword;
+    $scope.isMobile = !!window.cordova;
 
     // ng-repeat defined number of times instead of repeating over array?
     $scope.getNumber = function(num) {
diff --git a/mobile/res/drawable/screen.9.png b/mobile/res/drawable/screen.9.png
index aadb2c99a..5ca954990 100644
Binary files a/mobile/res/drawable/screen.9.png and b/mobile/res/drawable/screen.9.png differ
diff --git a/views/addresses.html b/views/addresses.html
index b4ce4a31e..3381fd08b 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -10,9 +10,9 @@
         <ul>
           <li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
 
-            <div class="large-8 small-6 column" ng-click="openAddressModal(addr)">
-              <div class="ellipsis">
-                <i class="fi-thumbnails">&nbsp;</i>
+            <div class="large-8 small-6 column">
+              <div class="ellipsis list-addr">
+                <i class="fi-thumbnails size-48" ng-click="openAddressModal(addr)">&nbsp;</i>
                 <span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
                 <small ng-if="addr.isChange">change</small>
               </div>
diff --git a/views/copayers.html b/views/copayers.html
index 06e185395..ed1d5128d 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -8,7 +8,7 @@
     <div class="large-8 columns line-dashed-setup-v">
       <div class="box-setup oh">
         <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
-          <img ng-if="$root.fromSetup" class="right m15t" src="../img/step-3.svg" alt="Step 3">
+          <img ng-if="$root.fromSetup && !isMobile" class="right m15t" src="img/step-3.svg" alt="Step 3">
           <h1 class="text-primary line-sidebar-b">Waiting copayers</h1>
           <h3>Share this secret with your other copayers</h3>
           <div class="panel">
diff --git a/views/setup.html b/views/setup.html
index 4072c14a1..a6b7761d7 100644
--- a/views/setup.html
+++ b/views/setup.html
@@ -12,8 +12,8 @@
         </div>
         <div class="large-8 columns line-dashed-setup-v">
           <div class="box-setup oh">
-            <img ng-if="!isSetupWalletPage" class="right m15t" src="../img/step-1.svg" alt="Step 1">
-            <img ng-if="isSetupWalletPage" class="right m15t" src="../img/step-2.svg" alt="Step 2">
+            <img ng-if="!isSetupWalletPage && !isMobile" class="right m15t" src="img/step-1.svg" alt="Step 1">
+            <img ng-if="isSetupWalletPage && !isMobile" class="right m15t" src="img/step-2.svg" alt="Step 2">
             <h1 class="text-secondary line-sidebar-b">Create new wallet</h1>
             <label ng-show="!isSetupWalletPage">Wallet name
               <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
@@ -54,7 +54,7 @@
               </div>
               <div class="large-6 medium-6 columns">
                 <label>Select required signatures (*)
-                  <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
+                  <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues" ng-disabled="totalCopayers == 1">
                   </select>
                 </label>
               </div>