diff --git a/www/views/confirm.html b/www/views/confirm.html
index 9886ca270..531a397b5 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -23,17 +23,18 @@
         <div class="item">
           <span class="label" translate>To</span>
           <span class="payment-proposal-to" copy-to-clipboard="toAddress">
-            <img ng-if="isWallet" src="img/icon-bitcoin-small.svg">
+            <img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
+            <img ng-if="cardId" src="img/icon-card.svg" width="34">
             <i ng-if="cardId" class="icon big-icon-svg">
               <div class="bg icon-bitpay-card"></div>
             </i>
             <span ng-show="toName">{{toName}}</span>
+            <contact class="ellipsis" address="{{toAddress}}">{{toAddress}}</contact>
             <div ng-show="_paypro" ng-click="openPPModal(_paypro)">
               <i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
               <i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
               {{_paypro.domain}}
             </div>
-            <contact class="ellipsis" address="{{toAddress}}">{{toAddress}}</contact>
             <!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>
             <span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
           </span>
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index e1754c82e..0a0aa9233 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -78,41 +78,41 @@
               {{wallet.m}}-of-{{wallet.n}}
             </span>
           </span>
-        </span>
+          <p>
+          <span ng-if="!wallet.isComplete()" class="assertive" translate>
+            Incomplete
+          </span>
+          <span ng-if="wallet.isComplete()">
+            <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
+            <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
+          </span>
+          &nbsp;
+          </p>
+          <i class="icon bp-arrow-right"></i>
+        </a>
 
-        <p>
-        <span ng-if="!wallet.isComplete()" class="assertive" translate>
-          Incomplete
-        </span>
-        <span ng-if="wallet.isComplete()">
-          <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
-          <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
-        </span>
-        &nbsp;
-        </p>
-        <i class="icon bp-arrow-right"></i>
-      </a>
-      <a ng-repeat="card in bitpayCards"
-         ui-sref="tabs.bitpayCard({id:card.id})"
-         ng-if="bitpayCardEnabled && bitpayCards[0]"
-         class="item item-icon-left item-big-icon-left item-icon-right">
-        <i class="icon big-icon-svg">
-          <div class="bg icon-bitpay-card"></div>
-        </i>
-        <h2>BitPay Visa&reg; Card</h2>
-        <p>{{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}</p>
-        <i class="icon bp-arrow-right"></i>
-      </a>
-      <a ui-sref="tabs.bitpayCardIntro"
-         ng-if="bitpayCardEnabled && !bitpayCards[0] && externalServices.BitpayCard"
-         class="item item-icon-left item-big-icon-left item-icon-right">
-        <i class="icon big-icon-svg">
-          <div class="bg icon-bitpay-card"></div>
-        </i>
-        <h2>BitPay Visa&reg; Card</h2>
-        <p translate>Add your cards</p>
-        <i class="icon bp-arrow-right"></i>
-      </a>
+        <a ng-repeat="card in bitpayCards"
+           ui-sref="tabs.bitpayCard({id:card.id})"
+           ng-if="bitpayCardEnabled && bitpayCards[0]"
+           class="item item-icon-left item-big-icon-left item-icon-right">
+          <i class="icon big-icon-svg">
+            <div class="bg icon-bitpay-card"></div>
+          </i>
+          <h2>BitPay Visa&reg; Card</h2>
+          <p>{{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}</p>
+          <i class="icon bp-arrow-right"></i>
+        </a>
+        <a ui-sref="tabs.bitpayCardIntro"
+           ng-if="bitpayCardEnabled && !bitpayCards[0] && externalServices.BitpayCard"
+           class="item item-icon-left item-big-icon-left item-icon-right">
+          <i class="icon big-icon-svg">
+            <div class="bg icon-bitpay-card"></div>
+          </i>
+          <h2>BitPay Visa&reg; Card</h2>
+          <p translate>Add your cards</p>
+          <i class="icon bp-arrow-right"></i>
+        </a>
+      </div>
     </div>
 
     <div class="list card" ng-if="wallets[0] && externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">