diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index ef5e6ad2b..79bed16a6 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -88,14 +88,18 @@
       margin: 0;
       border: 0;
 
-      &.send .svg #-Transaction-icons {
+      &.send svg .nc-icon-wrapper g,
+      &.send svg .nc-icon-wrapper path,
+      &.send .tx-icon .houston {
       }
-      &.receive .svg #-Transaction-icons,
+      &.receive svg .nc-icon-wrapper g,
+      &.receive svg .nc-icon-wrapper path,
       &.receive .tx-icon .houston {
         stroke: #09C286;
         color: #09C286;
       }
-      &.pending .svg #-Transaction-icons,
+      &.pending svg .nc-icon-wrapper g,
+      &.pending svg .nc-icon-wrapper path,
       &.pending .tx-icon .houston {
         stroke: $v-bitcoin-orange;
         color: $v-bitcoin-orange;
diff --git a/www/img/mcc-icons/airplane.svg b/www/img/mcc-icons/airplane.svg
index ed1ee3a70..40e8c6869 100644
--- a/www/img/mcc-icons/airplane.svg
+++ b/www/img/mcc-icons/airplane.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="49px" viewBox="0 0 45 49" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>airplane</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="46" height="49" viewBox="0 0 46 49" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>airplane</title><path d="M31.9 46.15V42.8a.833.833 0 0 0-.253-.596l-4.796-4.797V27.264l15.628 6.242h.023a.635.635 0 0 0 .298.069c.46 0 .85-.39.85-.85v-3.35c0-.298-.161-.528-.368-.688L26.851 17.189V5.026A5.024 5.024 0 0 0 21.825 0a5.024 5.024 0 0 0-5.026 5.026v12.163L.367 28.687c-.206.16-.367.39-.367.688v3.35c0 .46.39.85.85.85a.635.635 0 0 0 .297-.07h.023L16.8 27.265v10.143l-4.797 4.797a.833.833 0 0 0-.252.596v3.35c0 .483.39.85.85.85a.774.774 0 0 0 .39-.115l8.835-4.796 8.835 4.796a.774.774 0 0 0 .39.115c.46 0 .85-.367.85-.85z" transform="translate(1 1)" stroke="#444444" stroke-width=".8" fill-rule="nonzero" fill="none"></path></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/art.svg b/www/img/mcc-icons/art.svg
index 4437f7a61..4e792a044 100644
--- a/www/img/mcc-icons/art.svg
+++ b/www/img/mcc-icons/art.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="43px" viewBox="0 0 45 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>art</title>
-    <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="#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>
-                    <circle id="Oval" cx="32" cy="20" r="4"></circle>
-                    <circle id="Oval" cx="8" cy="20" r="2"></circle>
-                    <circle id="Oval" cx="13" cy="30" r="2"></circle>
-                    <circle id="Oval" cx="24" cy="34" r="2"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="43" viewBox="0 0 45 43" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>art</title><g transform="translate(-140 -203) translate(140 203) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 20C0 12.6 3.7 6 9.3 2 11.4.6 14.6.3 16 2c1.9 2.5-1.5 6 0 8 3.9 4.8 12.2-4.7 22 0 7 3.5 6 12.7 5.2 16-2.6 9.2-11.1 16-21.2 16C9.8 42 0 32.2 0 20z"></path><circle cx="32" cy="20" r="4"></circle><circle cx="8" cy="20" r="2"></circle><circle cx="13" cy="30" r="2"></circle><circle cx="24" cy="34" r="2"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/bicycle.svg b/www/img/mcc-icons/bicycle.svg
index 26e8a9431..03a7dc57c 100644
--- a/www/img/mcc-icons/bicycle.svg
+++ b/www/img/mcc-icons/bicycle.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="31px" viewBox="0 0 45 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>bicycle</title>
-    <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="#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>
-                    <circle id="Oval" cx="9" cy="21" r="9"></circle>
-                    <path d="M16,2 L8,2" id="Shape"></path>
-                    <path d="M36,22 L32,0" id="Shape"></path>
-                    <polyline id="Shape" points="33.5 8 12 8 8 22"></polyline>
-                    <path d="M28,0 L38,0 C39.7,0 41,1.3 41,3 L41,3 C41,4.7 39.7,6 38,6" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="31" viewBox="0 0 45 31" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>bicycle</title><g transform="translate(-140 -272) translate(140 272) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><circle cx="35" cy="21" r="9"></circle><circle cx="9" cy="21" r="9"></circle><path d="M16 2H8"></path><path d="M36 22L32 0"></path><path d="M33.5 8L12 8 8 22"></path><path d="M28 0h10c1.7 0 3 1.3 3 3s-1.3 3-3 3"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/bitcoin-topup.svg b/www/img/mcc-icons/bitcoin-topup.svg
index 024dcd512..8fbb8d0ef 100644
--- a/www/img/mcc-icons/bitcoin-topup.svg
+++ b/www/img/mcc-icons/bitcoin-topup.svg
@@ -1,31 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="41px" viewBox="0 0 41 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>bitcoin-topup</title>
-    <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="#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>
-                    <polyline id="Shape" points="39 4 38 11.2 32 10.4"></polyline>
-                </g>
-                <g id="top-up" transform="translate(8.000000, 6.000000)">
-                    <g id="shopping-48px-outline_bitcoin" transform="translate(4.000000, 2.000000)">
-                        <g id="Group" transform="translate(0.285714, 0.288889)">
-                            <path d="M5.71428571,0 L5.71428571,3.46666667" id="Shape"></path>
-                            <path d="M8,0 L8,3.46666667" id="Shape"></path>
-                            <path d="M5.71428571,21.9555556 L5.71428571,25.4222222" id="Shape"></path>
-                            <path d="M8,21.9555556 L8,25.4222222" id="Shape"></path>
-                            <path d="M0,21.9555556 L3.42857143,21.9555556" id="Shape-Copy"></path>
-                            <path d="M0,3.46666667 L3.42857143,3.46666667" id="Shape-Copy-2"></path>
-                            <path d="M3.42857143,11.5555556 L3.42857143,3.46666667 L10.0634921,3.46666667 C12.415873,3.46666667 14.2857143,5.25777778 14.2857143,7.51111111 C14.2857143,9.76444444 12.415873,11.5555556 10.0634921,11.5555556" id="Shape"></path>
-                            <path d="M3.42857143,21.9555556 L3.42857143,11.5555556 L10.9285714,11.5555556 C13.4285714,11.5555556 15.4285714,13.8666667 15.4285714,16.7555556 C15.4285714,19.6444444 13.4285714,21.9555556 10.9285714,21.9555556 L3.42857143,21.9555556 Z" id="Shape"></path>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>bitcoin-topup</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-1113 -1082) translate(1113 1082) translate(.5 .5)"><path d="M40 20c0 11-9 20-20 20S0 31 0 20 9 0 20 0c7.9 0 14.8 4.6 18 11.3"></path><path d="M39 4L38 11.2 32 10.4"></path></g><path d="M5.714 0v3.467" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M8 0v3.467" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M5.714 21.956v3.466" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M8 21.956v3.466" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M0 21.956h3.429" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M0 3.467h3.429" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M3.429 11.556v-8.09h6.634c2.353 0 4.223 1.792 4.223 4.045s-1.87 4.045-4.223 4.045" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path><path d="M3.429 21.956v-10.4h7.5c2.5 0 4.5 2.31 4.5 5.2 0 2.888-2 5.2-4.5 5.2h-7.5z" transform="translate(-1113 -1082) translate(1113 1082) translate(8 6) translate(4 2) translate(.286 .289)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/boat.svg b/www/img/mcc-icons/boat.svg
index 5fc321e47..cb6d2d311 100644
--- a/www/img/mcc-icons/boat.svg
+++ b/www/img/mcc-icons/boat.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="39px" height="37px" viewBox="0 0 39 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>boat</title>
-    <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="#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>
-                    <polygon id="Shape" points="2 24 20 24 20 0"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="39" height="37" viewBox="0 0 39 37" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>boat</title><g transform="translate(-143 -328) translate(143 328) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M32 36L2 36 0 30 38 30z"></path><path d="M2 24L20 24 20 0z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/books.svg b/www/img/mcc-icons/books.svg
index 217c5642b..9b73de1e9 100644
--- a/www/img/mcc-icons/books.svg
+++ b/www/img/mcc-icons/books.svg
@@ -1,27 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="37px" viewBox="0 0 45 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>books</title>
-    <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="#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>
-                    <path d="M21,18 L15,18" id="Shape"></path>
-                    <path d="M7,30 L13,30" id="Shape"></path>
-                    <path d="M28,0 L28,12" id="Shape"></path>
-                    <path d="M36,12 L36,24" id="Shape"></path>
-                    <path d="M28,24 L28,36" id="Shape"></path>
-                    <path d="M18,6 L20,6" id="Shape"></path>
-                    <path d="M26,18 L28,18" id="Shape"></path>
-                    <path d="M18,30 L20,30" id="Shape"></path>
-                    <rect id="Rectangle-path" x="0" y="0" width="36" height="12"></rect>
-                    <rect id="Rectangle-path" x="8" y="12" width="36" height="12"></rect>
-                    <rect id="Rectangle-path" x="0" y="24" width="36" height="12"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="37" viewBox="0 0 45 37" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>books</title><g transform="translate(-140 -391) translate(140 391) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M7 6h6"></path><path d="M21 18h-6"></path><path d="M7 30h6"></path><path d="M28 0v12"></path><path d="M36 12v12"></path><path d="M28 24v12"></path><path d="M18 6h2"></path><path d="M26 18h2"></path><path d="M18 30h2"></path><path d="M0 0H36V12H0z"></path><path d="M8 12H44V24H8z"></path><path d="M0 24H36V36H0z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/bowling.svg b/www/img/mcc-icons/bowling.svg
index 6d8f171fa..fefab8446 100644
--- a/www/img/mcc-icons/bowling.svg
+++ b/www/img/mcc-icons/bowling.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>bowling</title>
-    <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="#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>
-                    <circle id="Oval" cx="22" cy="10" r="2"></circle>
-                    <circle id="Oval" cx="16" cy="20" r="2"></circle>
-                    <circle id="Oval" cx="28" cy="20" r="2"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>bowling</title><g transform="translate(-140 -453) translate(140 453) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><circle cx="22" cy="22" r="22"></circle><circle cx="22" cy="10" r="2"></circle><circle cx="16" cy="20" r="2"></circle><circle cx="28" cy="20" r="2"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/bug.svg b/www/img/mcc-icons/bug.svg
index e1aed95c2..22883da3f 100644
--- a/www/img/mcc-icons/bug.svg
+++ b/www/img/mcc-icons/bug.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>bug</title>
-    <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="#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>
-                    <path d="M8,22 L6,22 C2.7,22 0,19.3 0,16 L0,14" id="Shape"></path>
-                    <path d="M8,30 L6,30 C2.7,30 0,32.7 0,36 L0,38" id="Shape"></path>
-                    <path d="M36,22 L38,22 C41.3,22 44,19.3 44,16 L44,14" id="Shape"></path>
-                    <path d="M36,30 L38,30 C41.3,30 44,32.7 44,36 L44,38" id="Shape"></path>
-                    <path d="M36,30 C36,37.7 29.7,44 22,44 C14.3,44 8,37.7 8,30 L8,22 C8,14.3 14.3,8 22,8 C29.7,8 36,14.3 36,22 L36,30 L36,30 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>bug</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M28 9.4V6c0-3.3-2.7-6-6-6s-6 2.7-6 6v3.4" transform="translate(-140 -523) translate(140 523) translate(.5 .5)"></path><path d="M8 22H6c-3.3 0-6-2.7-6-6v-2" transform="translate(-140 -523) translate(140 523) translate(.5 .5)"></path><path d="M8 30H6c-3.3 0-6 2.7-6 6v2" transform="translate(-140 -523) translate(140 523) translate(.5 .5)"></path><path d="M36 22h2c3.3 0 6-2.7 6-6v-2" transform="translate(-140 -523) translate(140 523) translate(.5 .5)"></path><path d="M36 30h2c3.3 0 6 2.7 6 6v2" transform="translate(-140 -523) translate(140 523) translate(.5 .5)"></path><path d="M36 30c0 7.7-6.3 14-14 14S8 37.7 8 30v-8c0-7.7 6.3-14 14-14s14 6.3 14 14v8z" transform="translate(-140 -523) translate(140 523) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/bus.svg b/www/img/mcc-icons/bus.svg
index fa69bd7a9..a6de44595 100644
--- a/www/img/mcc-icons/bus.svg
+++ b/www/img/mcc-icons/bus.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="33px" viewBox="0 0 45 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>bus</title>
-    <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="#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>
-                    <path d="M30.1,26 L13.9,26" id="Shape"></path>
-                    <path d="M4.1,26 L0,26 L0,4 C0,1.8 1.8,0 4,0 L40,0 C42.2,0 44,1.8 44,4 L44,26 L39.9,26" id="Shape"></path>
-                    <circle id="Oval" cx="9" cy="27" r="5"></circle>
-                    <circle id="Oval" cx="35" cy="27" r="5"></circle>
-                    <rect id="Rectangle-path" x="6" y="6" width="20" height="8"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="33" viewBox="0 0 45 33" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>bus</title><g transform="translate(-140 -602) translate(140 602) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M32 6L32 14 38 14"></path><path d="M30.1 26H13.9"></path><path d="M4.1 26H0V4c0-2.2 1.8-4 4-4h36c2.2 0 4 1.8 4 4v22h-4.1"></path><circle cx="9" cy="27" r="5"></circle><circle cx="35" cy="27" r="5"></circle><path d="M6 6H26V14H6z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/camera.svg b/www/img/mcc-icons/camera.svg
index 5c518bbfc..5c6710244 100644
--- a/www/img/mcc-icons/camera.svg
+++ b/www/img/mcc-icons/camera.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="35px" viewBox="0 0 46 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>camera</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="46" height="35" viewBox="0 0 46 35" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>camera</title><g stroke="#444444" stroke-width=".9" fill="none" fill-rule="evenodd"><path d="M40.863 4.705h-6.295C31.432 4.705 29.863 0 26.705 0h-9.41c-3.158 0-4.727 4.705-7.863 4.705H3.137C1.397 4.705 0 6.123 0 7.863v22A3.14 3.14 0 0 0 3.137 33h37.726A3.154 3.154 0 0 0 44 29.863v-22c0-1.74-1.418-3.158-3.137-3.158z" transform="translate(1 1)"></path><path d="M22 7.863c-5.2 0-9.432 4.211-9.432 9.41 0 5.221 4.233 9.432 9.432 9.432 5.2 0 9.432-4.21 9.432-9.432 0-5.199-4.233-9.41-9.432-9.41z" transform="translate(1 1)"></path><path d="M34.568 8.637c-.859 0-1.568.709-1.568 1.568 0 .88.709 1.568 1.568 1.568a1.55 1.55 0 0 0 1.569-1.568c0-.86-.688-1.568-1.569-1.568z" transform="translate(1 1)"></path><path d="M22 11c-3.48 0-6.295 2.814-6.295 6.273A6.29 6.29 0 0 0 22 23.568a6.29 6.29 0 0 0 6.295-6.295C28.295 13.814 25.48 11 22 11z" transform="translate(1 1)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/car.svg b/www/img/mcc-icons/car.svg
index df7094476..6e8f1e4e4 100644
--- a/www/img/mcc-icons/car.svg
+++ b/www/img/mcc-icons/car.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="41px" viewBox="0 0 46 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>car</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="46" height="39" viewBox="0 0 46 39" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>car</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M39.21 14.654l-1.291-8.683A7 7 0 0 0 30.995 0H12.571a7 7 0 0 0-6.924 5.97l-1.29 8.684" transform="translate(1 1)"></path><path d="M10.892 29.308v2.97a4.357 4.357 0 1 1-8.713 0v-2.97" stroke-linecap="square" transform="translate(1 1)"></path><path d="M40.821 29.308v2.97a4.357 4.357 0 0 1-8.713 0v-2.97" stroke-linecap="square" transform="translate(1 1)"></path><path d="M43.566 29.308H0v-7.265a8 8 0 0 1 2.851-6.123l1.506-1.266H39.21l1.505 1.266a8 8 0 0 1 2.851 6.123v7.265z" stroke-linecap="square" transform="translate(1 1)"></path><path d="M8.713 21h4.357" stroke-linecap="square" transform="translate(1 1)"></path><path d="M30.496 21h4.357" stroke-linecap="square" transform="translate(1 1)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/clean.svg b/www/img/mcc-icons/clean.svg
index 2bf263eb4..2a62d97c0 100644
--- a/www/img/mcc-icons/clean.svg
+++ b/www/img/mcc-icons/clean.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="33px" height="45px" viewBox="0 0 33 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>clean</title>
-    <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="#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>
-                    <path d="M22,44 L22,40" id="Shape"></path>
-                    <path d="M10,44 L10,40" id="Shape"></path>
-                    <path d="M12,18 L20,18" id="Shape"></path>
-                    <polyline id="Shape" points="12 26 0 44 32 44 20 26"></polyline>
-                    <path d="M20,26 L12,26 L12,4 C12,1.8 13.8,0 16,0 L16,0 C18.2,0 20,1.8 20,4 L20,26 L20,26 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="33" height="45" viewBox="0 0 33 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>clean</title><g transform="translate(-146 -781) translate(146 781) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M16 44v-4"></path><path d="M22 44v-4"></path><path d="M10 44v-4"></path><path d="M12 18h8"></path><path d="M12 26L0 44 32 44 20 26"></path><path d="M20 26h-8V4c0-2.2 1.8-4 4-4s4 1.8 4 4v22z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/clock.svg b/www/img/mcc-icons/clock.svg
index abfae8e81..6bd3e7e08 100644
--- a/www/img/mcc-icons/clock.svg
+++ b/www/img/mcc-icons/clock.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="46px" viewBox="0 0 46 46" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>clock</title>
-    <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="#9B9BAB">
-            <g id="clock" transform="translate(140.000000, 851.000000)">
-                <text>
-                    <tspan x="0" y="47">clock</tspan>
-                </text>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="49" height="49" viewBox="0 0 49 49" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>clock</title><g transform="translate(1 1)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square"><circle cx="23.336" cy="23.336" r="23.336"></circle><path d="M23.3361681 10.6073491L23.3361681 23.3361681 36.064987 23.3361681"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/cocktail.svg b/www/img/mcc-icons/cocktail.svg
index ac72141c8..f03d4ba99 100644
--- a/www/img/mcc-icons/cocktail.svg
+++ b/www/img/mcc-icons/cocktail.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="46px" viewBox="0 0 42 46" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>cocktail</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="35" height="42" viewBox="0 0 35 42" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>cocktail</title><g transform="translate(-1) translate(.54 .473)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M20.516 11.596c0-3.925 3.211-7.136 7.136-7.136 3.925 0 7.136 3.211 7.136 7.136 0 3.925-3.21 7.136-7.136 7.136"></path><path d="M22.3 40.14H8.028c-3.033 0-5.352-2.319-5.352-5.352V11.596h24.976v23.192c0 3.033-2.319 5.352-5.352 5.352z" stroke-linecap="square"></path><path stroke-linecap="square" d="M0.892008285 0.892008285L8.02807457 0.892008285 15.1641408 33.0043065"></path><path d="M2.676 25.868h24.976" stroke-linecap="square"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/coins.svg b/www/img/mcc-icons/coins.svg
index 8753a2cd8..d026b7605 100644
--- a/www/img/mcc-icons/coins.svg
+++ b/www/img/mcc-icons/coins.svg
@@ -1,27 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="29px" height="41px" viewBox="0 0 29 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>coins</title>
-    <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="#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>
-                    <path d="M12.5,27.3 C11.2,27.7 9.7,28 8,28 C3.6,28 0,26.2 0,24 C0,23.1 0.6,22.2 1.7,21.5" id="Shape"></path>
-                    <path d="M12.5,22.3 C11.2,22.7 9.7,23 8,23 C3.6,23 0,21.2 0,19 C0,18 0.7,17.2 1.8,16.5" id="Shape"></path>
-                    <path d="M12.5,17.3 C11.2,17.7 9.7,18 8,18 C3.6,18 0,16.2 0,14 C0,13.1 0.7,12.2 1.8,11.5" id="Shape"></path>
-                    <path d="M14.2,11.5 C14.8,11.8 15.2,12.2 15.5,12.7" id="Shape"></path>
-                    <path d="M14.3,6.5 C15.4,7.2 16,8 16,9 C16,11.2 12.4,13 8,13 C3.6,13 0,11.2 0,9 C0,8 0.7,7.2 1.8,6.5" id="Shape"></path>
-                    <ellipse id="Oval" cx="8" cy="4" rx="8" ry="4"></ellipse>
-                    <path d="M26.2,33.5 C27.3,34.2 28,35 28,36 C28,38.2 24.4,40 20,40 C15.6,40 12,38.2 12,36 C12,35.1 12.7,34.2 13.8,33.5" id="Shape"></path>
-                    <path d="M26.2,28.5 C27.3,29.2 28,30 28,31 C28,33.2 24.4,35 20,35 C15.6,35 12,33.2 12,31 C12,30 12.7,29.2 13.8,28.5" id="Shape"></path>
-                    <path d="M26.2,23.4 C27.3,24.1 28,25 28,26 C28,28.2 24.4,30 20,30 C15.6,30 12,28.2 12,26 C12,25.1 12.7,24.2 13.7,23.5" id="Shape"></path>
-                    <path d="M26.2,18.5 C27.3,19.2 28,20 28,21 C28,23.2 24.4,25 20,25 C15.6,25 12,23.2 12,21 C12,20 12.7,19.2 13.8,18.5" id="Shape"></path>
-                    <ellipse id="Oval" cx="20" cy="16" rx="8" ry="4"></ellipse>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="29" height="41" viewBox="0 0 29 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>coins</title><g transform="translate(-148 -999) translate(148 999) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M12.5 32.3c-1.3.4-2.8.7-4.5.7-4.4 0-8-1.8-8-4 0-1 .7-1.8 1.8-2.5"></path><path d="M12.5 27.3c-1.3.4-2.8.7-4.5.7-4.4 0-8-1.8-8-4 0-.9.6-1.8 1.7-2.5"></path><path d="M12.5 22.3c-1.3.4-2.8.7-4.5.7-4.4 0-8-1.8-8-4 0-1 .7-1.8 1.8-2.5"></path><path d="M12.5 17.3c-1.3.4-2.8.7-4.5.7-4.4 0-8-1.8-8-4 0-.9.7-1.8 1.8-2.5"></path><path d="M14.2 11.5c.6.3 1 .7 1.3 1.2"></path><path d="M14.3 6.5C15.4 7.2 16 8 16 9c0 2.2-3.6 4-8 4s-8-1.8-8-4c0-1 .7-1.8 1.8-2.5"></path><ellipse cx="8" cy="4" rx="8" ry="4"></ellipse><path d="M26.2 33.5c1.1.7 1.8 1.5 1.8 2.5 0 2.2-3.6 4-8 4s-8-1.8-8-4c0-.9.7-1.8 1.8-2.5"></path><path d="M26.2 28.5c1.1.7 1.8 1.5 1.8 2.5 0 2.2-3.6 4-8 4s-8-1.8-8-4c0-1 .7-1.8 1.8-2.5"></path><path d="M26.2 23.4c1.1.7 1.8 1.6 1.8 2.6 0 2.2-3.6 4-8 4s-8-1.8-8-4c0-.9.7-1.8 1.7-2.5"></path><path d="M26.2 18.5c1.1.7 1.8 1.5 1.8 2.5 0 2.2-3.6 4-8 4s-8-1.8-8-4c0-1 .7-1.8 1.8-2.5"></path><ellipse cx="20" cy="16" rx="8" ry="4"></ellipse></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/computer.svg b/www/img/mcc-icons/computer.svg
index 442e7f36a..92d5e187f 100644
--- a/www/img/mcc-icons/computer.svg
+++ b/www/img/mcc-icons/computer.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>computer</title>
-    <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="#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>
-                    <path d="M16,44 L16,36" id="Shape"></path>
-                    <path d="M10,44 L34,44" id="Shape"></path>
-                    <path d="M20,6 L24,6" id="Shape"></path>
-                    <path d="M40,36 L4,36 C1.8,36 0,34.2 0,32 L0,4 C0,1.8 1.8,0 4,0 L40,0 C42.2,0 44,1.8 44,4 L44,32 C44,34.2 42.2,36 40,36 L40,36 Z" id="Shape"></path>
-                    <path d="M0,28 L44,28" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>computer</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M28 36v8" transform="translate(-140 -1066) translate(140 1066) translate(.5 .5)"></path><path d="M16 44v-8" transform="translate(-140 -1066) translate(140 1066) translate(.5 .5)"></path><path d="M10 44h24" transform="translate(-140 -1066) translate(140 1066) translate(.5 .5)"></path><path d="M20 6h4" transform="translate(-140 -1066) translate(140 1066) translate(.5 .5)"></path><path d="M40 36H4c-2.2 0-4-1.8-4-4V4c0-2.2 1.8-4 4-4h36c2.2 0 4 1.8 4 4v28c0 2.2-1.8 4-4 4z" transform="translate(-140 -1066) translate(140 1066) translate(.5 .5)"></path><path d="M0 28h44" transform="translate(-140 -1066) translate(140 1066) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/default.svg b/www/img/mcc-icons/default.svg
index 1458e3115..46320a4fd 100644
--- a/www/img/mcc-icons/default.svg
+++ b/www/img/mcc-icons/default.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="34px" viewBox="0 0 46 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>default</title>
-    <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="#9B9BAB">
-            <g id="default" transform="translate(140.000000, 1137.000000)">
-                <g id="Group">
-                    <path d="M0,8 L44,8" id="Shape"></path>
-                    <path d="M0,16 L44,16" id="Shape"></path>
-                    <path d="M41,32 L3,32 C1.3,32 0,30.7 0,29 L0,3 C0,1.3 1.3,0 3,0 L30,0 L41,0 C42.7,0 44,1.3 44,3 L44,29 C44,30.7 42.7,32 41,32 L41,32 Z" id="Shape"></path>
-                    <path d="M8,24 L18,24" id="Shape"></path>
-                    <path d="M33,24 L36,24" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="46" height="34" viewBox="0 0 46 34" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>default</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 8h44" transform="translate(-139 -1136) translate(140 1137)"></path><path d="M0 16h44" transform="translate(-139 -1136) translate(140 1137)"></path><path d="M41 32H3c-1.7 0-3-1.3-3-3V3c0-1.7 1.3-3 3-3h38c1.7 0 3 1.3 3 3v26c0 1.7-1.3 3-3 3z" transform="translate(-139 -1136) translate(140 1137)"></path><path d="M8 24h10" transform="translate(-139 -1136) translate(140 1137)"></path><path d="M33 24h3" transform="translate(-139 -1136) translate(140 1137)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/diamond-ring.svg b/www/img/mcc-icons/diamond-ring.svg
index c8acf7c60..515eae49c 100644
--- a/www/img/mcc-icons/diamond-ring.svg
+++ b/www/img/mcc-icons/diamond-ring.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="39px" viewBox="0 0 41 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>diamond-ring</title>
-    <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="#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>
-                    <polyline id="Shape" points="20 38 28 12 20 0"></polyline>
-                    <polyline id="Shape" points="20 0 12 12 20 38"></polyline>
-                    <path d="M8,0 L12,12" id="Shape"></path>
-                    <path d="M32,0 L28,12" id="Shape"></path>
-                    <polygon id="Shape" points="40 12 20 38 0 12 8 0 32 0"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="39" viewBox="0 0 41 39" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>diamond-ring</title><g transform="translate(-142 -1198) translate(142 1198) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 12h40"></path><path d="M20 38L28 12 20 0"></path><path d="M20 0L12 12 20 38"></path><path d="M8 0l4 12"></path><path d="M32 0l-4 12"></path><path d="M40 12L20 38 0 12 8 0 32 0z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/dollar-topup.svg b/www/img/mcc-icons/dollar-topup.svg
index 2dd9cf755..e36779ed1 100644
--- a/www/img/mcc-icons/dollar-topup.svg
+++ b/www/img/mcc-icons/dollar-topup.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="41px" viewBox="0 0 41 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>dollar-topup</title>
-    <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="#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>
-                    <polyline id="Shape" points="39 4 38 11.2 32 10.4"></polyline>
-                </g>
-                <g id="Group" transform="translate(14.500000, 8.500000)">
-                    <path d="M0,17 L0,17 C0,19.8 2.2,22 5,22 L7,22 C9.8,22 12,19.8 12,17 L12,17 C12,10 0,14 0,7 L0,7 C0,4.2 2.2,2 5,2 L7,2 C9.8,2 12,4.2 12,7" id="Shape"></path>
-                    <path d="M6,0 L6,24" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>dollar-topup</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-269 -20) translate(269 20) translate(.5 .5)"><path d="M40 20c0 11-9 20-20 20S0 31 0 20 9 0 20 0c7.9 0 14.8 4.6 18 11.3"></path><path d="M39 4L38 11.2 32 10.4"></path></g><path d="M0 17c0 2.8 2.2 5 5 5h2c2.8 0 5-2.2 5-5 0-7-12-3-12-10 0-2.8 2.2-5 5-5h2c2.8 0 5 2.2 5 5" transform="translate(-269 -20) translate(269 20) translate(14.5 8.5)"></path><path d="M6 0v24" transform="translate(-269 -20) translate(269 20) translate(14.5 8.5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/euro-topup.svg b/www/img/mcc-icons/euro-topup.svg
index 07d7f65bf..027c8a836 100644
--- a/www/img/mcc-icons/euro-topup.svg
+++ b/www/img/mcc-icons/euro-topup.svg
@@ -1,24 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="41px" viewBox="0 0 41 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>euro-topup</title>
-    <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="#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>
-                    <polyline id="Shape" points="39 4 38 11.2 32 10.4"></polyline>
-                </g>
-                <g id="business-48px-outline_round-euro" transform="translate(10.000000, 10.000000)">
-                    <g id="Group" transform="translate(0.500000, 0.500000)">
-                        <path d="M18,18 C16.3,19.3 14.3,20 12,20 C6.5,20 2,15.5 2,10 C2,4.5 6.5,0 12,0 C14.3,0 16.3,0.7 18,2" id="Shape"></path>
-                        <path d="M0,6 L12,6" id="Shape"></path>
-                        <path d="M0,12 L12,12" id="Shape"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>euro-topup</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-319 -20) translate(319 20) translate(.5 .5)"><path d="M40 20c0 11-9 20-20 20S0 31 0 20 9 0 20 0c7.9 0 14.8 4.6 18 11.3"></path><path d="M39 4L38 11.2 32 10.4"></path></g><path d="M18 18c-1.7 1.3-3.7 2-6 2-5.5 0-10-4.5-10-10S6.5 0 12 0c2.3 0 4.3.7 6 2" transform="translate(-319 -20) translate(319 20) translate(10 10) translate(.5 .5)"></path><path d="M0 6h12" transform="translate(-319 -20) translate(319 20) translate(10 10) translate(.5 .5)"></path><path d="M0 12h12" transform="translate(-319 -20) translate(319 20) translate(10 10) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/film.svg b/www/img/mcc-icons/film.svg
index 71595e207..d9788f690 100644
--- a/www/img/mcc-icons/film.svg
+++ b/www/img/mcc-icons/film.svg
@@ -1,27 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>film</title>
-    <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="#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>
-                    <path d="M44,0 L44,44" id="Shape"></path>
-                    <rect id="Rectangle-path" x="8" y="0" width="28" height="44"></rect>
-                    <path d="M0,22 L44,22" id="Shape"></path>
-                    <path d="M0,14 L8,14" id="Shape"></path>
-                    <path d="M0,6 L8,6" id="Shape"></path>
-                    <path d="M36,14 L44,14" id="Shape"></path>
-                    <path d="M36,6 L44,6" id="Shape"></path>
-                    <path d="M36,38 L44,38" id="Shape"></path>
-                    <path d="M36,30 L44,30" id="Shape"></path>
-                    <path d="M0,38 L8,38" id="Shape"></path>
-                    <path d="M0,30 L8,30" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>film</title><g transform="translate(-139 -1265) translate(139 1265) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 0v44"></path><path d="M44 0v44"></path><path d="M8 0H36V44H8z"></path><path d="M0 22h44"></path><path d="M0 14h8"></path><path d="M0 6h8"></path><path d="M36 14h8"></path><path d="M36 6h8"></path><path d="M36 38h8"></path><path d="M36 30h8"></path><path d="M0 38h8"></path><path d="M0 30h8"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/food.svg b/www/img/mcc-icons/food.svg
index b75ddfa89..3044b6765 100644
--- a/www/img/mcc-icons/food.svg
+++ b/www/img/mcc-icons/food.svg
@@ -1,23 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="43px" height="43px" viewBox="0 0 43 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>food</title>
-    <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(-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="#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>
-                        <polygon id="Shape" points="13.8666667 11.7948718 0 11.7948718 0 8.25641026 25.4222222 8.25641026 25.4222222 11.7948718 20.8 11.7948718 17.3333333 14.1538462"></polygon>
-                        <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="#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>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="49" height="47" viewBox="0 0 49 47" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>food</title><g transform="translate(0 1)" stroke="#444444" stroke-width=".8" fill="none" fill-rule="evenodd"><path d="M22.859 43.827a5.277 5.277 0 0 0 3.747 1.55H39.68c2.971 0 5.349-2.426 5.349-5.46"></path><path d="M25.499 21.277a9.04 9.04 0 0 1 5.003-1.511h5.282c5.085 0 9.245 4.246 9.245 9.435"></path><path d="M34.4634922 33.2454215L24 33.2454215 24.5142857 29.2014654 47.6698414 29.2014654 47.6698414 33.2454215 42.3873017 33.2454215 38.4253969 35.9413922z"></path><path d="M44.368 33.245c1.85 0 3.302 1.483 3.302 3.37 0 1.888-1.453 3.37-3.302 3.37H22.914"></path><path d="M2.857 21.143c3.197-.254 6.689.508 10.475 2.286 3.785 1.777 7.76 1.61 11.925-.5" stroke-linecap="round" stroke-linejoin="round"></path><path stroke-linecap="round" stroke-linejoin="round" d="M22.465772 45.3169908L26.9665364 8.93581196 1.08714116 8.93581196 5.58790555 45.3169908z"></path><path stroke-linecap="round" stroke-linejoin="round" d="M10.8571429 41.7142857L19.6079497 0.0593043995 32.610158 0.0593043995"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/football.svg b/www/img/mcc-icons/football.svg
index 98cdc5733..159a93882 100644
--- a/www/img/mcc-icons/football.svg
+++ b/www/img/mcc-icons/football.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>football</title>
-    <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="#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>
-                    <circle id="Oval" cx="30" cy="36" r="2"></circle>
-                    <path d="M30.0000076,44 C34.4182816,44 38,40.4182816 38,36.0000076 L38,34 C38,30 44,27.75 44,24 L44,20 C42.9881592,8.7883301 33.4750977,0 22,0 C10.5249023,0 1.112793,8.7883301 0.1009521,20 L18,20 C20.2091389,20 22,21.7908611 22,24 L22,36.0000076 C22,40.4182816 25.5817184,44 29.9999924,44 L30.0000076,44 L30.0000076,44 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>football</title><g transform="translate(-140 -1335) translate(140 1335) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M22 32H0v10c12.167 0 12-15.667 12-22"></path><circle cx="30" cy="36" r="2"></circle><path d="M30 44a8 8 0 0 0 8-8v-2c0-4 6-6.25 6-10v-4C42.988 8.788 33.475 0 22 0S1.113 8.788.101 20H18a4 4 0 0 1 4 4v12a8 8 0 0 0 8 8z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/furniture.svg b/www/img/mcc-icons/furniture.svg
index 3db75a2e3..c590bc815 100644
--- a/www/img/mcc-icons/furniture.svg
+++ b/www/img/mcc-icons/furniture.svg
@@ -1,26 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="41px" viewBox="0 0 45 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>furniture</title>
-    <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="#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>
-                    <path d="M22,36 L22,0" id="Shape"></path>
-                    <path d="M0,12 L44,12" id="Shape"></path>
-                    <path d="M0,24 L44,24" id="Shape"></path>
-                    <polyline id="Shape" points="0 40 0 0 44 0 44 40"></polyline>
-                    <path d="M9,6 L13,6" id="Shape"></path>
-                    <path d="M31,6 L35,6" id="Shape"></path>
-                    <path d="M9,18 L13,18" id="Shape"></path>
-                    <path d="M31,18 L35,18" id="Shape"></path>
-                    <path d="M9,30 L13,30" id="Shape"></path>
-                    <path d="M31,30 L35,30" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="41" viewBox="0 0 45 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>furniture</title><g transform="translate(-140 -1475) translate(140 1475) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 36h44"></path><path d="M22 36V0"></path><path d="M0 12h44"></path><path d="M0 24h44"></path><path d="M0 40L0 0 44 0 44 40"></path><path d="M9 6h4"></path><path d="M31 6h4"></path><path d="M9 18h4"></path><path d="M31 18h4"></path><path d="M9 30h4"></path><path d="M31 30h4"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/game.svg b/www/img/mcc-icons/game.svg
index b6571727a..9679e789a 100644
--- a/www/img/mcc-icons/game.svg
+++ b/www/img/mcc-icons/game.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="39px" viewBox="0 0 45 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>game</title>
-    <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="#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>
-                    <path d="M12,22 L12,30" id="Shape"></path>
-                    <path d="M8,26 L16,26" id="Shape"></path>
-                    <path d="M30,24 L32,22" id="Shape"></path>
-                    <path d="M34,30 L36,28" id="Shape"></path>
-                    <path d="M22,6 L22,0" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="39" viewBox="0 0 45 39" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>game</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M32 38H12C5.4 38 0 32.6 0 26s5.4-12 12-12h20c6.6 0 12 5.4 12 12s-5.4 12-12 12z" transform="translate(-140 -1531) translate(140 1531) translate(.5 .5)"></path><path d="M12 22v8" transform="translate(-140 -1531) translate(140 1531) translate(.5 .5)"></path><path d="M8 26h8" transform="translate(-140 -1531) translate(140 1531) translate(.5 .5)"></path><path d="M30 24l2-2" transform="translate(-140 -1531) translate(140 1531) translate(.5 .5)"></path><path d="M34 30l2-2" transform="translate(-140 -1531) translate(140 1531) translate(.5 .5)"></path><path d="M22 6V0" transform="translate(-140 -1531) translate(140 1531) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/gas.svg b/www/img/mcc-icons/gas.svg
index 2ca1b629c..38415ece3 100644
--- a/www/img/mcc-icons/gas.svg
+++ b/www/img/mcc-icons/gas.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="40px" viewBox="0 0 46 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>gas</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="48" height="44" viewBox="0 0 48 44" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>gas</title><g transform="translate(-33 1) translate(34)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round"><path d="M43.398 11.546c0-3.318-1.26-5.906-3.981-7.963"></path><path d="M33.046 24.287v5.574a5.574 5.574 0 1 0 11.148 0V19.51"></path><path d="M9.157 5.972H27.472V19.509H9.157z"></path><path d="M9.157 24.287h6.37"></path><path d="M40.213 11.546H45.787V19.509H40.213z"></path><path d="M3.583 41.806V3.583A3.185 3.185 0 0 1 6.77.398H29.86a3.185 3.185 0 0 1 3.185 3.185v38.223"></path><path d="M.398 41.806h35.833"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/golf.svg b/www/img/mcc-icons/golf.svg
index c862db239..3ba939688 100644
--- a/www/img/mcc-icons/golf.svg
+++ b/www/img/mcc-icons/golf.svg
@@ -1,22 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="45px" viewBox="0 0 41 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>golf</title>
-    <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="#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>
-                    <path d="M22,14 L22,26" id="Shape"></path>
-                    <path d="M2,18 L14,18 L14,13.3187923 C14,12.5187358 13.5232067,11.79566 12.787838,11.4805021 L2.787838,7.194788 C1.468102,6.6291866 0,7.5972471 0,9.0330782 L0,16 C0,17.1045704 0.8954306,18 2,18 L2,18 Z" id="Shape"></path>
-                    <path d="M14,18 L14,26" id="Shape"></path>
-                    <rect id="Rectangle-path" x="4" y="26" width="28" height="8"></rect>
-                    <path d="M28,34 L28,44" id="Shape"></path>
-                    <path d="M8,44 L8,34" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="45" viewBox="0 0 41 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>golf</title><g transform="translate(-142 -1661) translate(142 1661) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M36 14H22v-3.646a4 4 0 0 1 2.057-3.497l10-5.556C36.724-.179 40 1.748 40 4.798V10a4 4 0 0 1-4 4z"></path><path d="M22 14v12"></path><path d="M2 18h12v-4.681a2 2 0 0 0-1.212-1.838l-10-4.286A2 2 0 0 0 0 9.033V16a2 2 0 0 0 2 2z"></path><path d="M14 18v8"></path><path d="M4 26H32V34H4z"></path><path d="M28 34v10"></path><path d="M8 44V34"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/hotel.svg b/www/img/mcc-icons/hotel.svg
index 21275241c..c0b1e4dc6 100644
--- a/www/img/mcc-icons/hotel.svg
+++ b/www/img/mcc-icons/hotel.svg
@@ -1,30 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>hotel</title>
-    <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="#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>
-                    <polyline id="Shape" points="36 44 44 44 44 26 36 26"></polyline>
-                    <polyline id="Shape" points="18 0 18 2 18 8"></polyline>
-                    <path d="M26,8 L26,0" id="Shape"></path>
-                    <path d="M26,3 L18,3" id="Shape"></path>
-                    <rect id="Rectangle-path" x="8" y="8" width="28" height="36"></rect>
-                    <path d="M16,14 L18,14" id="Shape"></path>
-                    <path d="M26,14 L28,14" id="Shape"></path>
-                    <path d="M16,20 L18,20" id="Shape"></path>
-                    <path d="M26,20 L28,20" id="Shape"></path>
-                    <path d="M16,26 L18,26" id="Shape"></path>
-                    <path d="M26,26 L28,26" id="Shape"></path>
-                    <path d="M16,32 L18,32" id="Shape"></path>
-                    <path d="M26,32 L28,32" id="Shape"></path>
-                    <polyline id="Shape" points="25 44 25 38 19 38 19 44"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>hotel</title><g transform="translate(-140 -1732) translate(140 1732) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M8 44L0 44 0 26 8 26"></path><path d="M36 44L44 44 44 26 36 26"></path><path d="M18 0L18 2 18 8"></path><path d="M26 8V0"></path><path d="M26 3h-8"></path><path d="M8 8H36V44H8z"></path><path d="M16 14h2"></path><path d="M26 14h2"></path><path d="M16 20h2"></path><path d="M26 20h2"></path><path d="M16 26h2"></path><path d="M26 26h2"></path><path d="M16 32h2"></path><path d="M26 32h2"></path><path d="M25 44L25 38 19 38 19 44"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/law.svg b/www/img/mcc-icons/law.svg
index 9621807e3..49dbc1ccf 100644
--- a/www/img/mcc-icons/law.svg
+++ b/www/img/mcc-icons/law.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="43px" height="43px" viewBox="0 0 43 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>law</title>
-    <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="#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>
-                    <rect id="Rectangle-path" stroke-width="0.99999041" transform="translate(27.035055, 11.035455) rotate(-45.000000) translate(-27.035055, -11.035455) " x="15.7351634" y="6.78549576" width="22.5997833" height="8.49991848"></rect>
-                    <polyline id="Shape" points="4 42 4 36 26 36 26 42"></polyline>
-                    <path d="M8,28 L2,28" id="Shape"></path>
-                    <path d="M10.9,20.9 L6.7,16.7" id="Shape"></path>
-                    <path d="M0,42 L30,42" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="43" height="43" viewBox="0 0 43 43" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>law</title><g transform="translate(-138 -1808) translate(138 1808) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M32 12L42 22 38 26 28 16"></path><path stroke-width="1" transform="rotate(-45 27.035 11.035)" d="M15.735 6.785H38.335V15.285H15.735z"></path><path d="M4 42L4 36 26 36 26 42"></path><path d="M8 28H2"></path><path d="M10.9 20.9l-4.2-4.2"></path><path d="M0 42h30"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/mail.svg b/www/img/mcc-icons/mail.svg
index 7d4ddc4aa..b28775d97 100644
--- a/www/img/mcc-icons/mail.svg
+++ b/www/img/mcc-icons/mail.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="30px" viewBox="0 0 46 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>mail</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="28" viewBox="0 0 41 28" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>mail</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0.899090878 0.723658512L20.6790902 15.1968287 40.4590895 0.723658512"></path><path stroke-linecap="square" d="M0.899 0.724H40.459V26.776H0.899z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/medical.svg b/www/img/mcc-icons/medical.svg
index ab9396a9c..d3d059e3d 100644
--- a/www/img/mcc-icons/medical.svg
+++ b/www/img/mcc-icons/medical.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>medical</title>
-    <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="#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>
-                    <circle id="Oval" cx="38" cy="26" r="6"></circle>
-                    <path d="M20,2 L25.7,2 C26.9,2 27.9,3.1 27.7,4.3 L24.5,26.6 C24.2,28.6 22.5,30 20.5,30 L7.5,30 C5.5,30 3.8,28.5 3.5,26.6 L0.3,4.3 C0.2,3.1 1.1,2 2.3,2 L8,2" id="Shape"></path>
-                    <path d="M8,0 L8,4" id="Shape"></path>
-                    <path d="M20,0 L20,4" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>medical</title><g transform="translate(-140 -1871) translate(140 1871) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M14 30v2c0 6.6 5.4 12 12 12s12-5.4 12-12"></path><circle cx="38" cy="26" r="6"></circle><path d="M20 2h5.7c1.2 0 2.2 1.1 2 2.3l-3.2 22.3c-.3 2-2 3.4-4 3.4h-13c-2 0-3.7-1.5-4-3.4L.3 4.3C.2 3.1 1.1 2 2.3 2H8"></path><path d="M8 0v4"></path><path d="M20 0v4"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/money.svg b/www/img/mcc-icons/money.svg
index ab2f8cb62..d4700d3cf 100644
--- a/www/img/mcc-icons/money.svg
+++ b/www/img/mcc-icons/money.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="39px" viewBox="0 0 45 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>money</title>
-    <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="#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>
-                    <polyline id="Shape" points="40 6 40 0 4 0 4 6"></polyline>
-                    <rect id="Rectangle-path" x="0" y="6" width="44" height="32"></rect>
-                    <circle id="Oval" cx="22" cy="22" r="4"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="39" viewBox="0 0 45 39" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>money</title><g transform="translate(-140 -2012) translate(140 2012) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M32 12H12c0 3.3-2.7 6-6 6v8c3.3 0 6 2.7 6 6h20c0-3.3 2.7-6 6-6v-8c-3.3 0-6-2.7-6-6z"></path><path d="M40 6L40 0 4 0 4 6"></path><path d="M0 6H44V38H0z"></path><circle cx="22" cy="22" r="4"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/motorcycle.svg b/www/img/mcc-icons/motorcycle.svg
index de7c042fa..177c51ca9 100644
--- a/www/img/mcc-icons/motorcycle.svg
+++ b/www/img/mcc-icons/motorcycle.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>motorcycle</title>
-    <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="#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>
-                    <path d="M21.587904,0.003793 C9.4766874,0.2253742 -4.4e-06,9.8867579 0,22 L0,34 C1.9e-06,39.5228462 4.4771504,44 9.9999962,44 L28,44 C36.8365555,44 44,36.8365555 44,28 L44,22 C44,9.7126541 33.9267693,-0.2219533 21.587904,0.003793 L21.587904,0.003793 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>motorcycle</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 34h21.117a4 4 0 0 0 3.795-2.735l3.333-10C29.108 18.675 27.181 16 24.45 16H.827" transform="translate(-140 -1942) translate(140 1942) translate(.5 .5)"></path><path d="M21.588.004C9.477.225 0 9.887 0 22v12c0 5.523 4.477 10 10 10h18c8.837 0 16-7.163 16-16v-6C44 9.713 33.927-.222 21.588.004z" transform="translate(-140 -1942) translate(140 1942) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/music.svg b/www/img/mcc-icons/music.svg
index 7d11f7e9e..aa1ab63e1 100644
--- a/www/img/mcc-icons/music.svg
+++ b/www/img/mcc-icons/music.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="43px" height="41px" viewBox="0 0 43 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>music</title>
-    <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="#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>
-                    <path d="M42,10 L42,30" id="Shape"></path>
-                    <rect id="Rectangle-path" x="12" y="0" width="30" height="10"></rect>
-                    <circle id="Oval" cx="6" cy="34" r="6"></circle>
-                    <circle id="Oval" cx="36" cy="30" r="6"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="43" height="41" viewBox="0 0 43 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>music</title><g transform="translate(-85 -605) translate(85 605) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M12 10v24"></path><path d="M42 10v20"></path><path d="M12 0H42V10H12z"></path><circle cx="6" cy="34" r="6"></circle><circle cx="36" cy="30" r="6"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/newspaper.svg b/www/img/mcc-icons/newspaper.svg
index e564969f0..8572e8223 100644
--- a/www/img/mcc-icons/newspaper.svg
+++ b/www/img/mcc-icons/newspaper.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="36px" viewBox="0 0 46 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>newspaper</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="34" height="34" viewBox="0 0 34 34" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>newspaper</title><g stroke="#444444" stroke-width=".8" fill="none" fill-rule="evenodd" stroke-linecap="square"><path d="M3.67 33.033a2.945 2.945 0 0 1-2.936-2.936V18.352h5.873"></path><path d="M6.607.734v29.363a2.945 2.945 0 0 1-2.937 2.936h26.427a2.945 2.945 0 0 0 2.936-2.936V.734H6.607z"></path><path d="M24.225 8h2.936"></path><path d="M24.225 13h2.936"></path><path d="M12.48 19h14.68"></path><path d="M12.48 25h14.68"></path><path d="M12.479 8.075H18.352V13.948H12.479z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/park.svg b/www/img/mcc-icons/park.svg
index 87c4348d6..233ed999e 100644
--- a/www/img/mcc-icons/park.svg
+++ b/www/img/mcc-icons/park.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="41px" viewBox="0 0 41 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>park</title>
-    <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="#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>
-                    <polyline id="Shape" points="27.875 20 40 20 30 0 24.20008 11.60019"></polyline>
-                    <path d="M20,34 L20,40" id="Shape"></path>
-                    <polygon id="Shape" points="34 34 6 34 20 2"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>park</title><g transform="translate(-142 -2203) translate(142 2203) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M12.12499 20L0 20 10 0 15.79992 11.60019"></path><path d="M27.875 20L40 20 30 0 24.20008 11.60019"></path><path d="M20 34v6"></path><path d="M34 34L6 34 20 2z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/people.svg b/www/img/mcc-icons/people.svg
index 3126e0600..e4ac4429e 100644
--- a/www/img/mcc-icons/people.svg
+++ b/www/img/mcc-icons/people.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="33px" height="43px" viewBox="0 0 33 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>people</title>
-    <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="#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>
-                    <path d="M24,30 L8,30 C3.6,30 0,33.6 0,38 L0,42 L32,42 L32,38 C32,33.6 28.4,30 24,30 L24,30 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="33" height="43" viewBox="0 0 33 43" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>people</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M16 24c-5.5 0-10-4.5-10-10v-4C6 4.5 10.5 0 16 0s10 4.5 10 10v4c0 5.5-4.5 10-10 10z" transform="translate(-146 -2406) translate(146 2406) translate(.5 .5)"></path><path d="M24 30H8c-4.4 0-8 3.6-8 8v4h32v-4c0-4.4-3.6-8-8-8z" transform="translate(-146 -2406) translate(146 2406) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/pet.svg b/www/img/mcc-icons/pet.svg
index 220ae5a39..f63e7edbb 100644
--- a/www/img/mcc-icons/pet.svg
+++ b/www/img/mcc-icons/pet.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="41px" viewBox="0 0 45 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>pet</title>
-    <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="#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>
-                    <ellipse id="Oval" stroke-width="1.00000217" transform="translate(5.816910, 18.173786) rotate(-17.102940) translate(-5.816910, -18.173786) " cx="5.81691012" cy="18.1737864" rx="3.66667795" ry="5.13334113"></ellipse>
-                    <ellipse id="Oval" stroke-width="1.00000217" transform="translate(42.183220, 18.173594) rotate(197.102940) translate(-42.183220, -18.173594) " cx="42.1832201" cy="18.1735936" rx="3.66667795" ry="5.13334113"></ellipse>
-                    <ellipse id="Oval" stroke-width="0.999997733" transform="translate(31.333232, 7.064988) rotate(3.104666) translate(-31.333232, -7.064988) " cx="31.3332323" cy="7.06498768" rx="4.39999003" ry="5.8666567"></ellipse>
-                    <path d="M15.75203,21.99111 L11.93886,29.47201 C8.75918,35.7101 14.2029,43.05885 20.08191,40.46472 C22.84626,39.24494 25.15233,39.24433 27.91808,40.46472 C33.79709,43.05885 39.24081,35.7101 36.06113,29.47201 L32.24796,21.99111 C28.27912,15.3363 19.72088,15.3363 15.75203,21.99111 L15.75203,21.99111 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="41" viewBox="0 0 45 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>pet</title><g transform="translate(-140 -2340) translate(138 2339) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><ellipse stroke-width="1" transform="rotate(-3.001 16.667 7.065)" cx="16.667" cy="7.065" rx="4.4" ry="5.867"></ellipse><ellipse stroke-width="1" transform="rotate(-17.103 5.817 18.174)" cx="5.817" cy="18.174" rx="3.667" ry="5.133"></ellipse><ellipse stroke-width="1" transform="rotate(-162.897 42.183 18.174)" cx="42.183" cy="18.174" rx="3.667" ry="5.133"></ellipse><ellipse stroke-width="1" transform="rotate(3.105 31.333 7.065)" cx="31.333" cy="7.065" rx="4.4" ry="5.867"></ellipse><path d="M15.752 21.991l-3.813 7.481c-3.18 6.238 2.264 13.587 8.143 10.993 2.764-1.22 5.07-1.22 7.836 0 5.88 2.594 11.323-4.755 8.143-10.993l-3.813-7.48c-3.969-6.656-12.527-6.656-16.496 0z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/plant.svg b/www/img/mcc-icons/plant.svg
index a579234f2..d693aefc3 100644
--- a/www/img/mcc-icons/plant.svg
+++ b/www/img/mcc-icons/plant.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="25px" height="43px" viewBox="0 0 25 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>plant</title>
-    <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="#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>
-                    <path d="M12,15 L12,42" id="Shape"></path>
-                    <path d="M2,42 L22,42" id="Shape"></path>
-                    <path d="M12,29 L17,24" id="Shape"></path>
-                    <path d="M7,19 L12,24" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="25" height="43" viewBox="0 0 25 43" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>plant</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M0 24C0 14.125 12 0 12 0s12 14.125 12 24c0 6.627-5.373 10-12 10S0 30.627 0 24z" transform="translate(-150 -2269) translate(150 2269) translate(.5 .5)"></path><path d="M12 15v27" transform="translate(-150 -2269) translate(150 2269) translate(.5 .5)"></path><path d="M2 42h20" transform="translate(-150 -2269) translate(150 2269) translate(.5 .5)"></path><path d="M12 29l5-5" transform="translate(-150 -2269) translate(150 2269) translate(.5 .5)"></path><path d="M7 19l5 5" transform="translate(-150 -2269) translate(150 2269) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/purchase.svg b/www/img/mcc-icons/purchase.svg
index 1f7c914e0..5d2b3fcb2 100644
--- a/www/img/mcc-icons/purchase.svg
+++ b/www/img/mcc-icons/purchase.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="43px" height="45px" viewBox="0 0 43 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>purchase</title>
-    <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="#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>
-                    <circle id="Oval" cx="12" cy="12" r="4"></circle>
-                    <path d="M24,18 L30,24" id="Shape"></path>
-                    <path d="M18,24 L24,30" id="Shape"></path>
-                    <path d="M13.8,15.6 C12.8,13.4 11.5,12 10,12 C6.7,12 4,19.2 4,28 C4,36.8 6.7,44 10,44 C12.6,44 14.8,39.7 15.6,33.6" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="43" height="45" viewBox="0 0 43 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>purchase</title><g transform="translate(-141 -2475) translate(141 2475) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M24 42L42 24 18 0 0 0 0 18z"></path><circle cx="12" cy="12" r="4"></circle><path d="M24 18l6 6"></path><path d="M18 24l6 6"></path><path d="M13.8 15.6c-1-2.2-2.3-3.6-3.8-3.6-3.3 0-6 7.2-6 16s2.7 16 6 16c2.6 0 4.8-4.3 5.6-10.4"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/repair.svg b/www/img/mcc-icons/repair.svg
index 36a75b55c..bca6724d1 100644
--- a/www/img/mcc-icons/repair.svg
+++ b/www/img/mcc-icons/repair.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="44px" viewBox="0 0 45 44" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>repair</title>
-    <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="#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>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="44" viewBox="0 0 45 44" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>repair</title><path d="M42.5 8.6l-5.9 5.9-7.1-7.1 5.9-5.9C34 1.1 32.6.9 31 1c-5.6.5-10.1 5.5-10 11.1 0 1.1.2 2.2.5 3.2l-19.2 17c-2.9 2.5-3 7-.3 9.7 2.7 2.7 7.1 2.6 9.7-.3l17-19.2c1.7.5 3.6.7 5.6.3 4-.8 7.3-3.8 8.4-7.7.5-2.3.4-4.5-.2-6.5z" transform="translate(-140 -2546) translate(140 2545) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/sadface.svg b/www/img/mcc-icons/sadface.svg
index 963241c4a..422101d0c 100644
--- a/www/img/mcc-icons/sadface.svg
+++ b/www/img/mcc-icons/sadface.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>sadface</title>
-    <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="#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>
-                    <path d="M15.1,32 C16.5,29.6 19.1,28 22,28 C25,28 27.5,29.6 28.9,32" id="Shape"></path>
-                    <circle id="Oval" cx="14" cy="14" r="2"></circle>
-                    <circle id="Oval" cx="30" cy="14" r="2"></circle>
-                    <path d="M32,24 C32,22.9 30,20 30,20 C30,20 28,22.9 28,24 C28,25.1 28.9,26 30,26 C31.1,26 32,25.1 32,24 L32,24 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>sadface</title><g transform="translate(-140 -2615) translate(140 2615) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><circle cx="22" cy="22" r="22"></circle><path d="M15.1 32c1.4-2.4 4-4 6.9-4 3 0 5.5 1.6 6.9 4"></path><circle cx="14" cy="14" r="2"></circle><circle cx="30" cy="14" r="2"></circle><path d="M32 24c0-1.1-2-4-2-4s-2 2.9-2 4 .9 2 2 2 2-.9 2-2z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/scissors.svg b/www/img/mcc-icons/scissors.svg
index 519c03f53..cb41a20d6 100644
--- a/www/img/mcc-icons/scissors.svg
+++ b/www/img/mcc-icons/scissors.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="41px" height="41px" viewBox="0 0 41 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>scissors</title>
-    <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="#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>
-                    <path d="M29.122,30.505 L4,0" id="Shape"></path>
-                    <circle id="Oval" cx="34" cy="34" r="6"></circle>
-                    <circle id="Oval" cx="6" cy="34" r="6"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>scissors</title><g transform="translate(-142 -2686) translate(142 2686) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M10.878 30.505L36 0"></path><path d="M29.122 30.505L4 0"></path><circle cx="34" cy="34" r="6"></circle><circle cx="6" cy="34" r="6"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/search.svg b/www/img/mcc-icons/search.svg
index d1ec0ddf5..1fd6c2659 100644
--- a/www/img/mcc-icons/search.svg
+++ b/www/img/mcc-icons/search.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="43px" viewBox="0 0 45 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>search</title>
-    <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="#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>
-                    <ellipse id="Oval" cx="18.8372093" cy="18" rx="18.8372093" ry="18"></ellipse>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="43" viewBox="0 0 45 43" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>search</title><g transform="translate(-140 -2752) translate(140 2752) translate(.523 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M43.953 42L32.128 30.7"></path><ellipse cx="18.837" cy="18" rx="18.837" ry="18"></ellipse></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/shirt.svg b/www/img/mcc-icons/shirt.svg
index 1f67a93fe..2537830d7 100644
--- a/www/img/mcc-icons/shirt.svg
+++ b/www/img/mcc-icons/shirt.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>shirt</title>
-    <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="#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>
-                    <path d="M15,24 L16,24" id="Shape"></path>
-                    <path d="M15,31 L16,31" id="Shape"></path>
-                    <path d="M15,38 L16,38" id="Shape"></path>
-                    <polyline id="Shape" points="34 6 44 6 44 44 0 44 0 6 10 6"></polyline>
-                    <polyline id="Shape" points="34 0 22 10 34 18 34 0 10 0 10 18 22 10 10 0"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>shirt</title><g transform="translate(-140 -2880) translate(140 2880) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M22 10v34"></path><path d="M15 24h1"></path><path d="M15 31h1"></path><path d="M15 38h1"></path><path d="M34 6L44 6 44 44 0 44 0 6 10 6"></path><path d="M34 0L22 10 34 18 34 0 10 0 10 18 22 10 10 0"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/shoes.svg b/www/img/mcc-icons/shoes.svg
index e460c4919..17af5353a 100644
--- a/www/img/mcc-icons/shoes.svg
+++ b/www/img/mcc-icons/shoes.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="25px" viewBox="0 0 45 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>shoes</title>
-    <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="#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>
-                    <path d="M0,19 L44,19" id="Shape"></path>
-                    <path d="M40,24 L4,24 C1.8,24 0,22.2 0,20 L0,0 L2,0 C2,0 4.9,4 10,4 C15.1,4 18,0 18,0 L20,0 L34,10 L38,10 C41.3,10 44,12.7 44,16 L44,20 C44,22.2 42.2,24 40,24 L40,24 Z" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="25" viewBox="0 0 45 25" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>shoes</title><g transform="translate(-140 -2955) translate(140 2955) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M14.8 2.7L25 10 34 10"></path><path d="M0 19h44"></path><path d="M40 24H4c-2.2 0-4-1.8-4-4V0h2s2.9 4 8 4 8-4 8-4h2l14 10h4c3.3 0 6 2.7 6 6v4c0 2.2-1.8 4-4 4z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/smiley-face.svg b/www/img/mcc-icons/smiley-face.svg
index 99967b26e..298e51164 100644
--- a/www/img/mcc-icons/smiley-face.svg
+++ b/www/img/mcc-icons/smiley-face.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>smiley-face</title>
-    <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="#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>
-                    <path d="M14,26 C14,30.4 17.6,34 22,34 C26.4,34 30,30.4 30,26" id="Shape"></path>
-                    <circle id="Oval" cx="14" cy="16" r="2"></circle>
-                    <circle id="Oval" cx="30" cy="16" r="2"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>smiley-face</title><g transform="translate(-140 -2814) translate(140 2814) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><circle cx="22" cy="22" r="22"></circle><path d="M14 26c0 4.4 3.6 8 8 8s8-3.6 8-8"></path><circle cx="14" cy="16" r="2"></circle><circle cx="30" cy="16" r="2"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/suitcase.svg b/www/img/mcc-icons/suitcase.svg
index f18da30ed..59cad03d1 100644
--- a/www/img/mcc-icons/suitcase.svg
+++ b/www/img/mcc-icons/suitcase.svg
@@ -1,25 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="41px" viewBox="0 0 45 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>business-48px-outline_briefcase-25</title>
-    <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="#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>
-                    <polyline id="Shape" points="44 28 44 40 0 40 0 28"></polyline>
-                    <path d="M30,28 L14,28" id="Shape"></path>
-                    <polyline id="Shape" points="6 28 0 28 0 6 44 6 44 28 38 28"></polyline>
-                    <path d="M10,6 L10,24" id="Shape"></path>
-                    <path d="M34,6 L34,24" id="Shape"></path>
-                    <path d="M34,32 L34,40" id="Shape"></path>
-                    <path d="M10,32 L10,40" id="Shape"></path>
-                    <rect id="Rectangle-path" x="6" y="24" width="8" height="8"></rect>
-                    <rect id="Rectangle-path" x="30" y="24" width="8" height="8"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="41" viewBox="0 0 45 41" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>business-48px-outline_briefcase-25</title><g transform="translate(-1111 -751) translate(1111 751) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M14 6L14 0 30 0 30 6"></path><path d="M44 28L44 40 0 40 0 28"></path><path d="M30 28H14"></path><path d="M6 28L0 28 0 6 44 6 44 28 38 28"></path><path d="M10 6v18"></path><path d="M34 6v18"></path><path d="M34 32v8"></path><path d="M10 32v8"></path><path d="M6 24H14V32H6z"></path><path d="M30 24H38V32H30z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/telephone.svg b/www/img/mcc-icons/telephone.svg
index 370bd087f..424f34fe7 100644
--- a/www/img/mcc-icons/telephone.svg
+++ b/www/img/mcc-icons/telephone.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="46px" height="46px" viewBox="0 0 46 46" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>telephone</title>
-    <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="#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>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="46" height="46" viewBox="0 0 46 46" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>telephone</title><path d="M36.695 45.427c-5.318 0-12.283-4.376-22.142-14.236C4.529 20.085.128 12.721.693 8.061 1 5.449 2.811 3.708 5.846 1.614 7.023.767 7.916.46 8.717.602c1.53.282 3.388 2.259 6.212 6.612 3.435 5.341 2.47 6.165.847 7.506-1.153.941-2.376 2-2.376 3.341 0 .66.282 1.248.776 1.789 2.8 3.106 8.118 8.588 12.071 12.165a2.92 2.92 0 0 0 1.977.753c1.647 0 3.13-1.624 3.576-2.024 1.671-1.506 2.518-2.259 7.483 1.012 3.86 2.518 6.071 5.083 6.071 7.224 0 1.906-3.93 6.447-8.66 6.447z" stroke="#444444" stroke-width=".8" fill-rule="nonzero" fill="none"></path></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/television.svg b/www/img/mcc-icons/television.svg
index c6fcb6c60..0a402da0c 100644
--- a/www/img/mcc-icons/television.svg
+++ b/www/img/mcc-icons/television.svg
@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>television</title>
-    <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="#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>
-                    <path d="M22,12 L32,0" id="Shape"></path>
-                    <rect id="Rectangle-path" x="0" y="12" width="44" height="32"></rect>
-                    <rect id="Rectangle-path" x="6" y="18" width="26" height="20"></rect>
-                    <path d="M38,18 L38,20" id="Shape"></path>
-                    <path d="M38,28 L38,38" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>television</title><g transform="translate(-140 -3081) translate(140 3081) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M16 4l6 8"></path><path d="M22 12L32 0"></path><path d="M0 12H44V44H0z"></path><path d="M6 18H32V38H6z"></path><path d="M38 18v2"></path><path d="M38 28v10"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/tent.svg b/www/img/mcc-icons/tent.svg
index 54cb9e1c7..5edf93d0b 100644
--- a/www/img/mcc-icons/tent.svg
+++ b/www/img/mcc-icons/tent.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>tent</title>
-    <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="#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>
-                    <path d="M44,32 L28,32" id="Shape"></path>
-                    <polyline id="Shape" points="20 44 20 36 14 29.2 8 36 8 44"></polyline>
-                    <polyline id="Shape" points="14 16 28 32 28 44"></polyline>
-                    <polygon id="Shape" points="0 44 0 32 14 16 30 16 44 32 44 44"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="45" viewBox="0 0 45 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>tent</title><g transform="translate(-140 -3152) translate(140 3152) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><circle cx="38" cy="6" r="6"></circle><path d="M44 32H28"></path><path d="M20 44L20 36 14 29.2 8 36 8 44"></path><path d="M14 16L28 32 28 44"></path><path d="M0 44L0 32 14 16 30 16 44 32 44 44z"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/ticket.svg b/www/img/mcc-icons/ticket.svg
index 6906c2577..a21490151 100644
--- a/www/img/mcc-icons/ticket.svg
+++ b/www/img/mcc-icons/ticket.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="33px" viewBox="0 0 45 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>ticket</title>
-    <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="#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>
-                    <path d="M14,12 L30,12" id="Shape"></path>
-                    <path d="M14,20 L22,20" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="33" viewBox="0 0 45 33" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>ticket</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M38 16c0-3.3 2.7-6 6-6V0H0v10c3.3 0 6 2.7 6 6s-2.7 6-6 6v10h44V22c-3.3 0-6-2.7-6-6z" transform="translate(-140 -3222) translate(140 3222) translate(.5 .5)"></path><path d="M14 12h16" transform="translate(-140 -3222) translate(140 3222) translate(.5 .5)"></path><path d="M14 20h8" transform="translate(-140 -3222) translate(140 3222) translate(.5 .5)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/toy.svg b/www/img/mcc-icons/toy.svg
index 42028cae1..0a48dc10a 100644
--- a/www/img/mcc-icons/toy.svg
+++ b/www/img/mcc-icons/toy.svg
@@ -1,23 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="43px" viewBox="0 0 45 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>toy</title>
-    <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="#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>
-                    <circle id="Oval" cx="38" cy="6" r="6"></circle>
-                    <circle id="Oval" cx="22" cy="24" r="18"></circle>
-                    <polygon id="Shape" points="22 28 24 24 20 24"></polygon>
-                    <path d="M22,28 L22,32" id="Shape"></path>
-                    <path d="M18,32 L26,32" id="Shape"></path>
-                    <circle id="Oval" cx="16" cy="18" r="1"></circle>
-                    <circle id="Oval" cx="28" cy="18" r="1"></circle>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="45" height="43" viewBox="0 0 45 43" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>toy</title><g transform="translate(-140 -3281) translate(140 3281) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><circle cx="6" cy="6" r="6"></circle><circle cx="38" cy="6" r="6"></circle><circle cx="22" cy="24" r="18"></circle><path d="M22 28L24 24 20 24z"></path><path d="M22 28v4"></path><path d="M18 32h8"></path><circle cx="16" cy="18" r="1"></circle><circle cx="28" cy="18" r="1"></circle></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/truck.svg b/www/img/mcc-icons/truck.svg
index bd597e9fc..4bd63b7e1 100644
--- a/www/img/mcc-icons/truck.svg
+++ b/www/img/mcc-icons/truck.svg
@@ -1,24 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="52px" height="37px" viewBox="0 0 52 37" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>truck</title>
-    <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="#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>
-                    <path d="M37.1,30 L20.9,30" id="Shape"></path>
-                    <path d="M11.1,30 L7,30 L7,18 L33,18 L33,4 L40,4 C42.2,4 51,16 51,16 L51,30 L46.9,30" id="Shape"></path>
-                    <circle id="Oval" cx="16" cy="31" r="5"></circle>
-                    <circle id="Oval" cx="42" cy="31" r="5"></circle>
-                    <rect id="Rectangle-path" x="0" y="0" width="33" height="18"></rect>
-                </g>
-                <path d="M2.5,3.5 L30.5,3.5" id="Line" stroke-linecap="square"></path>
-                <path d="M2.5,6.5 L30.5,6.5" id="Line-Copy" stroke-linecap="square"></path>
-                <path d="M2.5,9.5 L30.5,9.5" id="Line-Copy-2" stroke-linecap="square"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="52" height="37" viewBox="0 0 52 37" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>truck</title><g stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><g transform="translate(-1108 -1350) translate(1108 1350) translate(.5 .5)"><path d="M39 10L39 18 45 18"></path><path d="M37.1 30H20.9"></path><path d="M11.1 30H7V18h26V4h7c2.2 0 11 12 11 12v14h-4.1"></path><circle cx="16" cy="31" r="5"></circle><circle cx="42" cy="31" r="5"></circle><path d="M0 0H33V18H0z"></path></g><path d="M2.5 3.5h28" stroke-linecap="square" transform="translate(-1108 -1350) translate(1108 1350)"></path><path d="M2.5 6.5h28" stroke-linecap="square" transform="translate(-1108 -1350) translate(1108 1350)"></path><path d="M2.5 9.5h28" stroke-linecap="square" transform="translate(-1108 -1350) translate(1108 1350)"></path></g></g></svg>
\ No newline at end of file
diff --git a/www/img/mcc-icons/watch.svg b/www/img/mcc-icons/watch.svg
index 3ac34787f..3ec73801f 100644
--- a/www/img/mcc-icons/watch.svg
+++ b/www/img/mcc-icons/watch.svg
@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="37px" height="45px" viewBox="0 0 37 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-    <title>watch</title>
-    <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="#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>
-                    <polyline id="Shape" points="25.9 34.6 24 44 8 44 6.1 34.5"></polyline>
-                    <polyline id="Shape" points="31.5 18 36 18 36 26 31.5 26"></polyline>
-                    <circle id="Oval" cx="16" cy="22" r="16"></circle>
-                    <polyline id="Shape" points="16 16 16 22 22 22"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<svg width="37" height="45" viewBox="0 0 37 45" xmlns="http://www.w3.org/2000/svg"><g class="nc-icon-wrapper" fill="#444444"><title>watch</title><g transform="translate(-144 -3349) translate(144 3349) translate(.5 .5)" stroke="#444444" stroke-width="1" fill="none" fill-rule="evenodd"><path d="M6.1 9.4L8 0 24 0 25.9 9.4"></path><path d="M25.9 34.6L24 44 8 44 6.1 34.5"></path><path d="M31.5 18L36 18 36 26 31.5 26"></path><circle cx="16" cy="22" r="16"></circle><path d="M16 16L16 22 22 22"></path></g></g></svg>
\ No newline at end of file