diff --git a/js/controllers/join.js b/js/controllers/join.js
index 34d4a7231..d94c24354 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -17,8 +17,13 @@ angular.module('copayApp.controllers').controller('JoinController',
 
     $scope.hideAdv=true;
 
+
+
     navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
 
+    if (!window.cordova && !navigator.getUserMedia) 
+      $scope.disableScanner =1;
+
     var _scan = function(evt) {
       if (localMediaStream) {
         context.drawImage(video, 0, 0, 300, 225);
diff --git a/js/controllers/send.js b/js/controllers/send.js
index a3112a093..2b37844d6 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -17,6 +17,8 @@ angular.module('copayApp.controllers').controller('SendController',
     $scope.isRateAvailable = false;
     $scope.rateService = rateService;
 
+
+
     rateService.whenAvailable(function() {
       $scope.isRateAvailable = true;
       $scope.$digest();
@@ -101,6 +103,9 @@ angular.module('copayApp.controllers').controller('SendController',
     window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL;
     $scope.isMobile = isMobile.any();
 
+    if (!window.cordova && !navigator.getUserMedia) 
+      $scope.disableScanner =1;
+
     $scope.submitForm = function(form) {
       if (form.$invalid) {
         var message = 'Unable to send transaction proposal.';
diff --git a/js/directives.js b/js/directives.js
index 268ab17e4..6ddf8456a 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -271,8 +271,8 @@ angular.module('copayApp.directives')
             }, 1000);
           });
         });
-
         client.on('wrongflash noflash', function() {
+          elm.removeClass('btn-copy').html('');
           ZeroClipboard.destroy();
         });
 
diff --git a/views/addresses.html b/views/addresses.html
index 75a1999ed..de002f04b 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -7,11 +7,11 @@
     
     <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
       <div class="large-12 medium-12" ng-init="showAll=0">
-          <div class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll" ng-click="openAddressModal(addr)">
+          <div class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
             <div class="row collapse">
               <div class="large-10 medium-9 small-8 column" >
                 <div class="ellipsis list-addr">
-                  <i class="fi-thumbnails size-48 show-for-large-up">&nbsp;</i>
+                  <i class="fi-thumbnails size-48 show-for-large-up"  ng-click="openAddressModal(addr)">&nbsp;</i>
                   <span>
                     <contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
                   </span>
diff --git a/views/join.html b/views/join.html
index b4914eb05..878118062 100644
--- a/views/join.html
+++ b/views/join.html
@@ -26,7 +26,7 @@
                 <input id="connectionId" type="text" class="small-9 columns" 
                 placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
               </div>
-              <div class="small-2 columns" ng-hide="showScanner">
+              <div class="small-2 columns"  ng-hide="disableScanner" ng-hide="showScanner">
                   <a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
               </div>
               <div class="small-2 columns" ng-show="showScanner">
diff --git a/views/send.html b/views/send.html
index 3345e2347..fdb5f5baf 100644
--- a/views/send.html
+++ b/views/send.html
@@ -26,7 +26,7 @@
                 <small class="icon-input" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
                 <small class="icon-input" ng-show="sendForm.address.$invalid && address"><i class="fi-x"></i></small>
               </div>
-              <div class="small-2 columns" ng-hide="showScanner">
+              <div class="small-2 columns"  ng-hide="disableScanner" ng-hide="showScanner">
                 <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"></i></a>
               </div>
               <div class="small-2 columns" ng-show="showScanner">