diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index 229d23c2a..7d40a3afa 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -77,6 +77,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
           name: v.name,
           recipientType: 'wallet',
           coin: v.coin,
+          network: v.network,
           getAddress: function(cb) {
             walletService.getAddress(v, false, cb);
           },
diff --git a/www/views/cashScan.html b/www/views/cashScan.html
index 2e62297ba..114bc208a 100644
--- a/www/views/cashScan.html
+++ b/www/views/cashScan.html
@@ -23,9 +23,7 @@
   </div>
 
   <div ng-repeat="wallet in wallets track by $index" class="item wallet supported">
-    <i class="icon big-icon-svg">
-      <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
-    </i>
+    <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
     <div class="wallet-content">
       <div>{{wallet.name || wallet.id}}</div>
       <div class="balanced">{{wallet.bchBalance  || ('Checking...' | translate)}} </div>
@@ -45,9 +43,7 @@
     </div>
 
     <div ng-repeat="wallet in nonBIP44Wallets track by $index" class="item item-sub item-icon-left item-big-icon-left item-button-right wallet">
-      <i class="icon big-icon-svg">
-        <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': walletDisabled}" class="bg wallet"/>
-      </i>
+      <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
       <span class="text-disabled">{{wallet.name || wallet.id}}</span>
     </div>
 
diff --git a/www/views/confirm.html b/www/views/confirm.html
index da6aca0f8..6e44dfa3c 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -64,9 +64,7 @@
         <a class="item item-icon-right" ng-hide="!wallet" ng-click="showWalletSelector()">
           <span class="label" translate>From</span>
           <div class="wallet" ng-if="wallet">
-            <i class="icon big-icon-svg">
-              <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
-            </i>
+            <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
             <div>{{wallet.name}}</div>
           </div>
           <div class="wallet" ng-if="!wallet">
diff --git a/www/views/customAmount.html b/www/views/customAmount.html
index cd3d9da15..a9a5e978d 100644
--- a/www/views/customAmount.html
+++ b/www/views/customAmount.html
@@ -38,9 +38,7 @@
         </div>
         <div class="item single-line">
           <div class="wallet">
-            <i class="icon big-icon-svg">
-              <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg">
-            </i>
+            <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
             {{wallet.name}}
           </div>
           <div class="label" translate>Receive in</div>
diff --git a/www/views/includes/walletIcon.html b/www/views/includes/walletIcon.html
new file mode 100644
index 000000000..2396ffa87
--- /dev/null
+++ b/www/views/includes/walletIcon.html
@@ -0,0 +1,3 @@
+  <img ng-if="wallet.network == 'testnet'" src="img/icon-wallet-testnet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
+  <img ng-if="wallet.network != 'testnet' && wallet.coin == 'btc'" src="img/icon-btc.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
+  <img ng-if="wallet.network != 'testnet' && wallet.coin != 'btc'" src="img/icon-bch.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
diff --git a/www/views/includes/walletItem.html b/www/views/includes/walletItem.html
index 1d5ba209e..6c26d4993 100644
--- a/www/views/includes/walletItem.html
+++ b/www/views/includes/walletItem.html
@@ -1,7 +1,5 @@
 <div class="wallet-item">
-    <i class="icon big-icon-svg circle">
-    <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
-  </i>
+  <i class="icon big-icon-svg circle" ng-include="'views/includes/walletIcon.html'"></i>
   <div class="name">
     {{wallet.name || wallet.id}}
     <span class="size-12 text-light" ng-show="wallet.n > 1">
@@ -12,4 +10,3 @@
     </span>
   </div>
 </div>
-
diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html
index 3fa8860f1..930c47fb1 100644
--- a/www/views/includes/walletSelector.html
+++ b/www/views/includes/walletSelector.html
@@ -2,31 +2,29 @@
   <img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
   <div class="header">{{title}}</div>
   <a
-    ng-repeat="w in wallets track by $index"
+    ng-repeat="wallet in wallets track by $index"
     class="item item-icon-left item-big-icon-left item-icon-right wallet"
-    ng-click="selectWallet(w)"
+    ng-click="selectWallet(wallet)"
   >
-      <i class="icon big-icon-svg">
-        <img ng-src="img/{{w.network == 'testnet' ? 'icon-wallet-testnet' : (w.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !w.color}" ng-style="{'background-color': w.color}" class="bg">
-      </i>
+      <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
       <div class="wallet-inner">
         <div class="wallet-details">
           <div class="wallet-name">
-            {{w.name}}
+            {{wallet.name}}
           </div>
           <p class="wallet-balance">
-            <span ng-if="!w.isComplete()" class="assertive" translate>
+            <span ng-if="!wallet.isComplete()" class="assertive" translate>
               Incomplete
             </span>
-            <span ng-if="w.isComplete()">
-              <span ng-if="!w.balanceHidden">{{w.status.availableBalanceStr}}</span>
-              <span ng-if="w.balanceHidden" translate>[Balance Hidden]</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>
           </span>
           &nbsp;
           </p>
         </div>
-        <img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === w">
+        <img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
       </div>
     </a>
 </action-sheet>
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html
index c5e2aea91..57ce35df0 100644
--- a/www/views/modals/txp-details.html
+++ b/www/views/modals/txp-details.html
@@ -73,9 +73,7 @@
         <div class="item">
           <span class="label" translate>From</span>
           <div class="wallet">
-            <i class="icon big-icon-svg">
-              <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
-            </i>
+            <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
             <div>{{wallet.name}}</div>
           </div>
         </div>
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html
index d92aba85e..64aaa7b61 100644
--- a/www/views/paperWallet.html
+++ b/www/views/paperWallet.html
@@ -23,9 +23,7 @@
       </div>
       <div class="list card" ng-click="showWalletSelector()" ng-if="wallets[0]">
         <a ng-if="wallet" class="item item-sub item-icon-left item-big-icon-left item-icon-right">
-          <i class="icon big-icon-svg">
-            <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
-          </i>
+          <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
           <span>
             {{wallet.name || wallet.id}}
           </span>
diff --git a/www/views/tab-home.html b/www/views/tab-home.html
index be67c7440..f22785035 100644
--- a/www/views/tab-home.html
+++ b/www/views/tab-home.html
@@ -80,9 +80,7 @@
         <a ng-repeat="wallet in wallets track by $index"
            class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
            ng-click="openWallet(wallet)">
-          <i class="icon big-icon-svg">
-            <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
-          </i>
+          <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
           <span>
             {{wallet.name || wallet.id}}
           </span>
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index 5074da2c0..bb7206ad7 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -62,9 +62,7 @@
 
     <div class="wallet-selector" ng-click="showWalletSelector()" ng-if="wallets[0] && wallet">
       <a ng-if="wallet" class="item item-sub item-icon-left item-big-icon-left item-icon-right">
-        <i class="icon big-icon-svg">
-          <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
-        </i>
+        <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
         <span>
           {{wallet.name || wallet.id}}
         </span>
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 23ef00e62..b94ec0dde 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -68,9 +68,7 @@
       </div>
       <div class="list">
         <a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.recipientType == 'wallet'" ng-click="goToAmount(item)">
-          <i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'">
-            <img ng-src="img/{{item.network == 'testnet' ? 'icon-wallet-testnet' : (item.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !item.color}" ng-style="{'background-color': item.color}" class="bg"/>
-          </i>
+          <i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'" ng-init="wallet = item" ng-include="'views/includes/walletIcon.html'"></i>
           {{item.name}}
           <i class="icon bp-arrow-right"></i>
         </a>
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index aed53e00b..d1274b3a4 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -109,9 +109,7 @@
       <a class="item item-icon-left item-icon-right" href
            ui-sref="tabs.preferences({'walletId': item.id})"
            ng-repeat="item in wallets track by $index">
-         <i class="icon big-icon-svg circle">
-          <img ng-src="img/{{item.network == 'testnet' ? 'icon-wallet-testnet' : (item.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !item.color}" ng-style="{'background-color': item.color}" class="bg"/>
-        </i>
+        <i class="icon big-icon-svg circle" ng-init="wallet = item" ng-include="'views/includes/walletIcon.html'"></i>
         <span>
           {{item.name || item.id}}
           <span class="size-12 text-light" ng-show="item.n > 1">
diff --git a/www/views/tx-details.html b/www/views/tx-details.html
index 7cbd72b29..8ef0a22ce 100644
--- a/www/views/tx-details.html
+++ b/www/views/tx-details.html
@@ -52,9 +52,7 @@
           <span class="label" ng-if="btx.action === 'sent'" translate>From</span>
           <span class="label" ng-if="btx.action !== 'sent'" translate>To</span>
           <div class="wallet">
-            <i class="icon big-icon-svg">
-              <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
-            </i>
+            <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
             <div>{{wallet.name}}</div>
           </div>
         </div>