diff --git a/css/src/main.css b/css/src/main.css
index 8d1d21d64..4daa9e0fe 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -467,8 +467,6 @@ ul.tx-copayers {
   background: #eee;
 }
 
-
-
 .sign-action {
   background: #E4E8EC;
   width: 100%;
@@ -1349,13 +1347,6 @@ a:hover .photo-container  {
   margin-left: 0;
 }
 
-.addresses .list-addr i {
-  position: absolute;
-  top: -15px;
-  left: 0;
-  cursor: pointer;
-}
-
 .addresses .list-addr contact {
   cursor: text;
 }
diff --git a/views/history.html b/views/history.html
index 54d0ee72b..9bcd0595d 100644
--- a/views/history.html
+++ b/views/history.html
@@ -37,7 +37,7 @@
                 </span>
                 {{$root.wallet.settings.unitName}}
             </span>
-            <span class="size-14 db m5t text-gray">
+            <span class="size-14 db m5t text-gray" ng-show="btx.alternativeAmount">
               {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}
             </span>
           </div>
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html
index 665e07049..50205df89 100644
--- a/views/modals/tx-details.html
+++ b/views/modals/tx-details.html
@@ -12,7 +12,7 @@
     <span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amount}}
       {{$root.wallet.settings.unitName}}
   </div>
-  <div class="size-18 m5t text-gray">
+  <div class="size-18 m5t text-gray" ng-show="btx.alternativeAmount">
     {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}
   </div>
 </div>
diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html
index d46633bb2..dc6f60bf4 100644
--- a/views/modals/wallet-info.html
+++ b/views/modals/wallet-info.html
@@ -1,6 +1,6 @@
 
 <div class="text-right">
-  <a class="close-reveal-modal" ng-click="cancel()">Close</a>
+  <a class="close-reveal-modal" ng-click="close()">Close</a>
 </div>
 
 <div class="text-center" ng-init="isComplete = item.isComplete(); networkName = item.getNetworkName()">
diff --git a/views/receive.html b/views/receive.html
index 67a8ee907..055b46edb 100644
--- a/views/receive.html
+++ b/views/receive.html
@@ -27,16 +27,14 @@
   </div>
   <div class="row">
     <div class="large-12 columns" ng-if="addresses.length">
-      <div ng-repeat="addr in addresses">
+      <div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
         <div class="panel">
-          <div class="row show-for-large-up">
-            <div class="large-7 medium-9 columns">
-              <div class="list-addr">
-                <contact address="{{::addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right">
-                  <small translate class="label" ng-if="::addr.isChange">change</small>
-              </div>
+          <div class="row">
+            <div class="large-8 medium-9 columns">
+              <contact address="{{::addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right">
+              <small translate class="label" ng-if="::addr.isChange">change</small>
             </div>
-            <div class="large-3 medium-3 columns text-right">
+            <div class="large-4 medium-3 columns text-right">
               <span ng-show="$root.updatingBalance">
                   <i class="fi-bitcoin-circle icon-rotate spinner"></i>
                 </span>
@@ -44,41 +42,20 @@
                   <b>{{addr.balance || '0'}} {{$root.wallet.settings.unitName}}</b>
                 </span>
             </div>
-            <div class="large-2 columns show-for-large-up text-right">
-              <a class="size-12" ng-click="openAddressModal(addr)"> Show QR</a>
-            </div>
-          </div>
-          <div class="row hide-for-large-up" ng-click="openAddressModal(addr)">
-            <div class="small-12 columns">
-              <div class="list-addr">
-                <div class="ellipsis">
-                  <span><contact address="{{::addr.address}}"></span>
-                  <small translate class="label" ng-if="::addr.isChange">change</small>
-                </div>
-                <div class="text-right m10t">
-                  <span class="size-14" ng-show="$root.updatingBalance">
-                      <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-                    </span>
-                  <span class="size-14" ng-show="!$root.updatingBalance">
-                      <b>{{addr.balance || '0'}} {{$root.wallet.settings.unitName}}</b>
-                    </span>
-                </div>
-              </div>
-            </div>
           </div>
           <!-- end of panel mobile -->
         </div>
       </div>
-      <a class="button primary text-center right" ng-click="newAddr()" ng-disabled="loading">
+      <a class="button secondary tiny text-center right" ng-click="newAddr()" ng-disabled="loading">
           Generate new address
       </a>
-      <a class="button primary text-center" ng-click="toggleShowAll()" ng-disabled="loading">
+      <a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
         <span translate ng-if="showAll">Hide them</span>
       </a>
     </div>
-    <div class="large-12 columns"  ng-if="!showAll">
+    <div class="large-12 columns" ng-if="!showAll">
       <div class="m20b">
-        <a class="button primary text-center" ng-click="toggleShowAll()" ng-disabled="loading">
+        <a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
           <span translate>Show all my addresses</span>
         </a>
       </div>