From e5c6e5a2d258a1d358081ccc151cc2f2d83ceff3 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Thu, 8 Jun 2017 17:43:06 -0400
Subject: [PATCH 01/17] Implement proper send search design.

---
 src/js/controllers/tab-send.js | 10 +++++++
 src/sass/views/tab-send.scss   | 54 +++++++++++++++++++++++++++++++++-
 www/views/tab-send.html        | 16 ++++++----
 3 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index 96694847f..5c2f576ec 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -128,6 +128,16 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
     updateWalletsList();
   };
 
+  $scope.searchInFocus = function() {
+    $scope.searchFocus = true;
+  };
+
+  $scope.searchBlurred = function() {
+    if ($scope.formData.search == null) {
+      $scope.searchFocus = false;
+    }
+  };
+
   $scope.findContact = function(search) {
 
     if (incomingData.redir(search)) {
diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss
index dbda43f2e..cf6da856a 100644
--- a/src/sass/views/tab-send.scss
+++ b/src/sass/views/tab-send.scss
@@ -35,8 +35,60 @@
   .send-heading {
     font-size: 14px;
     font-weight: bold;
-    padding-bottom: 0;
+    padding: 0 0 16px 0;
+    border: none;
   }
+
+
+
+  .send-header-wrapper {
+    padding: 10px;
+    background-color: white;
+    box-shadow: 0px 5px 10px 0px #cccccc;
+  }
+  .search-wrapper {
+    background-color: #f2f2f2;
+    border-radius: 3px;
+    border: none;
+    .svg#Bitcoin_Symbol {
+      width: 14px;
+      .st0 {
+        fill: #cccccc;
+      }
+    }
+    &.focus {
+      background: none;
+      .svg#Bitcoin_Symbol {
+        display: none;
+      }
+      .search-input {
+        padding-left: 0;
+        &:focus::-webkit-input-placeholder {
+          opacity: 0;
+        }
+      }
+    }
+  }
+
+
+  .abs-v-center {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+   }
+  .search-input {
+    background-color: transparent;
+    padding-left: 30px;
+  }
+  .separator-left {
+    border-left: 1px solid #d9d9df;
+    padding-left: 10px;
+    height: 70%;
+  }
+
+
+
+
   .bitcoin-address {
     border-top: none;
     padding-bottom: .5rem;
diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index b64ed93ef..6cd42454c 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -1,15 +1,19 @@
-<ion-view id="tab-send">
+c<ion-view id="tab-send">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
   </ion-nav-bar>
   <ion-content>
 
     <div ng-if="hasFunds">
-      <div class="item item-heading send-heading" translate>Recipient</div>
-      <div class="item item-icon-left item-icon-right input">
-        <i class="icon icon-svg left"><img src="img/icon-bitcoin-symbol.svg"></i>
-        <input type="text" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur>
-        <i class="icon icon-svg qr" on-tap="openScanner()"><img src="img/scan-ico.svg"/></i>
+      <div class="send-header-wrapper">
+        <div class="item item-heading send-heading" translate><span>Recipient</span></div>
+        <div class="item input search-wrapper" ng-class="{'focus': searchFocus}">
+          <i class="icon icon-svg abs-v-center"><img class="svg" src="img/icon-bitcoin-symbol.svg"></i>
+          <div class="item-icon-right">
+            <input type="text" class="search-input" placeholder="{{'Search or enter bitcoin address' | translate}}" ng-model="formData.search" ng-change="findContact(formData.search)" ng-model-onblur ng-focus="searchInFocus()" ng-blur="searchBlurred()">
+            <i class="icon icon-svg qr abs-v-center separator-left" on-tap="openScanner()"><img src="img/scan-ico.svg"></i>
+          </div>
+        </div>
       </div>
     </div>
 

From c7c52f1426835c2e1df5d51e672087ba40734443 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Thu, 8 Jun 2017 17:44:52 -0400
Subject: [PATCH 02/17] Remove blank lines.

---
 src/sass/views/tab-send.scss | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss
index cf6da856a..8bba3cee6 100644
--- a/src/sass/views/tab-send.scss
+++ b/src/sass/views/tab-send.scss
@@ -38,9 +38,6 @@
     padding: 0 0 16px 0;
     border: none;
   }
-
-
-
   .send-header-wrapper {
     padding: 10px;
     background-color: white;
@@ -69,8 +66,6 @@
       }
     }
   }
-
-
   .abs-v-center {
     position: absolute;
     top: 50%;
@@ -85,10 +80,6 @@
     padding-left: 10px;
     height: 70%;
   }
-
-
-
-
   .bitcoin-address {
     border-top: none;
     padding-bottom: .5rem;

From ec51f8d888d5be50d39c3a32e3effcc006b3c496 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Thu, 8 Jun 2017 17:45:59 -0400
Subject: [PATCH 03/17] Remove typo.

---
 www/views/tab-send.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index 6cd42454c..d9fe9791a 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -1,4 +1,4 @@
-c<ion-view id="tab-send">
+<ion-view id="tab-send">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
   </ion-nav-bar>

From d4e7b30f71890e56f26fbddd0f801b62745d60e3 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Fri, 9 Jun 2017 16:44:59 -0400
Subject: [PATCH 04/17] Update mcc icons per design.

---
 src/sass/views/bitpayCard.scss       | 1 +
 www/img/mcc-icons/airplane.svg       | 2 +-
 www/img/mcc-icons/art.svg            | 2 +-
 www/img/mcc-icons/bicycle.svg        | 2 +-
 www/img/mcc-icons/bitcoin-topup.svg  | 2 +-
 www/img/mcc-icons/boat.svg           | 2 +-
 www/img/mcc-icons/books.svg          | 2 +-
 www/img/mcc-icons/bowling.svg        | 2 +-
 www/img/mcc-icons/bug.svg            | 2 +-
 www/img/mcc-icons/bus.svg            | 2 +-
 www/img/mcc-icons/camera.svg         | 2 +-
 www/img/mcc-icons/car.svg            | 2 +-
 www/img/mcc-icons/clean.svg          | 2 +-
 www/img/mcc-icons/clock.svg          | 2 +-
 www/img/mcc-icons/cocktail.svg       | 2 +-
 www/img/mcc-icons/coins.svg          | 2 +-
 www/img/mcc-icons/computer.svg       | 2 +-
 www/img/mcc-icons/default.svg        | 2 +-
 www/img/mcc-icons/diamond-ring.svg   | 2 +-
 www/img/mcc-icons/dollar-topup.svg   | 2 +-
 www/img/mcc-icons/euro-topup.svg     | 2 +-
 www/img/mcc-icons/film.svg           | 2 +-
 www/img/mcc-icons/food.svg           | 4 ++--
 www/img/mcc-icons/football.svg       | 2 +-
 www/img/mcc-icons/furniture.svg      | 2 +-
 www/img/mcc-icons/game.svg           | 2 +-
 www/img/mcc-icons/gas.svg            | 2 +-
 www/img/mcc-icons/golf.svg           | 2 +-
 www/img/mcc-icons/hotel.svg          | 2 +-
 www/img/mcc-icons/law.svg            | 2 +-
 www/img/mcc-icons/mail.svg           | 2 +-
 www/img/mcc-icons/medical.svg        | 2 +-
 www/img/mcc-icons/money.svg          | 2 +-
 www/img/mcc-icons/motorcycle.svg     | 2 +-
 www/img/mcc-icons/music.svg          | 2 +-
 www/img/mcc-icons/newspaper.svg      | 2 +-
 www/img/mcc-icons/park.svg           | 2 +-
 www/img/mcc-icons/people.svg         | 2 +-
 www/img/mcc-icons/pet.svg            | 2 +-
 www/img/mcc-icons/plant.svg          | 2 +-
 www/img/mcc-icons/purchase.svg       | 2 +-
 www/img/mcc-icons/repair.svg         | 2 +-
 www/img/mcc-icons/sadface.svg        | 2 +-
 www/img/mcc-icons/scissors.svg       | 2 +-
 www/img/mcc-icons/search.svg         | 2 +-
 www/img/mcc-icons/shirt.svg          | 2 +-
 www/img/mcc-icons/shoes.svg          | 2 +-
 www/img/mcc-icons/smiley-face.svg    | 2 +-
 www/img/mcc-icons/suitcase.svg       | 2 +-
 www/img/mcc-icons/telephone.svg      | 2 +-
 www/img/mcc-icons/television.svg     | 2 +-
 www/img/mcc-icons/tent.svg           | 2 +-
 www/img/mcc-icons/ticket.svg         | 2 +-
 www/img/mcc-icons/toy.svg            | 2 +-
 www/img/mcc-icons/truck.svg          | 2 +-
 www/img/mcc-icons/watch.svg          | 2 +-
 www/views/includes/cardActivity.html | 2 --
 57 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index a602a2238..02b5d77e0 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -101,6 +101,7 @@
       height: 40px;
       border-radius: 40px;
       border: 1px solid;
+      color: #cdcdcd;
       &.no-border {
         border: none;
         .svg {
diff --git a/www/img/mcc-icons/airplane.svg b/www/img/mcc-icons/airplane.svg
index 1d096a5f1..ed1ee3a70 100644
--- a/www/img/mcc-icons/airplane.svg
+++ b/www/img/mcc-icons/airplane.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Transaction-icons" transform="translate(-139.000000, -130.000000)" stroke="#FFFFFF" stroke-width="0.7" fill="#000000">
+        <g id="Transaction-icons" transform="translate(-139.000000, -130.000000)" stroke="#FFFFFF" stroke-width="0.7" fill="#9B9BAB">
             <g id="airplane" transform="translate(140.000000, 131.000000)">
                 <path d="M30.2241211,43.1445312 L30.2241211,44.7509766 L22.237793,40.390625 L22.2148438,40.390625 C22.1000977,40.3217773 21.9624023,40.2758789 21.824707,40.2758789 C21.6870117,40.2758789 21.5493164,40.3217773 21.4345703,40.390625 L21.4116211,40.390625 L13.425293,44.7509766 L13.425293,43.1445312 L18.2216797,38.3481445 C18.3823242,38.2104492 18.4741211,38.0039062 18.4741211,37.7744141 L18.4741211,26.0244141 C18.4741211,25.5424805 18.0839844,25.175293 17.625,25.175293 C17.5102539,25.175293 17.418457,25.1982422 17.3266602,25.2441406 L1.67529297,31.4863281 L1.67529297,29.8110352 L18.1069336,18.3134766 L18.1069336,18.2905273 C18.3134766,18.152832 18.4741211,17.9003906 18.4741211,17.625 L18.4741211,5.02587891 C18.4741211,3.18994141 19.9658203,1.67529297 21.824707,1.67529297 C23.6835938,1.67529297 25.175293,3.18994141 25.175293,5.02587891 L25.175293,17.625 C25.175293,17.9003906 25.3359375,18.152832 25.5424805,18.2905273 L25.5424805,18.3134766 L41.9741211,29.8110352 L41.9741211,31.4863281 L26.3227539,25.2441406 C26.230957,25.1982422 26.1391602,25.175293 26.0244141,25.175293 C25.5654297,25.175293 25.175293,25.5424805 25.175293,26.0244141 L25.175293,37.7744141 C25.175293,38.0039062 25.2670898,38.2104492 25.4277344,38.3481445 L30.2241211,43.1445312 Z M31.8994141,46.1508789 L31.8994141,42.800293 C31.8994141,42.5708008 31.8076172,42.3642578 31.6469727,42.2036133 L26.8505859,37.4072266 L26.8505859,27.2636719 L42.4790039,33.5058594 L42.5019531,33.5058594 C42.59375,33.5517578 42.6855469,33.574707 42.800293,33.574707 C43.2592773,33.574707 43.6494141,33.1845703 43.6494141,32.7255859 L43.6494141,29.375 C43.6494141,29.0766602 43.4887695,28.847168 43.2822266,28.6865234 L26.8505859,17.1889648 L26.8505859,5.02587891 C26.8505859,2.24902344 24.6015625,0 21.824707,0 C19.0478516,0 16.7988281,2.24902344 16.7988281,5.02587891 L16.7988281,17.1889648 L0.3671875,28.6865234 C0.160644531,28.847168 0,29.0766602 0,29.375 L0,32.7255859 C0,33.1845703 0.390136719,33.574707 0.849121094,33.574707 C0.963867188,33.574707 1.05566406,33.5517578 1.14746094,33.5058594 L1.17041016,33.5058594 L16.7988281,27.2636719 L16.7988281,37.4072266 L12.0024414,42.2036133 C11.8417969,42.3642578 11.75,42.5708008 11.75,42.800293 L11.75,46.1508789 C11.75,46.6328125 12.1401367,47 12.5991211,47 C12.7368164,47 12.8745117,46.9541016 12.9892578,46.8852539 L21.824707,42.0888672 L30.6601562,46.8852539 C30.7749023,46.9541016 30.9125977,47 31.050293,47 C31.5092773,47 31.8994141,46.6328125 31.8994141,46.1508789 L31.8994141,46.1508789 Z" id="plane"></path>
             </g>
diff --git a/www/img/mcc-icons/art.svg b/www/img/mcc-icons/art.svg
index 399d09c7d..4437f7a61 100644
--- a/www/img/mcc-icons/art.svg
+++ b/www/img/mcc-icons/art.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -203.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -203.000000)" stroke="#9B9BAB">
             <g id="art" transform="translate(140.000000, 203.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M0,20 C0,12.6 3.7,6 9.3,2 C11.4,0.6 14.6,0.3 16,2 C17.9,4.5 14.5,8 16,10 C19.9,14.8 28.2,5.3 38,10 C45,13.5 44,22.7 43.2,26 C40.6,35.2 32.1,42 22,42 C9.8,42 0,32.2 0,20 L0,20 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/bicycle.svg b/www/img/mcc-icons/bicycle.svg
index 2460bfc20..26e8a9431 100644
--- a/www/img/mcc-icons/bicycle.svg
+++ b/www/img/mcc-icons/bicycle.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -272.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -272.000000)" stroke="#9B9BAB">
             <g id="bicycle" transform="translate(140.000000, 272.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <circle id="Oval" cx="35" cy="21" r="9"></circle>
diff --git a/www/img/mcc-icons/bitcoin-topup.svg b/www/img/mcc-icons/bitcoin-topup.svg
index 17c97917c..024dcd512 100644
--- a/www/img/mcc-icons/bitcoin-topup.svg
+++ b/www/img/mcc-icons/bitcoin-topup.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-1113.000000, -1082.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-1113.000000, -1082.000000)" stroke="#9B9BAB">
             <g id="bitcoin-topup" transform="translate(1113.000000, 1082.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M40,20 C40,31 31,40 20,40 C9,40 0,31 0,20 C0,9 9,0 20,0 C27.9,0 34.8,4.6 38,11.3" id="Shape"></path>
diff --git a/www/img/mcc-icons/boat.svg b/www/img/mcc-icons/boat.svg
index 4c4df0585..5fc321e47 100644
--- a/www/img/mcc-icons/boat.svg
+++ b/www/img/mcc-icons/boat.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-143.000000, -328.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-143.000000, -328.000000)" stroke="#9B9BAB">
             <g id="boat" transform="translate(143.000000, 328.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polygon id="Shape" points="32 36 2 36 0 30 38 30"></polygon>
diff --git a/www/img/mcc-icons/books.svg b/www/img/mcc-icons/books.svg
index ef2d319eb..217c5642b 100644
--- a/www/img/mcc-icons/books.svg
+++ b/www/img/mcc-icons/books.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -391.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -391.000000)" stroke="#9B9BAB">
             <g id="books" transform="translate(140.000000, 391.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M7,6 L13,6" id="Shape"></path>
diff --git a/www/img/mcc-icons/bowling.svg b/www/img/mcc-icons/bowling.svg
index c3d438dc8..6d8f171fa 100644
--- a/www/img/mcc-icons/bowling.svg
+++ b/www/img/mcc-icons/bowling.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -453.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -453.000000)" stroke="#9B9BAB">
             <g id="bowling" transform="translate(140.000000, 453.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <circle id="Oval" cx="22" cy="22" r="22"></circle>
diff --git a/www/img/mcc-icons/bug.svg b/www/img/mcc-icons/bug.svg
index 6cea4c70e..e1aed95c2 100644
--- a/www/img/mcc-icons/bug.svg
+++ b/www/img/mcc-icons/bug.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -523.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -523.000000)" stroke="#9B9BAB">
             <g id="bug" transform="translate(140.000000, 523.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M28,9.4 L28,6 C28,2.7 25.3,0 22,0 C18.7,0 16,2.7 16,6 L16,9.4" id="Shape"></path>
diff --git a/www/img/mcc-icons/bus.svg b/www/img/mcc-icons/bus.svg
index bb32445e9..fa69bd7a9 100644
--- a/www/img/mcc-icons/bus.svg
+++ b/www/img/mcc-icons/bus.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -602.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -602.000000)" stroke="#9B9BAB">
             <g id="bus" transform="translate(140.000000, 602.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="32 6 32 14 38 14"></polyline>
diff --git a/www/img/mcc-icons/camera.svg b/www/img/mcc-icons/camera.svg
index 9abb6dc75..5c518bbfc 100644
--- a/www/img/mcc-icons/camera.svg
+++ b/www/img/mcc-icons/camera.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-138.000000, -667.000000)" stroke-width="0.8" stroke="#FFFFFF" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-138.000000, -667.000000)" stroke-width="0.8" stroke="#FFFFFF" fill="#9B9BAB">
             <g id="camera" transform="translate(139.000000, 668.000000)">
                 <path d="M40.8632812,4.70507812 L34.5683594,4.70507812 C31.4316406,4.70507812 29.8632812,0 26.7050781,0 L17.2949219,0 C14.1367188,0 12.5683594,4.70507812 9.43164062,4.70507812 L3.13671875,4.70507812 C1.39648438,4.70507812 0,6.12304688 0,7.86328125 L0,29.8632812 C0,31.5820312 1.39648438,33 3.13671875,33 L40.8632812,33 C42.5820312,33 44,31.5820312 44,29.8632812 L44,7.86328125 C44,6.12304688 42.5820312,4.70507812 40.8632812,4.70507812 L40.8632812,4.70507812 Z M42.4316406,29.8632812 C42.4316406,30.7226562 41.7226562,31.4316406 40.8632812,31.4316406 L3.13671875,31.4316406 C2.27734375,31.4316406 1.56835938,30.7226562 1.56835938,29.8632812 L1.56835938,7.86328125 C1.56835938,6.98242188 2.27734375,6.2734375 3.13671875,6.2734375 L9.43164062,6.2734375 C13.3632812,6.2734375 14.9316406,1.56835938 17.2949219,1.56835938 L26.8554688,1.56835938 C29.2617188,1.56835938 30.8945312,6.2734375 34.9335938,6.2734375 L40.8632812,6.2734375 C41.7226562,6.2734375 42.4316406,6.98242188 42.4316406,7.86328125 L42.4316406,29.8632812 Z M22,7.86328125 C16.8007812,7.86328125 12.5683594,12.0742188 12.5683594,17.2734375 C12.5683594,22.4941406 16.8007812,26.7050781 22,26.7050781 C27.1992188,26.7050781 31.4316406,22.4941406 31.4316406,17.2734375 C31.4316406,12.0742188 27.1992188,7.86328125 22,7.86328125 L22,7.86328125 Z M34.5683594,8.63671875 C33.7089844,8.63671875 33,9.34570312 33,10.2050781 C33,11.0859375 33.7089844,11.7734375 34.5683594,11.7734375 C35.4492188,11.7734375 36.1367188,11.0859375 36.1367188,10.2050781 C36.1367188,9.34570312 35.4492188,8.63671875 34.5683594,8.63671875 L34.5683594,8.63671875 Z M22,25.1367188 C17.6601562,25.1367188 14.1367188,21.6132812 14.1367188,17.2734375 C14.1367188,12.9335938 17.6601562,9.43164062 22,9.43164062 C26.3398438,9.43164062 29.8632812,12.9335938 29.8632812,17.2734375 C29.8632812,21.6132812 26.3398438,25.1367188 22,25.1367188 L22,25.1367188 Z M22,11 C18.5195312,11 15.7050781,13.8144531 15.7050781,17.2734375 C15.7050781,20.7539062 18.5195312,23.5683594 22,23.5683594 C25.4804688,23.5683594 28.2949219,20.7539062 28.2949219,17.2734375 C28.2949219,13.8144531 25.4804688,11 22,11 L22,11 Z M22,22 C19.4003906,22 17.2949219,19.8945312 17.2949219,17.2734375 C17.2949219,14.6738281 19.4003906,12.5683594 22,12.5683594 C24.5996094,12.5683594 26.7050781,14.6738281 26.7050781,17.2734375 C26.7050781,19.8945312 24.5996094,22 22,22 L22,22 Z"></path>
             </g>
diff --git a/www/img/mcc-icons/car.svg b/www/img/mcc-icons/car.svg
index 299164f0f..df7094476 100644
--- a/www/img/mcc-icons/car.svg
+++ b/www/img/mcc-icons/car.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -719.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -719.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB">
             <g id="car" transform="translate(140.000000, 720.000000)">
                 <path d="M42.4316406,17.2734375 C40.8632812,1.56835938 33,0 31.4316406,0 L12.5683594,0 C11,0 3.13671875,1.56835938 1.56835938,17.2734375 C0.708984375,17.2734375 0,17.9824219 0,18.8417969 L0,35.3417969 C0,37.5117188 1.76171875,39.2734375 3.93164062,39.2734375 C6.1015625,39.2734375 7.86328125,37.5117188 7.86328125,35.3417969 L7.86328125,33 L36.1367188,33 L36.1367188,35.3417969 C36.1367188,37.5117188 37.8984375,39.2734375 40.0683594,39.2734375 C42.2382812,39.2734375 44,37.5117188 44,35.3417969 L44,18.8417969 C44,17.9824219 43.2910156,17.2734375 42.4316406,17.2734375 L42.4316406,17.2734375 Z M12.5683594,1.56835938 L31.4316406,1.56835938 C32.2050781,1.56835938 39.2949219,3.13671875 40.8632812,17.2734375 L3.13671875,17.2734375 C4.70507812,3.13671875 11.7949219,1.56835938 12.5683594,1.56835938 L12.5683594,1.56835938 Z M42.4316406,31.4101562 L1.56835938,31.4101562 L1.56835938,18.8417969 L42.4316406,18.8417969 L42.4316406,31.4101562 Z M36.1367188,28.2734375 C37.8769531,28.2734375 39.2949219,26.8769531 39.2949219,25.1367188 C39.2949219,23.3964844 37.8769531,22 36.1367188,22 C34.3964844,22 33,23.3964844 33,25.1367188 C33,26.8769531 34.3964844,28.2734375 36.1367188,28.2734375 L36.1367188,28.2734375 Z M7.86328125,28.2734375 C9.60351562,28.2734375 11,26.8769531 11,25.1367188 C11,23.3964844 9.60351562,22 7.86328125,22 C6.12304688,22 4.70507812,23.3964844 4.70507812,25.1367188 C4.70507812,26.8769531 6.12304688,28.2734375 7.86328125,28.2734375 L7.86328125,28.2734375 Z M36.1367188,23.5683594 C37.0175781,23.5683594 37.7050781,24.2773438 37.7050781,25.1367188 C37.7050781,25.9960938 37.0175781,26.7050781 36.1367188,26.7050781 C35.2773438,26.7050781 34.5683594,25.9960938 34.5683594,25.1367188 C34.5683594,24.2773438 35.2773438,23.5683594 36.1367188,23.5683594 L36.1367188,23.5683594 Z M7.86328125,23.5683594 C8.72265625,23.5683594 9.43164062,24.2773438 9.43164062,25.1367188 C9.43164062,25.9960938 8.72265625,26.7050781 7.86328125,26.7050781 C6.98242188,26.7050781 6.29492188,25.9960938 6.29492188,25.1367188 C6.29492188,24.2773438 6.98242188,23.5683594 7.86328125,23.5683594 L7.86328125,23.5683594 Z M14.9316406,26.7050781 L29.0683594,26.7050781 C29.4980469,26.7050781 29.8632812,26.3613281 29.8632812,25.9101562 C29.8632812,25.4804688 29.4980469,25.1367188 29.0683594,25.1367188 L14.9316406,25.1367188 C14.5019531,25.1367188 14.1367188,25.4804688 14.1367188,25.9101562 C14.1367188,26.3613281 14.5019531,26.7050781 14.9316406,26.7050781 L14.9316406,26.7050781 Z M42.4316406,35.3417969 C42.4316406,36.6523438 41.3789062,37.7050781 40.0683594,37.7050781 C38.7792969,37.7050781 37.7050781,36.6523438 37.7050781,35.3417969 L37.7050781,33 L42.4316406,33 L42.4316406,35.3417969 Z M6.29492188,35.3417969 C6.29492188,36.6523438 5.22070312,37.7050781 3.93164062,37.7050781 C2.62109375,37.7050781 1.56835938,36.6523438 1.56835938,35.3417969 L1.56835938,33 L6.29492188,33 L6.29492188,35.3417969 Z" id="Shape"></path>
             </g>
diff --git a/www/img/mcc-icons/clean.svg b/www/img/mcc-icons/clean.svg
index 2ca8b4179..2bf263eb4 100644
--- a/www/img/mcc-icons/clean.svg
+++ b/www/img/mcc-icons/clean.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-146.000000, -781.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-146.000000, -781.000000)" stroke="#9B9BAB">
             <g id="clean" transform="translate(146.000000, 781.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M16,44 L16,40" id="Shape"></path>
diff --git a/www/img/mcc-icons/clock.svg b/www/img/mcc-icons/clock.svg
index 2fd640f72..abfae8e81 100644
--- a/www/img/mcc-icons/clock.svg
+++ b/www/img/mcc-icons/clock.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" font-weight="normal" font-family="SSGlyphish-Outlined, SS Glyphish" line-spacing="53" font-size="44">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -849.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -849.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB">
             <g id="clock" transform="translate(140.000000, 851.000000)">
                 <text>
                     <tspan x="0" y="47">clock</tspan>
diff --git a/www/img/mcc-icons/cocktail.svg b/www/img/mcc-icons/cocktail.svg
index c332c169c..ac72141c8 100644
--- a/www/img/mcc-icons/cocktail.svg
+++ b/www/img/mcc-icons/cocktail.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-141.000000, -929.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-141.000000, -929.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB">
             <g id="cocktail" transform="translate(141.000000, 930.000000)">
                 <path d="M32.7949219,44 C33.2246094,44 33.5683594,43.65625 33.5683594,43.2050781 C33.5683594,42.7753906 33.2246094,42.4316406 32.7949219,42.4316406 L21.7949219,42.4316406 L21.7949219,23.1171875 L41.1953125,4.49023438 C41.3242188,4.33984375 41.4316406,4.14648438 41.4316406,3.93164062 C41.4316406,3.50195312 41.0664062,3.13671875 40.6367188,3.13671875 L29.0136719,3.13671875 L30.3027344,1.22460938 L30.28125,1.203125 C30.3671875,1.09570312 30.4316406,0.9453125 30.4316406,0.794921875 C30.4316406,0.34375 30.0664062,0 29.6367188,0 C29.3789062,0 29.1425781,0.150390625 28.9921875,0.365234375 L28.9921875,0.34375 L27.1230469,3.13671875 L1.36328125,3.13671875 C0.93359375,3.13671875 0.568359375,3.50195312 0.568359375,3.93164062 C0.568359375,4.14648438 0.67578125,4.33984375 0.8046875,4.49023438 L20.2050781,23.1171875 L20.2050781,42.4316406 L9.20507812,42.4316406 C8.77539062,42.4316406 8.43164062,42.7753906 8.43164062,43.2050781 C8.43164062,43.65625 8.77539062,44 9.20507812,44 L32.7949219,44 Z M27.9609375,4.70507812 L38.6816406,4.70507812 L33.1171875,10.0546875 C32.4726562,10.2695312 28.4765625,11.4296875 24.4160156,10.8496094 C24.3300781,10.7207031 24.2226562,10.6132812 24.1152344,10.5058594 L27.9609375,4.70507812 Z M26.0703125,4.70507812 L22.8046875,9.625 C22.4824219,9.51757812 22.1386719,9.43164062 21.7949219,9.43164062 C21.34375,9.43164062 20.9140625,9.51757812 20.5273438,9.68945312 C18.5507812,8.91601562 16.703125,8.63671875 15.0703125,8.63671875 C11.5253906,8.63671875 9.07617188,9.94726562 8.90429688,10.0117188 L3.31835938,4.70507812 L26.0703125,4.70507812 Z M21,21.6992188 L10.0644531,11.1933594 C10.9238281,10.8496094 12.7714844,10.2265625 15.1132812,10.2265625 C16.3378906,10.2265625 17.7128906,10.3769531 19.1523438,10.8496094 C18.8300781,11.34375 18.6367188,11.9453125 18.6367188,12.5683594 C18.6367188,13.40625 18.9589844,14.1367188 19.4960938,14.6953125 L18.6367188,17.2734375 L20.6992188,15.5117188 C21.0429688,15.640625 21.4082031,15.7050781 21.7949219,15.7050781 C23.5566406,15.7050781 24.9101562,14.2226562 24.9101562,12.4394531 C26.7792969,12.6328125 28.8417969,12.5898438 30.8613281,12.2246094 L21,21.6992188 Z M23.3632812,12.5683594 C23.3632812,13.4492188 22.6542969,14.1367188 21.7949219,14.1367188 C20.9140625,14.1367188 20.2050781,13.4492188 20.2050781,12.5683594 C20.2050781,11.7089844 20.9140625,11 21.7949219,11 C22.6542969,11 23.3632812,11.7089844 23.3632812,12.5683594 L23.3632812,12.5683594 Z" id="Shape"></path>
             </g>
diff --git a/www/img/mcc-icons/coins.svg b/www/img/mcc-icons/coins.svg
index 692866c8e..8753a2cd8 100644
--- a/www/img/mcc-icons/coins.svg
+++ b/www/img/mcc-icons/coins.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-148.000000, -999.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-148.000000, -999.000000)" stroke="#9B9BAB">
             <g id="coins" transform="translate(148.000000, 999.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M12.5,32.3 C11.2,32.7 9.7,33 8,33 C3.6,33 0,31.2 0,29 C0,28 0.7,27.2 1.8,26.5" id="Shape"></path>
diff --git a/www/img/mcc-icons/computer.svg b/www/img/mcc-icons/computer.svg
index a897e1644..442e7f36a 100644
--- a/www/img/mcc-icons/computer.svg
+++ b/www/img/mcc-icons/computer.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1066.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1066.000000)" stroke="#9B9BAB">
             <g id="computer" transform="translate(140.000000, 1066.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M28,36 L28,44" id="Shape"></path>
diff --git a/www/img/mcc-icons/default.svg b/www/img/mcc-icons/default.svg
index 379fa3d0c..1458e3115 100644
--- a/www/img/mcc-icons/default.svg
+++ b/www/img/mcc-icons/default.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -1136.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -1136.000000)" stroke="#9B9BAB">
             <g id="default" transform="translate(140.000000, 1137.000000)">
                 <g id="Group">
                     <path d="M0,8 L44,8" id="Shape"></path>
diff --git a/www/img/mcc-icons/diamond-ring.svg b/www/img/mcc-icons/diamond-ring.svg
index 380d77351..c8acf7c60 100644
--- a/www/img/mcc-icons/diamond-ring.svg
+++ b/www/img/mcc-icons/diamond-ring.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-142.000000, -1198.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-142.000000, -1198.000000)" stroke="#9B9BAB">
             <g id="diamond-ring" transform="translate(142.000000, 1198.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M0,12 L40,12" id="Shape"></path>
diff --git a/www/img/mcc-icons/dollar-topup.svg b/www/img/mcc-icons/dollar-topup.svg
index 06d7eef77..2dd9cf755 100644
--- a/www/img/mcc-icons/dollar-topup.svg
+++ b/www/img/mcc-icons/dollar-topup.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-269.000000, -20.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-269.000000, -20.000000)" stroke="#9B9BAB">
             <g id="dollar-topup" transform="translate(269.000000, 20.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M40,20 C40,31 31,40 20,40 C9,40 0,31 0,20 C0,9 9,0 20,0 C27.9,0 34.8,4.6 38,11.3" id="Shape"></path>
diff --git a/www/img/mcc-icons/euro-topup.svg b/www/img/mcc-icons/euro-topup.svg
index 30f2782a1..07d7f65bf 100644
--- a/www/img/mcc-icons/euro-topup.svg
+++ b/www/img/mcc-icons/euro-topup.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-319.000000, -20.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-319.000000, -20.000000)" stroke="#9B9BAB">
             <g id="euro-topup" transform="translate(319.000000, 20.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M40,20 C40,31 31,40 20,40 C9,40 0,31 0,20 C0,9 9,0 20,0 C27.9,0 34.8,4.6 38,11.3" id="Shape"></path>
diff --git a/www/img/mcc-icons/film.svg b/www/img/mcc-icons/film.svg
index c66e4cbed..71595e207 100644
--- a/www/img/mcc-icons/film.svg
+++ b/www/img/mcc-icons/film.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -1265.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -1265.000000)" stroke="#9B9BAB">
             <g id="film" transform="translate(139.000000, 1265.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M0,0 L0,44" id="Shape"></path>
diff --git a/www/img/mcc-icons/food.svg b/www/img/mcc-icons/food.svg
index d78db31fc..b75ddfa89 100644
--- a/www/img/mcc-icons/food.svg
+++ b/www/img/mcc-icons/food.svg
@@ -7,7 +7,7 @@
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="-Transaction-icons" transform="translate(-630.000000, -273.000000)">
             <g id="food" transform="translate(631.000000, 274.000000)">
-                <g id="food-48px-outline_cheeseburger" transform="translate(15.000000, 18.000000)" stroke="#343434">
+                <g id="food-48px-outline_cheeseburger" transform="translate(15.000000, 18.000000)" stroke="#9B9BAB">
                     <g id="Group" transform="translate(0.288889, 0.294872)">
                         <path d="M2.31111111,17.6333333 L2.31111111,17.6333333 C2.31111111,20.2871795 4.39111111,22.4102564 6.99111111,22.4102564 L18.4311111,22.4102564 C21.0311111,22.4102564 23.1111111,20.2871795 23.1111111,17.6333333 L23.1111111,17.6333333" id="Shape"></path>
                         <path d="M2.31111111,8.25641026 C2.31111111,3.71538462 5.95111111,0 10.4,0 L15.0222222,0 C19.4711111,0 23.1111111,3.71538462 23.1111111,8.25641026 L23.1111111,8.25641026" id="Shape"></path>
@@ -15,7 +15,7 @@
                         <path d="M22.5333333,11.7948718 C24.1511111,11.7948718 25.4222222,13.0923077 25.4222222,14.7435897 L25.4222222,14.7435897 C25.4222222,16.3948718 24.1511111,17.6923077 22.5333333,17.6923077 L2.88888889,17.6923077 C1.27111111,17.6923077 0,16.3948718 0,14.7435897 L0,14.7435897 C0,13.0923077 1.27111111,11.7948718 2.88888889,11.7948718" id="Shape"></path>
                     </g>
                 </g>
-                <path d="M2.02079504,9.4359375 L13.3424288,9.4359375 L11.5029871,18.15 C9.19720818,17.2734375 7.046875,16.9640625 5.18152574,16.9640625 C4.37838925,16.9640625 3.62706801,17.015625 2.92756204,17.11875 L2.02079504,9.4359375 Z M21.3997013,19.6710937 C19.0680147,19.9289062 16.1404527,19.8773437 13.2906135,18.8460937 L15.2855009,9.4359375 L22.6173598,9.4359375 L21.3997013,19.6710937 Z M5.57014017,39.6 L3.13482307,19.0007813 C3.78251379,18.9234375 4.50792739,18.871875 5.23334099,18.871875 C7.02096737,18.871875 9.01585478,19.1554688 11.1143727,20.00625 L7.5909352,36.5835938 L7.61684283,36.5835938 C7.61684283,36.6609375 7.5909352,36.7125 7.5909352,36.7898438 C7.5909352,37.3054688 8.00545726,37.7179688 8.52360983,37.7179688 C8.98994715,37.7179688 9.35265395,37.4085938 9.43037684,36.9703125 L9.45628447,36.9703125 L12.9019991,20.7023438 C15.1818704,21.4757813 18.1094324,21.8367188 21.1924403,21.5789063 L19.0421071,39.6 L5.57014017,39.6 Z M19.8970588,41.5078125 C20.3893038,41.5078125 20.7779182,41.1210938 20.8297335,40.6570313 L24.6381549,8.5078125 C24.6381549,7.96640625 24.1977252,7.55390625 23.6795726,7.55390625 L15.6741153,7.55390625 L16.8658663,1.9078125 L27.487994,1.9078125 C28.0061466,1.9078125 28.4206687,1.46953125 28.4206687,0.95390625 C28.4206687,0.43828125 28.0061466,0 27.487994,0 L16.114545,0 C15.6482077,0 15.2855009,0.33515625 15.207778,0.7734375 L15.1818704,0.74765625 L13.7310432,7.55390625 L0.958582261,7.55390625 C0.414522059,7.55390625 0,7.96640625 0,8.5078125 L3.80842142,40.6570313 C3.86023667,41.1210938 4.2488511,41.5078125 4.74109605,41.5078125 L19.8970588,41.5078125 Z" id="Path" stroke="#FFFFFF" stroke-width="0.8" fill="#000000"></path>
+                <path d="M2.02079504,9.4359375 L13.3424288,9.4359375 L11.5029871,18.15 C9.19720818,17.2734375 7.046875,16.9640625 5.18152574,16.9640625 C4.37838925,16.9640625 3.62706801,17.015625 2.92756204,17.11875 L2.02079504,9.4359375 Z M21.3997013,19.6710937 C19.0680147,19.9289062 16.1404527,19.8773437 13.2906135,18.8460937 L15.2855009,9.4359375 L22.6173598,9.4359375 L21.3997013,19.6710937 Z M5.57014017,39.6 L3.13482307,19.0007813 C3.78251379,18.9234375 4.50792739,18.871875 5.23334099,18.871875 C7.02096737,18.871875 9.01585478,19.1554688 11.1143727,20.00625 L7.5909352,36.5835938 L7.61684283,36.5835938 C7.61684283,36.6609375 7.5909352,36.7125 7.5909352,36.7898438 C7.5909352,37.3054688 8.00545726,37.7179688 8.52360983,37.7179688 C8.98994715,37.7179688 9.35265395,37.4085938 9.43037684,36.9703125 L9.45628447,36.9703125 L12.9019991,20.7023438 C15.1818704,21.4757813 18.1094324,21.8367188 21.1924403,21.5789063 L19.0421071,39.6 L5.57014017,39.6 Z M19.8970588,41.5078125 C20.3893038,41.5078125 20.7779182,41.1210938 20.8297335,40.6570313 L24.6381549,8.5078125 C24.6381549,7.96640625 24.1977252,7.55390625 23.6795726,7.55390625 L15.6741153,7.55390625 L16.8658663,1.9078125 L27.487994,1.9078125 C28.0061466,1.9078125 28.4206687,1.46953125 28.4206687,0.95390625 C28.4206687,0.43828125 28.0061466,0 27.487994,0 L16.114545,0 C15.6482077,0 15.2855009,0.33515625 15.207778,0.7734375 L15.1818704,0.74765625 L13.7310432,7.55390625 L0.958582261,7.55390625 C0.414522059,7.55390625 0,7.96640625 0,8.5078125 L3.80842142,40.6570313 C3.86023667,41.1210938 4.2488511,41.5078125 4.74109605,41.5078125 L19.8970588,41.5078125 Z" id="Path" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB"></path>
                 <path d="M5.57014017,39.6 L3.13482307,19.0007813 C3.78251379,18.9234375 4.50792739,18.871875 5.23334099,18.871875 C7.02096737,18.871875 9.01585478,19.1554688 11.1143727,20.00625 L7.5909352,36.5835938 L7.61684283,36.5835938 C7.61684283,36.6609375 7.5909352,36.7125 7.5909352,36.7898438 C7.5909352,37.3054688 8.00545726,37.7179688 8.52360983,37.7179688 C8.98994715,37.7179688 9.35265395,37.4085938 9.43037684,36.9703125 L9.45628447,36.9703125 L12.9019991,20.7023438 C15.1818704,21.4757813 18.1094324,21.8367188 21.1924403,21.5789063 L19.0421071,39.6 L5.57014017,39.6 Z" id="Path-Copy" stroke="#FFFFFF" stroke-width="0.8" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/www/img/mcc-icons/football.svg b/www/img/mcc-icons/football.svg
index b790ee7eb..98cdc5733 100644
--- a/www/img/mcc-icons/football.svg
+++ b/www/img/mcc-icons/football.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1335.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1335.000000)" stroke="#9B9BAB">
             <g id="football" transform="translate(140.000000, 1335.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M22,32 L0,32 L0,42 C12.166667,42 12,26.333334 12,20" id="Shape"></path>
diff --git a/www/img/mcc-icons/furniture.svg b/www/img/mcc-icons/furniture.svg
index 0ad767826..3db75a2e3 100644
--- a/www/img/mcc-icons/furniture.svg
+++ b/www/img/mcc-icons/furniture.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1475.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1475.000000)" stroke="#9B9BAB">
             <g id="furniture" transform="translate(140.000000, 1475.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M0,36 L44,36" id="Shape"></path>
diff --git a/www/img/mcc-icons/game.svg b/www/img/mcc-icons/game.svg
index b8c90ab5a..b6571727a 100644
--- a/www/img/mcc-icons/game.svg
+++ b/www/img/mcc-icons/game.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1531.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1531.000000)" stroke="#9B9BAB">
             <g id="game" transform="translate(140.000000, 1531.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M32,38 L12,38 C5.4,38 0,32.6 0,26 L0,26 C0,19.4 5.4,14 12,14 L32,14 C38.6,14 44,19.4 44,26 L44,26 C44,32.6 38.6,38 32,38 L32,38 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/gas.svg b/www/img/mcc-icons/gas.svg
index 8d4fb7cba..2ca1b629c 100644
--- a/www/img/mcc-icons/gas.svg
+++ b/www/img/mcc-icons/gas.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -1594.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -1594.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB">
             <g id="gas" transform="translate(140.000000, 1595.000000)">
                 <path d="M23.5683594,36.1582031 L4.70507812,36.1582031 L4.70507812,1.56835938 L23.5683594,1.56835938 L23.5683594,36.1582031 Z M22,3.15820313 L6.29492188,3.15820313 L6.29492188,15.7265625 L22,15.7265625 L22,3.15820313 Z M20.4316406,14.1582031 L7.86328125,14.1582031 L7.86328125,4.7265625 L20.4316406,4.7265625 L20.4316406,14.1582031 Z M43.0546875,27.4570312 C42.4101562,26.1035156 41.6582031,24.5566406 41.6582031,21.9570312 C41.6582031,17.9824219 42.4316406,18.8847656 42.4316406,16.4570312 C42.4316406,14.3300781 41.25,12.8261719 39.0585938,11.3652344 C40.3691406,8.37890625 35.0625,6.875 35.0625,6.875 C31.9472656,6.1015625 30.3789062,6.1015625 29.5839844,6.875 C28.8105469,7.6484375 28.8105469,8.421875 30.3789062,8.421875 C31.796875,8.421875 35.4277344,15.5761719 38.1992188,12.6757812 C40.3691406,14.1152344 40.8632812,15.2109375 40.8632812,16.4570312 C40.8632812,18.6269531 40.0898438,17.9609375 40.0898438,21.9570312 C40.0898438,24.9003906 40.9492188,26.7050781 41.6367188,28.1445312 C42.0878906,29.0683594 42.4316406,29.8203125 42.4316406,30.6152344 C42.4316406,33.2578125 41.2070312,36.1152344 37.7265625,36.1152344 C35.75,36.1152344 34.3320312,35.6425781 33.4296875,34.6542969 C31.625,32.7636719 31.8613281,29.046875 32.0761719,25.4589844 C32.1621094,24.2988281 32.2265625,23.2890625 32.2265625,22.171875 C32.2265625,20.2167969 31.6035156,18.7128906 30.3789062,17.7460938 C28.7246094,16.4140625 26.4257812,16.4140625 25.1367188,16.5429688 L25.1367188,1.56835938 C25.1367188,0.708984375 24.4492188,0 23.5683594,0 L4.70507812,0 C3.84570312,0 3.13671875,0.708984375 3.13671875,1.56835938 L3.13671875,36.1582031 L0.794921875,36.1582031 C0.34375,36.1582031 0,36.5019531 0,36.9316406 C0,37.3613281 0.34375,37.7265625 0.794921875,37.7265625 L27.5,37.7265625 C27.9296875,37.7265625 28.2949219,37.3613281 28.2949219,36.9316406 C28.2949219,36.5019531 27.9296875,36.1582031 27.5,36.1582031 L25.1367188,36.1582031 L25.1367188,18.1113281 C26.2753906,17.9824219 28.1875,18.0039062 29.390625,18.9707031 C30.2285156,19.6367188 30.6582031,20.7109375 30.6582031,22.171875 C30.6582031,23.2246094 30.59375,24.1699219 30.5078125,25.3730469 C30.2714844,29.2832031 30.0136719,33.34375 32.2695312,35.7285156 C33.515625,37.0390625 35.2773438,37.6835938 37.7265625,37.6835938 C42.3671875,37.6835938 44.0214844,33.859375 44.0214844,30.6152344 C44.0214844,29.4550781 43.5488281,28.4882812 43.0546875,27.4570312 L43.0546875,27.4570312 Z" id="Shape"></path>
             </g>
diff --git a/www/img/mcc-icons/golf.svg b/www/img/mcc-icons/golf.svg
index eb8702e83..c862db239 100644
--- a/www/img/mcc-icons/golf.svg
+++ b/www/img/mcc-icons/golf.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-142.000000, -1661.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-142.000000, -1661.000000)" stroke="#9B9BAB">
             <g id="golf" transform="translate(142.000000, 1661.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M36,14 L22,14 L22,10.3536139 C22,8.9009448 22.7875671,7.5624629 24.0574284,6.8569842 L34.0574265,1.3014289 C36.7235527,-0.1797516 40,1.7481208 40,4.798058 L40,10 C40,12.2091389 38.2091408,14 36,14 L36,14 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/hotel.svg b/www/img/mcc-icons/hotel.svg
index 1e38d1b1c..21275241c 100644
--- a/www/img/mcc-icons/hotel.svg
+++ b/www/img/mcc-icons/hotel.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1732.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1732.000000)" stroke="#9B9BAB">
             <g id="hotel" transform="translate(140.000000, 1732.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="8 44 0 44 0 26 8 26"></polyline>
diff --git a/www/img/mcc-icons/law.svg b/www/img/mcc-icons/law.svg
index b43462266..9621807e3 100644
--- a/www/img/mcc-icons/law.svg
+++ b/www/img/mcc-icons/law.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-138.000000, -1808.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-138.000000, -1808.000000)" stroke="#9B9BAB">
             <g id="law" transform="translate(138.000000, 1808.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="32 12 42 22 38 26 28 16"></polyline>
diff --git a/www/img/mcc-icons/mail.svg b/www/img/mcc-icons/mail.svg
index 058276221..7d4ddc4aa 100644
--- a/www/img/mcc-icons/mail.svg
+++ b/www/img/mcc-icons/mail.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -2076.000000)" stroke-width="0.8" stroke="#FFFFFF" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -2076.000000)" stroke-width="0.8" stroke="#FFFFFF" fill="#9B9BAB">
             <g id="mail" transform="translate(140.000000, 2077.000000)">
                 <path d="M42.4316406,0 L1.56835938,0 C0.708984375,0 0,0.6875 0,1.56835938 L0,26.7050781 C0,27.5859375 0.708984375,28.2734375 1.56835938,28.2734375 L42.4316406,28.2734375 C43.2910156,28.2734375 44,27.5859375 44,26.7050781 L44,1.56835938 C44,0.6875 43.2910156,0 42.4316406,0 L42.4316406,0 Z M40.7128906,1.56835938 L23.1171875,19.1640625 C22.8164063,19.4648438 22.4082031,19.6367188 22,19.6367188 C21.5917969,19.6367188 21.1835938,19.4648438 20.8613281,19.1640625 L3.265625,1.56835938 L40.7128906,1.56835938 Z M42.4316406,26.2324219 L30.3359375,14.1367188 L42.4316406,2.04101562 L42.4316406,26.2324219 Z M1.56835938,2.0625 L13.6425781,14.1367188 L1.56835938,26.2109375 L1.56835938,2.0625 Z M3.265625,26.7050781 L14.7382812,15.2109375 L19.7871094,20.28125 C20.4101562,20.8828125 21.2050781,21.1835938 21.9785156,21.1835938 C22.7734375,21.1835938 23.5683594,20.8828125 24.1699219,20.28125 L29.2402344,15.2109375 L40.7128906,26.7050781 L3.265625,26.7050781 Z"></path>
             </g>
diff --git a/www/img/mcc-icons/medical.svg b/www/img/mcc-icons/medical.svg
index 10b986d54..ab9396a9c 100644
--- a/www/img/mcc-icons/medical.svg
+++ b/www/img/mcc-icons/medical.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1871.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1871.000000)" stroke="#9B9BAB">
             <g id="medical" transform="translate(140.000000, 1871.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M14,30 L14,32 C14,38.6 19.4,44 26,44 L26,44 C32.6,44 38,38.6 38,32 L38,32" id="Shape"></path>
diff --git a/www/img/mcc-icons/money.svg b/www/img/mcc-icons/money.svg
index 74477aacb..ab2f8cb62 100644
--- a/www/img/mcc-icons/money.svg
+++ b/www/img/mcc-icons/money.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2012.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2012.000000)" stroke="#9B9BAB">
             <g id="money" transform="translate(140.000000, 2012.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M32,12 L12,12 C12,15.3 9.3,18 6,18 L6,26 C9.3,26 12,28.7 12,32 L32,32 C32,28.7 34.7,26 38,26 L38,18 C34.7,18 32,15.3 32,12 L32,12 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/motorcycle.svg b/www/img/mcc-icons/motorcycle.svg
index ef452c618..de7c042fa 100644
--- a/www/img/mcc-icons/motorcycle.svg
+++ b/www/img/mcc-icons/motorcycle.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -1942.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -1942.000000)" stroke="#9B9BAB">
             <g id="motorcycle" transform="translate(140.000000, 1942.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M-1.77635684e-15,34 L21.1169434,34 C22.8387452,34 24.3671875,32.8981934 24.9117432,31.2648926 L28.2449952,21.2648926 C29.1083984,18.6748047 27.180542,16 24.4503174,16 L0.8271484,16" id="Shape"></path>
diff --git a/www/img/mcc-icons/music.svg b/www/img/mcc-icons/music.svg
index ec9916802..7d11f7e9e 100644
--- a/www/img/mcc-icons/music.svg
+++ b/www/img/mcc-icons/music.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-85.000000, -605.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-85.000000, -605.000000)" stroke="#9B9BAB">
             <g id="music" transform="translate(85.000000, 605.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M12,10 L12,34" id="Shape"></path>
diff --git a/www/img/mcc-icons/newspaper.svg b/www/img/mcc-icons/newspaper.svg
index 041f29c87..e564969f0 100644
--- a/www/img/mcc-icons/newspaper.svg
+++ b/www/img/mcc-icons/newspaper.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -2137.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -2137.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB">
             <g id="newspaper" transform="translate(140.000000, 2138.000000)">
                 <path d="M42.4316406,0 L7.86328125,0 C6.98242188,0 6.29492188,0.708984375 6.29492188,1.56835938 L6.29492188,6.29492188 L1.56835938,6.29492188 C0.708984375,6.29492188 0,7.00390625 0,7.86328125 L0,29.8632812 C0,32.4628906 2.10546875,34.5683594 4.70507812,34.5683594 L42.4316406,34.5683594 C43.2910156,34.5683594 44,33.8808594 44,33 L44,1.56835938 C44,0.708984375 43.2910156,0 42.4316406,0 L42.4316406,0 Z M27.5,6.29492188 L38.5,6.29492188 C38.9296875,6.29492188 39.2949219,5.95117188 39.2949219,5.5 C39.2949219,5.0703125 38.9296875,4.7265625 38.5,4.7265625 L27.5,4.7265625 C27.0703125,4.7265625 26.7050781,5.0703125 26.7050781,5.5 C26.7050781,5.95117188 27.0703125,6.29492188 27.5,6.29492188 L27.5,6.29492188 Z M11.7949219,20.4316406 L22.7949219,20.4316406 C23.2246094,20.4316406 23.5683594,20.0878906 23.5683594,19.6582031 L23.5683594,5.5 C23.5683594,5.0703125 23.2246094,4.7265625 22.7949219,4.7265625 L11.7949219,4.7265625 C11.34375,4.7265625 11,5.0703125 11,5.5 L11,19.6582031 C11,20.0878906 11.34375,20.4316406 11.7949219,20.4316406 L11.7949219,20.4316406 Z M12.5683594,6.29492188 L22,6.29492188 L22,18.8632812 L12.5683594,18.8632812 L12.5683594,6.29492188 Z M42.4316406,33 L4.70507812,33 C2.98632812,33 1.56835938,31.6035156 1.56835938,29.8632812 L1.56835938,7.86328125 L6.29492188,7.86328125 L6.29492188,29.0683594 C6.29492188,29.5195312 6.63867188,29.8632812 7.06835938,29.8632812 C7.49804688,29.8632812 7.86328125,29.5195312 7.86328125,29.0683594 L7.86328125,1.56835938 L42.4316406,1.56835938 L42.4316406,33 Z M27.5,11 L38.5,11 C38.9296875,11 39.2949219,10.65625 39.2949219,10.2265625 C39.2949219,9.796875 38.9296875,9.43164062 38.5,9.43164062 L27.5,9.43164062 C27.0703125,9.43164062 26.7050781,9.796875 26.7050781,10.2265625 C26.7050781,10.65625 27.0703125,11 27.5,11 L27.5,11 Z M27.5,15.7265625 L38.5,15.7265625 C38.9296875,15.7265625 39.2949219,15.3613281 39.2949219,14.9316406 C39.2949219,14.5019531 38.9296875,14.1582031 38.5,14.1582031 L27.5,14.1582031 C27.0703125,14.1582031 26.7050781,14.5019531 26.7050781,14.9316406 C26.7050781,15.3613281 27.0703125,15.7265625 27.5,15.7265625 L27.5,15.7265625 Z M27.5,20.4316406 L38.5,20.4316406 C38.9296875,20.4316406 39.2949219,20.0878906 39.2949219,19.6582031 C39.2949219,19.2070312 38.9296875,18.8632812 38.5,18.8632812 L27.5,18.8632812 C27.0703125,18.8632812 26.7050781,19.2070312 26.7050781,19.6582031 C26.7050781,20.0878906 27.0703125,20.4316406 27.5,20.4316406 L27.5,20.4316406 Z M11.7949219,25.1582031 L38.5,25.1582031 C38.9296875,25.1582031 39.2949219,24.7929688 39.2949219,24.3632812 C39.2949219,23.9335938 38.9296875,23.5683594 38.5,23.5683594 L11.7949219,23.5683594 C11.34375,23.5683594 11,23.9335938 11,24.3632812 C11,24.7929688 11.34375,25.1582031 11.7949219,25.1582031 L11.7949219,25.1582031 Z M11.7949219,29.8632812 L38.5,29.8632812 C38.9296875,29.8632812 39.2949219,29.5195312 39.2949219,29.0683594 C39.2949219,28.6386719 38.9296875,28.2949219 38.5,28.2949219 L11.7949219,28.2949219 C11.34375,28.2949219 11,28.6386719 11,29.0683594 C11,29.5195312 11.34375,29.8632812 11.7949219,29.8632812 L11.7949219,29.8632812 Z" id="news"></path>
             </g>
diff --git a/www/img/mcc-icons/park.svg b/www/img/mcc-icons/park.svg
index 2cf0741bf..87c4348d6 100644
--- a/www/img/mcc-icons/park.svg
+++ b/www/img/mcc-icons/park.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-142.000000, -2203.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-142.000000, -2203.000000)" stroke="#9B9BAB">
             <g id="park" transform="translate(142.000000, 2203.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="12.12499 20 0 20 10 0 15.79992 11.60019"></polyline>
diff --git a/www/img/mcc-icons/people.svg b/www/img/mcc-icons/people.svg
index 55949d8a0..3126e0600 100644
--- a/www/img/mcc-icons/people.svg
+++ b/www/img/mcc-icons/people.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-146.000000, -2406.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-146.000000, -2406.000000)" stroke="#9B9BAB">
             <g id="people" transform="translate(146.000000, 2406.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M16,24 L16,24 C10.5,24 6,19.5 6,14 L6,10 C6,4.5 10.5,0 16,0 L16,0 C21.5,0 26,4.5 26,10 L26,14 C26,19.5 21.5,24 16,24 L16,24 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/pet.svg b/www/img/mcc-icons/pet.svg
index 49a4197fd..220ae5a39 100644
--- a/www/img/mcc-icons/pet.svg
+++ b/www/img/mcc-icons/pet.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2340.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2340.000000)" stroke="#9B9BAB">
             <g id="pet" transform="translate(138.000000, 2339.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <ellipse id="Oval" stroke-width="1.0000012" transform="translate(16.666687, 7.064971) rotate(-3.000802) translate(-16.666687, -7.064971) " cx="16.6666868" cy="7.06497084" rx="4.40000528" ry="5.86667704"></ellipse>
diff --git a/www/img/mcc-icons/plant.svg b/www/img/mcc-icons/plant.svg
index 1c4af2748..a579234f2 100644
--- a/www/img/mcc-icons/plant.svg
+++ b/www/img/mcc-icons/plant.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-150.000000, -2269.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-150.000000, -2269.000000)" stroke="#9B9BAB">
             <g id="plant" transform="translate(150.000000, 2269.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M0,24 C0,14.125 12,0 12,0 C12,0 24,14.125 24,24 C24,30.62742 18.62742,34 12,34 C5.37258,34 0,30.62742 0,24 L0,24 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/purchase.svg b/www/img/mcc-icons/purchase.svg
index 5a24fc1b0..1f7c914e0 100644
--- a/www/img/mcc-icons/purchase.svg
+++ b/www/img/mcc-icons/purchase.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-141.000000, -2475.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-141.000000, -2475.000000)" stroke="#9B9BAB">
             <g id="purchase" transform="translate(141.000000, 2475.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polygon id="Shape" points="24 42 42 24 18 0 0 0 0 18"></polygon>
diff --git a/www/img/mcc-icons/repair.svg b/www/img/mcc-icons/repair.svg
index 3904d394e..36a75b55c 100644
--- a/www/img/mcc-icons/repair.svg
+++ b/www/img/mcc-icons/repair.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2546.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2546.000000)" stroke="#9B9BAB">
             <g id="repair" transform="translate(140.000000, 2545.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M42.5,8.6 L36.6,14.5 L29.5,7.4 L35.4,1.5 C34,1.1 32.6,0.9 31,1 C25.4,1.5 20.9,6.5 21,12.1 C21,13.2 21.2,14.3 21.5,15.3 L2.3,32.3 C-0.6,34.8 -0.7,39.3 2,42 L2,42 C4.7,44.7 9.1,44.6 11.7,41.7 L28.7,22.5 C30.4,23 32.3,23.2 34.3,22.8 C38.3,22 41.6,19 42.7,15.1 C43.2,12.8 43.1,10.6 42.5,8.6 L42.5,8.6 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/sadface.svg b/www/img/mcc-icons/sadface.svg
index a1ad7bea8..963241c4a 100644
--- a/www/img/mcc-icons/sadface.svg
+++ b/www/img/mcc-icons/sadface.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2615.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2615.000000)" stroke="#9B9BAB">
             <g id="sadface" transform="translate(140.000000, 2615.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <circle id="Oval" cx="22" cy="22" r="22"></circle>
diff --git a/www/img/mcc-icons/scissors.svg b/www/img/mcc-icons/scissors.svg
index 7a4ed1519..519c03f53 100644
--- a/www/img/mcc-icons/scissors.svg
+++ b/www/img/mcc-icons/scissors.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-142.000000, -2686.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-142.000000, -2686.000000)" stroke="#9B9BAB">
             <g id="scissors" transform="translate(142.000000, 2686.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M10.878,30.505 L36,0" id="Shape"></path>
diff --git a/www/img/mcc-icons/search.svg b/www/img/mcc-icons/search.svg
index b77d2e5af..d1ec0ddf5 100644
--- a/www/img/mcc-icons/search.svg
+++ b/www/img/mcc-icons/search.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2752.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2752.000000)" stroke="#9B9BAB">
             <g id="search" transform="translate(140.000000, 2752.000000)">
                 <g id="Group" transform="translate(0.523256, 0.500000)">
                     <path d="M43.9534884,42 L32.127907,30.7" id="Shape"></path>
diff --git a/www/img/mcc-icons/shirt.svg b/www/img/mcc-icons/shirt.svg
index 2acdc5b0b..1f67a93fe 100644
--- a/www/img/mcc-icons/shirt.svg
+++ b/www/img/mcc-icons/shirt.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2880.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2880.000000)" stroke="#9B9BAB">
             <g id="shirt" transform="translate(140.000000, 2880.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M22,10 L22,44" id="Shape"></path>
diff --git a/www/img/mcc-icons/shoes.svg b/www/img/mcc-icons/shoes.svg
index f57f49f15..e460c4919 100644
--- a/www/img/mcc-icons/shoes.svg
+++ b/www/img/mcc-icons/shoes.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2955.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2955.000000)" stroke="#9B9BAB">
             <g id="shoes" transform="translate(140.000000, 2955.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="14.8 2.7 25 10 34 10"></polyline>
diff --git a/www/img/mcc-icons/smiley-face.svg b/www/img/mcc-icons/smiley-face.svg
index 847e7ec7e..99967b26e 100644
--- a/www/img/mcc-icons/smiley-face.svg
+++ b/www/img/mcc-icons/smiley-face.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -2814.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -2814.000000)" stroke="#9B9BAB">
             <g id="smiley-face" transform="translate(140.000000, 2814.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <circle id="Oval" cx="22" cy="22" r="22"></circle>
diff --git a/www/img/mcc-icons/suitcase.svg b/www/img/mcc-icons/suitcase.svg
index af48e1730..f18da30ed 100644
--- a/www/img/mcc-icons/suitcase.svg
+++ b/www/img/mcc-icons/suitcase.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-1111.000000, -751.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-1111.000000, -751.000000)" stroke="#9B9BAB">
             <g id="business-48px-outline_briefcase-25" transform="translate(1111.000000, 751.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="14 6 14 0 30 0 30 6"></polyline>
diff --git a/www/img/mcc-icons/telephone.svg b/www/img/mcc-icons/telephone.svg
index 2460721f9..370bd087f 100644
--- a/www/img/mcc-icons/telephone.svg
+++ b/www/img/mcc-icons/telephone.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-139.000000, -3009.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#000000">
+        <g id="-Transaction-icons" transform="translate(-139.000000, -3009.000000)" stroke="#FFFFFF" stroke-width="0.8" fill="#9B9BAB">
             <g id="telephone" transform="translate(140.000000, 3010.000000)">
                 <path d="M37.7480469,28.7272417 C32.4414062,25.2252886 30.9589844,26.1706011 28.9609375,27.9538042 C28.6171875,28.2545854 27.6289062,29.4147417 26.7265625,29.4147417 C26.46875,29.4147417 26.2753906,29.3288042 26.0605469,29.1354448 C22.515625,25.8483354 17.4453125,20.7995073 15.0605469,18.0709917 C14.8242187,17.7916948 14.78125,17.6198198 14.78125,17.4909136 C14.78125,16.8463823 16.0917969,15.8581011 16.4355469,15.6002886 C18.5410156,13.8385698 19.5507812,12.3561479 15.9628906,6.79169481 C13.0195312,2.23700731 11.1933594,0.410835431 9.25976562,0.0670854307 C8.03515625,-0.169242694 6.85351562,0.217476056 5.4140625,1.24872606 C2.921875,2.96747606 0.47265625,4.92255418 0.064453125,8.18817918 C-0.515625,12.9577104 3.48046875,19.7897417 13.0839844,30.4459917 L13.1484375,30.5319292 C22.3222656,39.7057573 29.1328125,44.0026323 34.5039062,44.0026323 C39.8105469,44.0026323 43.9785156,39.0397417 43.9785156,36.6120073 C43.9785156,34.0768511 41.7871094,31.4127886 37.7480469,28.7272417 L37.7480469,28.7272417 Z M34.5039063,42.4772417 C29.6484375,42.4772417 23.2890625,38.4811479 14.2871094,29.4791948 C5.13476563,19.3385698 1.1171875,12.6139604 1.6328125,8.36005418 C1.91210938,5.97528856 3.56640625,4.38544481 6.33789063,2.47333543 C7.41210938,1.69989793 8.22851563,1.42060106 8.95898438,1.54950731 C10.3554688,1.80731981 12.0527344,3.61200731 14.6308594,7.58661668 C17.7675781,12.4635698 16.8867188,13.2155229 15.4042969,14.4401323 C14.3515625,15.2995073 13.234375,16.2663042 13.234375,17.4909136 C13.234375,18.0924761 13.4921875,18.6295854 13.9433594,19.1237261 C16.5,21.9596636 21.3554688,26.9655229 24.9648438,30.2311479 C25.4589844,30.6823198 26.1035156,30.9186479 26.7695313,30.9186479 C28.2734375,30.9186479 29.6269531,29.4362261 30.0351563,29.0709917 C31.5605469,27.6959917 32.3339844,27.0084917 36.8671875,29.9948198 C40.390625,32.2936479 42.4101563,34.6354448 42.4101563,36.5905229 C42.4101563,38.3307573 38.8222656,42.4772417 34.5039063,42.4772417 L34.5039063,42.4772417 Z" id="phone"></path>
             </g>
diff --git a/www/img/mcc-icons/television.svg b/www/img/mcc-icons/television.svg
index 1dd0dac55..c6fcb6c60 100644
--- a/www/img/mcc-icons/television.svg
+++ b/www/img/mcc-icons/television.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -3081.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -3081.000000)" stroke="#9B9BAB">
             <g id="television" transform="translate(140.000000, 3081.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M16,4 L22,12" id="Shape"></path>
diff --git a/www/img/mcc-icons/tent.svg b/www/img/mcc-icons/tent.svg
index ba19f2dd1..54cb9e1c7 100644
--- a/www/img/mcc-icons/tent.svg
+++ b/www/img/mcc-icons/tent.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -3152.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -3152.000000)" stroke="#9B9BAB">
             <g id="tent" transform="translate(140.000000, 3152.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <circle id="Oval" cx="38" cy="6" r="6"></circle>
diff --git a/www/img/mcc-icons/ticket.svg b/www/img/mcc-icons/ticket.svg
index cf81a1272..6906c2577 100644
--- a/www/img/mcc-icons/ticket.svg
+++ b/www/img/mcc-icons/ticket.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -3222.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -3222.000000)" stroke="#9B9BAB">
             <g id="ticket" transform="translate(140.000000, 3222.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <path d="M38,16 C38,12.7 40.7,10 44,10 L44,0 L0,0 L0,10 C3.3,10 6,12.7 6,16 C6,19.3 3.3,22 0,22 L0,32 L44,32 L44,22 C40.7,22 38,19.3 38,16 L38,16 Z" id="Shape"></path>
diff --git a/www/img/mcc-icons/toy.svg b/www/img/mcc-icons/toy.svg
index 370b15622..42028cae1 100644
--- a/www/img/mcc-icons/toy.svg
+++ b/www/img/mcc-icons/toy.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-140.000000, -3281.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-140.000000, -3281.000000)" stroke="#9B9BAB">
             <g id="toy" transform="translate(140.000000, 3281.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <circle id="Oval" cx="6" cy="6" r="6"></circle>
diff --git a/www/img/mcc-icons/truck.svg b/www/img/mcc-icons/truck.svg
index 8bb2f9818..bd597e9fc 100644
--- a/www/img/mcc-icons/truck.svg
+++ b/www/img/mcc-icons/truck.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-1108.000000, -1350.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-1108.000000, -1350.000000)" stroke="#9B9BAB">
             <g id="truck" transform="translate(1108.000000, 1350.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="39 10 39 18 45 18"></polyline>
diff --git a/www/img/mcc-icons/watch.svg b/www/img/mcc-icons/watch.svg
index 1b4ad96c7..3ac34787f 100644
--- a/www/img/mcc-icons/watch.svg
+++ b/www/img/mcc-icons/watch.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="-Transaction-icons" transform="translate(-144.000000, -3349.000000)" stroke="#343434">
+        <g id="-Transaction-icons" transform="translate(-144.000000, -3349.000000)" stroke="#9B9BAB">
             <g id="watch" transform="translate(144.000000, 3349.000000)">
                 <g id="Group" transform="translate(0.500000, 0.500000)">
                     <polyline id="Shape" points="6.1 9.4 8 0 24 0 25.9 9.4"></polyline>
diff --git a/www/views/includes/cardActivity.html b/www/views/includes/cardActivity.html
index d95d5e572..68e90fdb9 100644
--- a/www/views/includes/cardActivity.html
+++ b/www/views/includes/cardActivity.html
@@ -8,9 +8,7 @@
     <div class="tx-title">
       <div class="ellipsis">
         <div class="tx-message ellipsis">{{tx.merchant.name || 'Unknown Merchant'}}</div>
-<!-- Removed to cleanup look and since intl card does not provide location.
         <div class="tx-location ellipsis" ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.location}}</div>
--->
         <div ng-show="tx.pending && tx.transactionId" class="size-12 tx-amount--pending">
           <div ng-click="bitpayCard.viewOnBlockchain(tx.transactionId)">View Confirmation Status</div>
         </div>

From 71384624e09e4891b446326740cf116fd4ce5083 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Fri, 9 Jun 2017 16:47:54 -0400
Subject: [PATCH 05/17] Update mcc icon circle color.

---
 src/sass/views/bitpayCard.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index 02b5d77e0..a1ae39918 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -101,7 +101,7 @@
       height: 40px;
       border-radius: 40px;
       border: 1px solid;
-      color: #cdcdcd;
+      color: #9b9bab;
       &.no-border {
         border: none;
         .svg {

From 7eede2907986a4dcec277f05615c3136360ad801 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 6 Jun 2017 20:52:09 -0300
Subject: [PATCH 06/17] fix sign target

---
 app-template/package-template.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-template/package-template.json b/app-template/package-template.json
index dfed0be08..9373b5b7d 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -107,7 +107,7 @@
     "run:android":            "cordova run android --device",
     "run:android-release":            "cordova run android --device --release",
     "log:android":            "adb logcat | grep chromium",
-    "sign:android":           "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk  platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
+    "sign:android":           "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk  platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/25.0.3/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
     "apply:copay":            "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare",
     "apply:bitpay":           "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare",
     "test":                   "echo \"no package tests configured\"",

From 4cdbbf7d773b973746077f1a33c025a3192d7239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 12 Jun 2017 11:32:17 -0300
Subject: [PATCH 07/17] fix PIN and fingerprint lock modal UI and enable option
 for devel

---
 src/sass/views/includes/pin.scss | 4 ++++
 www/views/tab-settings.html      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sass/views/includes/pin.scss b/src/sass/views/includes/pin.scss
index 8a3547de8..fe8cc118b 100644
--- a/src/sass/views/includes/pin.scss
+++ b/src/sass/views/includes/pin.scss
@@ -1,5 +1,9 @@
 #pin {
   background-color: #FAFAFA;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
   .content {
     text-align: center;
     position: fixed;
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index a26061508..cfc054614 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -89,7 +89,7 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
-      <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova">
+      <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova || isDevel">
         <i class="icon ion-ios-locked-outline" ng-if="locked"></i>
         <i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
         <span class="setting-title">{{'Lock App' | translate}}</span>

From c65ede1db63e5cd539a6e4b7a2e791ad47e08eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 12 Jun 2017 11:49:34 -0300
Subject: [PATCH 08/17] disabled is default option

---
 src/js/controllers/lockSetup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/lockSetup.js b/src/js/controllers/lockSetup.js
index cb6ff03cd..39b86de61 100644
--- a/src/js/controllers/lockSetup.js
+++ b/src/js/controllers/lockSetup.js
@@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
 
   function getSavedMethod() {
     var config = configService.getSync();
-    if (config.lock) return config.lock.method;
+    if (config.lock && config.lock.method) return config.lock.method;
     return 'none';
   };
 

From fe12b3ae631ec530537c51adc42c6e2e23d94187 Mon Sep 17 00:00:00 2001
From: Andy Phillipson <andy@bitpay.com>
Date: Mon, 12 Jun 2017 13:01:06 -0400
Subject: [PATCH 09/17] Create tab-send.html

---
 www/views/tab-send.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/views/tab-send.html b/www/views/tab-send.html
index d9fe9791a..e217bacc2 100644
--- a/www/views/tab-send.html
+++ b/www/views/tab-send.html
@@ -6,7 +6,7 @@
 
     <div ng-if="hasFunds">
       <div class="send-header-wrapper">
-        <div class="item item-heading send-heading" translate><span>Recipient</span></div>
+        <div class="item item-heading send-heading"><span translate>Recipient</span></div>
         <div class="item input search-wrapper" ng-class="{'focus': searchFocus}">
           <i class="icon icon-svg abs-v-center"><img class="svg" src="img/icon-bitcoin-symbol.svg"></i>
           <div class="item-icon-right">

From da15bc939baa38c3e8d9825bfc16cf41f71993a1 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 12 Jun 2017 16:22:50 -0300
Subject: [PATCH 10/17] allow importing HW seeds

---
 app-template/copay/appConfig.json |  2 +-
 src/js/controllers/import.js      | 33 +++++++++++++++++++++++++++++--
 src/js/services/profileService.js |  8 +++++---
 src/js/services/trezor.js         |  3 +++
 www/views/tab-import-phrase.html  | 15 +++++++++++---
 5 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json
index cde53fefa..625cbd184 100644
--- a/app-template/copay/appConfig.json
+++ b/app-template/copay/appConfig.json
@@ -22,7 +22,7 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "androidVersion": "340001",
   "_extraCSS": null,
   "_enabledExtensions": {
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index c5657d5cf..0c3fbdf7d 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService) {
+  function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService, hwWallet) {
 
     var reader = new FileReader();
     var defaults = configService.getDefaults();
@@ -38,6 +38,21 @@ angular.module('copayApp.controllers').controller('importController',
         $scope.formData.seedSource = $scope.seedOptions[0];
       }
 
+
+      $scope.seedOptionsAll = [];
+
+      $scope.seedOptionsAll.push({
+        id: walletService.externalSource.ledger.id,
+        label: walletService.externalSource.ledger.longName,
+      });
+
+      $scope.seedOptionsAll.push({
+        id: walletService.externalSource.trezor.id,
+        label: walletService.externalSource.trezor.longName,
+      });
+      $scope.formData.seedSourceAll = $scope.seedOptionsAll[0];
+
+
       $timeout(function() {
         $scope.$apply();
       });
@@ -159,6 +174,7 @@ angular.module('copayApp.controllers').controller('importController',
 
       $timeout(function() {
         profileService.importMnemonic(words, opts, function(err, client) {
+
           ongoingProcess.set('importingWallet', false);
 
           if (err) {
@@ -177,7 +193,7 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
     $scope.setDerivationPath = function() {
-      $scope.formData.derivationPath = $scope.formData.testnetEnabled ? derivationPathHelper.defaultTestnet : derivationPathHelper.default;
+      $scope.formData.testnetEnabled ? derivationPathHelper.defaultTestnet : derivationPathHelper.default;
     };
 
     $scope.getFile = function() {
@@ -256,6 +272,18 @@ angular.module('copayApp.controllers').controller('importController',
       }
 
       opts.passphrase = $scope.formData.passphrase || null;
+
+      if ($scope.formData.fromHardwareWallet) {
+        $log.debug('Importing seed from hardware wallet');
+        $log.warn('This wont work for Intel TEE wallets');
+
+        var id = $scope.formData.seedSourceAll.id;
+        var isMultisig = opts.derivationStrategy =='BIP48';
+        var account = opts.account;
+        opts.entropySourcePath = 'm/' + hwWallet.getEntropyPath(id, isMultisig, account);
+      }
+
+console.log('[import.js.283:opts:]',opts); //TODO
       _importMnemonic(words, opts);
     };
 
@@ -269,6 +297,7 @@ angular.module('copayApp.controllers').controller('importController',
 
         lopts.externalSource = walletService.externalSource.trezor.id;
         lopts.bwsurl = $scope.formData.bwsurl;
+console.log('[import.js.299:lopts:]',lopts); //TODO
         ongoingProcess.set('importingWallet', true);
         $log.debug('Import opts', lopts);
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 6ef9b96b0..8c5a93662 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -208,9 +208,9 @@ angular.module('copayApp.services')
     };
 
     var shouldSkipValidation = function(walletId) {
-      return root.profile.isChecked(platformInfo.ua, walletId) || isIOS || isWP;
-    }
-    // Used when reading wallets from the profile
+        return root.profile.isChecked(platformInfo.ua, walletId) || isIOS || isWP;
+      }
+      // Used when reading wallets from the profile
     root.bindWallet = function(credentials, cb) {
       if (!credentials.walletId || !credentials.m)
         return cb('bindWallet should receive credentials JSON');
@@ -618,6 +618,8 @@ angular.module('copayApp.services')
       walletClient.importFromMnemonic(words, {
         network: opts.networkName,
         passphrase: opts.passphrase,
+        entropySourcePath: opts.entropySourcePath,
+        derivationStrategy: opts.derivationStrategy || 'BIP44',
         account: opts.account || 0,
       }, function(err) {
         if (err) {
diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js
index 0411386fc..b835e1ae9 100644
--- a/src/js/services/trezor.js
+++ b/src/js/services/trezor.js
@@ -18,7 +18,9 @@ angular.module('copayApp.services')
     };
 
     root.getEntropySource = function(isMultisig, account, callback) {
+console.log('[trezor.js.20:isMultisig:]',root.description.id, isMultisig, account); //TODO
       root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
+console.log('[trezor.js.21:data:]',data); //TODO
         if (!data.success)
           return callback(hwWallet._err(data));
 
@@ -30,6 +32,7 @@ angular.module('copayApp.services')
     root.getXPubKey = function(path, callback) {
       $log.debug('TREZOR deriving xPub path:', path);
       try {
+console.log('[trezor.js.35:path:]',path); //TODO
         TrezorConnect.getXPubKey(path, callback);
       } catch (e) {
         callback('Error connecting Trezor');
diff --git a/www/views/tab-import-phrase.html b/www/views/tab-import-phrase.html
index 4146cac79..50d021038 100644
--- a/www/views/tab-import-phrase.html
+++ b/www/views/tab-import-phrase.html
@@ -49,14 +49,23 @@
         ng-model="formData.derivationPath">
       </label>
 
+
+      <ion-toggle ng-model="formData.fromHardwareWallet" toggle-class="toggle-positive">
+        <span translate>From Hardware Wallet</span>
+      </ion-toggle>
+
+      <select ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
+
+      <ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
+        <span translate>Testnet</span>
+      </ion-toggle>
+
+
       <label class="item item-input item-stacked-label">
         <span class="input-label" translate>Wallet Service URL</span>
         <input type="text" ng-model="formData.bwsurl">
       </label>
 
-      <ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
-        <span translate>Testnet</span>
-      </ion-toggle>
     </div>
   </div>
 

From 210d867c59f4d421a1e3816855fa94fcfd2670f4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 12 Jun 2017 16:53:03 -0300
Subject: [PATCH 11/17] Fix toggle

---
 src/js/controllers/import.js     |  3 ++-
 www/views/tab-import-phrase.html | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 0c3fbdf7d..331a2bfff 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -17,6 +17,7 @@ angular.module('copayApp.controllers').controller('importController',
       $scope.formData.account = 1;
       $scope.importErr = false;
       $scope.isCopay = appConfigService.name == 'copay';
+      $scope.fromHardwareWallet = { value: false };
 
       if ($stateParams.code)
         $scope.processWalletInfo($stateParams.code);
@@ -273,7 +274,7 @@ angular.module('copayApp.controllers').controller('importController',
 
       opts.passphrase = $scope.formData.passphrase || null;
 
-      if ($scope.formData.fromHardwareWallet) {
+      if ($scope.fromHardwareWallet.value) {
         $log.debug('Importing seed from hardware wallet');
         $log.warn('This wont work for Intel TEE wallets');
 
diff --git a/www/views/tab-import-phrase.html b/www/views/tab-import-phrase.html
index 50d021038..5b692f17e 100644
--- a/www/views/tab-import-phrase.html
+++ b/www/views/tab-import-phrase.html
@@ -50,11 +50,16 @@
       </label>
 
 
-      <ion-toggle ng-model="formData.fromHardwareWallet" toggle-class="toggle-positive">
-        <span translate>From Hardware Wallet</span>
+      <ion-toggle ng-model="fromHardwareWallet.value" toggle-class="toggle-positive">
+        <span class="toggle-label" translate>From Hardware Wallet</span>
       </ion-toggle>
 
-      <select ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
+      <label class="item item-input item-select" ng-if="fromHardwareWallet.value">
+        <div class="input-label" translate>
+          Wallet Type
+        </div>
+        <select class="m10t" ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
+      </label>
 
       <ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
         <span translate>Testnet</span>

From cc53f305fd0a94823873934aa272c4c625725f04 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 13 Jun 2017 10:58:22 -0300
Subject: [PATCH 12/17] New release v3.5.0

---
 app-template/bitpay/appConfig.json | 4 ++--
 app-template/copay/appConfig.json  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json
index ec47bfdcc..1e1b40255 100644
--- a/app-template/bitpay/appConfig.json
+++ b/app-template/bitpay/appConfig.json
@@ -22,8 +22,8 @@
   "windowsAppId": "2d1002d7-ee34-4f60-bd29-0c871ba0c195",
   "pushSenderId": "1036948132229",
   "description": "Secure Bitcoin Wallet",
-  "version": "3.4.0",
-  "androidVersion": "340001",
+  "version": "3.5.0",
+  "androidVersion": "350000",
   "_extraCSS": null,
   "_enabledExtensions": {
     "coinbase": true,
diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json
index 625cbd184..deab492ac 100644
--- a/app-template/copay/appConfig.json
+++ b/app-template/copay/appConfig.json
@@ -22,8 +22,8 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
-  "version": "3.4.1",
-  "androidVersion": "340001",
+  "version": "3.5.0",
+  "androidVersion": "350000",
   "_extraCSS": null,
   "_enabledExtensions": {
     "coinbase": true,

From 54b6bdfd2c3f03de7c969abf4b5231e04696d8d0 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 13 Jun 2017 11:17:02 -0300
Subject: [PATCH 13/17] updates bwc

---
 app-template/package-template.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-template/package-template.json b/app-template/package-template.json
index 9373b5b7d..01194e600 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -56,7 +56,7 @@
     "bezier-easing": "^2.0.3",
     "bhttp": "^1.2.1",
     "bitauth": "^0.2.1",
-    "bitcore-wallet-client": "5.2.1",
+    "bitcore-wallet-client": "5.3.0",
     "bower": "^1.7.9",
     "cordova-android": "5.1.1",
     "cordova-custom-config": "^3.0.5",

From 3c4e3d9a5123c14d575a7ead472b046c46859cfa Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 13 Jun 2017 11:29:21 -0300
Subject: [PATCH 14/17] rm console logs

---
 src/js/controllers/import.js | 2 --
 src/js/services/trezor.js    | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 331a2bfff..a3b8e134e 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -284,7 +284,6 @@ angular.module('copayApp.controllers').controller('importController',
         opts.entropySourcePath = 'm/' + hwWallet.getEntropyPath(id, isMultisig, account);
       }
 
-console.log('[import.js.283:opts:]',opts); //TODO
       _importMnemonic(words, opts);
     };
 
@@ -298,7 +297,6 @@ console.log('[import.js.283:opts:]',opts); //TODO
 
         lopts.externalSource = walletService.externalSource.trezor.id;
         lopts.bwsurl = $scope.formData.bwsurl;
-console.log('[import.js.299:lopts:]',lopts); //TODO
         ongoingProcess.set('importingWallet', true);
         $log.debug('Import opts', lopts);
 
diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js
index b835e1ae9..0411386fc 100644
--- a/src/js/services/trezor.js
+++ b/src/js/services/trezor.js
@@ -18,9 +18,7 @@ angular.module('copayApp.services')
     };
 
     root.getEntropySource = function(isMultisig, account, callback) {
-console.log('[trezor.js.20:isMultisig:]',root.description.id, isMultisig, account); //TODO
       root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
-console.log('[trezor.js.21:data:]',data); //TODO
         if (!data.success)
           return callback(hwWallet._err(data));
 
@@ -32,7 +30,6 @@ console.log('[trezor.js.21:data:]',data); //TODO
     root.getXPubKey = function(path, callback) {
       $log.debug('TREZOR deriving xPub path:', path);
       try {
-console.log('[trezor.js.35:path:]',path); //TODO
         TrezorConnect.getXPubKey(path, callback);
       } catch (e) {
         callback('Error connecting Trezor');

From c5ffc4e7ddfef72033b18a4e33faf4a33a1573d8 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 13 Jun 2017 14:44:39 -0300
Subject: [PATCH 15/17] fix account setting in Trezor/Ledger

---
 src/js/controllers/import.js |  2 ++
 src/js/services/trezor.js    | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index a3b8e134e..65f3732e5 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -297,6 +297,7 @@ angular.module('copayApp.controllers').controller('importController',
 
         lopts.externalSource = walletService.externalSource.trezor.id;
         lopts.bwsurl = $scope.formData.bwsurl;
+        lopts.account = account;
         ongoingProcess.set('importingWallet', true);
         $log.debug('Import opts', lopts);
 
@@ -353,6 +354,7 @@ angular.module('copayApp.controllers').controller('importController',
 
         lopts.externalSource = lopts.externalSource = walletService.externalSource.ledger.id;
         lopts.bwsurl = $scope.formData.bwsurl;
+        lopts.account = account;
         ongoingProcess.set('importingWallet', true);
         $log.debug('Import opts', lopts);
 
diff --git a/src/js/services/trezor.js b/src/js/services/trezor.js
index 0411386fc..3d40d88d1 100644
--- a/src/js/services/trezor.js
+++ b/src/js/services/trezor.js
@@ -93,7 +93,6 @@ angular.module('copayApp.services')
         outputs = [];
       var tmpOutputs = [];
 
-
       if (txp.type && txp.type != 'simple') {
         return callback('Only TXPs type SIMPLE are supported in TREZOR');
       } else if (txp.outputs) {
@@ -170,7 +169,6 @@ angular.module('copayApp.services')
           return '';
         });
 
-
         inputs = lodash.map(txp.inputs, function(i) {
           $log.debug("Trezor TX input path:", i.path);
           var pathArr = i.path.split('/');
@@ -180,12 +178,12 @@ angular.module('copayApp.services')
           inAmount += i.satoshis;
 
           var orderedPubKeys = root._orderPubKeys(xPubKeys, np);
-          var pubkeys = lodash(orderedPubKeys.map(function(v) {
+          var pubkeys = orderedPubKeys.map(function(v) {
             return {
               node: v,
               address_n: np,
             };
-          }));
+          });
 
           return {
             address_n: n,
@@ -208,12 +206,12 @@ angular.module('copayApp.services')
           var np = n.slice(3);
 
           var orderedPubKeys = root._orderPubKeys(xPubKeys, np);
-          var pubkeys = lodash(orderedPubKeys.map(function(v) {
+          var pubkeys = orderedPubKeys.map(function(v) {
             return {
               node: v,
               address_n: np,
             };
-          }));
+          });
 
           tmpOutputs.push({
             address_n: n,

From d2d36b6c258cb07a3a3150d54d90e76cf4807464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 13 Jun 2017 14:53:09 -0300
Subject: [PATCH 16/17] dummy view/state if the fingerprint check fails

---
 src/js/services/applicationService.js  | 10 +++-------
 www/views/modals/fingerprintCheck.html |  5 ++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/js/services/applicationService.js b/src/js/services/applicationService.js
index fe364a514..9bb9b5048 100644
--- a/src/js/services/applicationService.js
+++ b/src/js/services/applicationService.js
@@ -50,19 +50,15 @@ angular.module('copayApp.services')
       });
       scope.openModal = function() {
         scope.fingerprintCheckModal.show();
-        checkFingerprint();
+        scope.checkFingerprint();
       };
       scope.hideModal = function() {
         root.isModalOpen = false;
         scope.fingerprintCheckModal.hide();
       };
-
-      function checkFingerprint() {
+      scope.checkFingerprint = function() {
         fingerprintService.check('unlockingApp', function(err) {
-          if (err) {
-            checkFingerprint();
-            return;
-          }
+          if (err) return;
           scope.hideModal();
         });
       }
diff --git a/www/views/modals/fingerprintCheck.html b/www/views/modals/fingerprintCheck.html
index b5e26937a..e8c97f63e 100644
--- a/www/views/modals/fingerprintCheck.html
+++ b/www/views/modals/fingerprintCheck.html
@@ -1,10 +1,13 @@
 <ion-modal-view id="pin">
   <div class="content">
-    <div class="block-text row"></div>
+    <div class="block-text row">
+      <div class="message" translate>Verify your identity</div>
+    </div>
     <div class="app-icon">
       <i class="icon big-icon-svg">
         <div class="bg"></div>
       </i>
     </div>
+    <button style="margin-top: 15%" class="button button-standard button-primary" ng-click="checkFingerprint()" translate>Scan again</button>
   </div>
 </ion-modal-view>

From ded0118b6e7225076221111c6ed57a8b60c35522 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 14 Jun 2017 11:26:20 -0300
Subject: [PATCH 17/17] Android: API level 19 or higher supported

---
 app-template/config-template.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-template/config-template.xml b/app-template/config-template.xml
index 62c5321ca..b8019530a 100644
--- a/app-template/config-template.xml
+++ b/app-template/config-template.xml
@@ -33,6 +33,9 @@
     <preference name="FadeSplashScreenDuration" value="100" />
     <preference name="SplashMaintainAspectRatio" value="true" />
 
+    <!-- Android Version: KitKat 4.4 (API Level 19) or higher -->
+    <preference name="android-minSdkVersion" value="19" />
+
     <!-- Plugins -->
     <plugin name="cordova-plugin-device" spec="~1.1.3"/>
     <plugin name="cordova-plugin-globalization" spec="~1.0.4" />