From 05add578830cb97df239fe2798fb2622bcae6540 Mon Sep 17 00:00:00 2001
From: magmahindenburg <emil@moar.se>
Date: Thu, 6 Jul 2017 14:13:37 +0900
Subject: [PATCH] Fixed price chart page and updated tab  icons

---
 app-template/bitcoincom/appConfig.json        |   2 +
 .../img/tab-icons/ico-home-selected.svg       |  64 ++++++--
 .../bitcoincom/img/tab-icons/ico-home.svg     |  60 ++++++-
 .../img/tab-icons/ico-receive-selected.svg    | 127 ++++++++++++---
 .../bitcoincom/img/tab-icons/ico-receive.svg  | 124 ++++++++++++--
 .../img/tab-icons/ico-scan-selected.svg       | 104 ++++++++++--
 .../bitcoincom/img/tab-icons/ico-scan.svg     | 102 ++++++++++--
 .../img/tab-icons/ico-send-selected.svg       |  78 +++++++--
 .../bitcoincom/img/tab-icons/ico-send.svg     |  75 +++++++--
 .../img/tab-icons/ico-settings-selected.svg   |  95 ++++++-----
 .../bitcoincom/img/tab-icons/ico-settings.svg |  84 ++++++----
 src/js/controllers/pricechart.js              |  13 +-
 src/js/services/pricechartService.js          |   2 +-
 www/css/bitcoin.com.css                       |  34 ++--
 www/css/main.css                              |  42 +++--
 www/img/chart.svg                             | 153 ++++++++++++++++++
 www/img/tab-icons/ico-home-selected.svg       |  64 ++++++--
 www/img/tab-icons/ico-home.svg                |  60 ++++++-
 www/img/tab-icons/ico-receive-selected.svg    | 127 ++++++++++++---
 www/img/tab-icons/ico-receive.svg             | 124 ++++++++++++--
 www/img/tab-icons/ico-scan-selected.svg       | 104 ++++++++++--
 www/img/tab-icons/ico-scan.svg                | 102 ++++++++++--
 www/img/tab-icons/ico-send-selected.svg       |  78 +++++++--
 www/img/tab-icons/ico-send.svg                |  75 +++++++--
 www/img/tab-icons/ico-settings-selected.svg   |  95 ++++++-----
 www/img/tab-icons/ico-settings.svg            |  84 ++++++----
 www/index.html                                |   1 -
 www/views/pricechart.html                     |   9 +-
 28 files changed, 1685 insertions(+), 397 deletions(-)
 create mode 100644 www/img/chart.svg

diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json
index bd461bd31..f8ce8f195 100644
--- a/app-template/bitcoincom/appConfig.json
+++ b/app-template/bitcoincom/appConfig.json
@@ -17,6 +17,8 @@
   "url": "https://wallet.bitcoin.com",
   "appDescription": "Bitcoin.com Wallet",
   "winAppName": "BitcoinWallet",
+  "WindowsStoreIdentityName": "18C7659D.Bitcoin.com-SecureBitcoinWallet",
+  "WindowsStoreDisplayName": "Bitcoin.com - Secure Bitcoin Wallet",
   "wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}",
   "wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}",
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
diff --git a/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg
index aac839b0a..9088ea1f4 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg
@@ -1,10 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Home" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 20 24" style="enable-background:new 0 0 20 24;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#fab915;}
-    .st1{fill:#343434;}
-</style>
-<polygon class="st0" points="10,0.9 0.7,9.4 0.7,23.3 6.9,23.3 6.9,15.8 13.1,15.8 13.1,23.3 19.3,23.3 19.3,9.4 "/>
-<path class="st1" d="M20,24h-7.5v-7.5H7.5V24H0V9.1L10,0l10,9.1V24z M13.8,22.6h4.8V9.7L10,1.9L1.4,9.7v12.9h4.8v-7.5h7.6V22.6z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Home"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.441246 23.999983"
+   xml:space="preserve"
+   sodipodi:docname="ico-home-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.441246"
+   height="23.999983"><metadata
+     id="metadata5945"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5943" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5941"
+     showgrid="false"
+     inkscape:zoom="33.04169"
+     inkscape:cx="13.220621"
+     inkscape:cy="11.999991"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Home"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5936">
+	.st0{fill:#343434;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 13.093671,0.49998273 0.4999207,11.947249 H 3.644452 v 11.552734 h 3.7617187 v -9.326172 h 4.9375003 v 9.326172 h 10.296874 l 0.05859,-11.552734 h 3.242188 L 20.12492,6.7656078 V 2.300764 H 17.400311 V 4.3378734 Z M 15.158123,14.173811 h 4.029297 v 4.541016 h -4.029297 z"
+     id="path4483"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-home.svg b/app-template/bitcoincom/img/tab-icons/ico-home.svg
index 4297cf20c..d57482412 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-home.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-home.svg
@@ -1,8 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Home" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 24" style="enable-background:new 0 0 20 24;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Home"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.441246 23.999983"
+   xml:space="preserve"
+   sodipodi:docname="ico-home.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.441246"
+   height="23.999983"><metadata
+     id="metadata5945"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5943" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5941"
+     showgrid="false"
+     inkscape:zoom="33.04169"
+     inkscape:cx="13.220621"
+     inkscape:cy="11.999991"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Home"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5936">
 	.st0{fill:#343434;}
-</style>
-<path class="st0" d="M20,24h-7.5v-7.5H7.5V24H0V9.1L10,0l10,9.1V24z M13.8,22.6h4.8V9.7L10,1.9L1.4,9.7v12.9h4.8v-7.5h7.6V22.6z"/>
-</svg>
+</style><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 13.093671,0.49998273 0.4999207,11.947249 H 3.644452 v 11.552734 h 3.7617187 v -9.326172 h 4.9375003 v 9.326172 h 10.296874 l 0.05859,-11.552734 h 3.242188 L 20.12492,6.7656078 V 2.300764 H 17.400311 V 4.3378734 Z M 15.158123,14.173811 h 4.029297 v 4.541016 h -4.029297 z"
+     id="path4483"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg
index e79ee026e..deccc0f1e 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg
@@ -1,20 +1,107 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="QR_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#fab915;}
-    .st1{fill:#343434;}
-</style>
-<rect x="13.5" y="1.2" class="st0" width="7.3" height="7.3"/>
-<rect x="1.2" y="13.5" class="st0" width="7.3" height="7.3"/>
-<rect x="1.2" y="1.2" class="st0" width="7.3" height="7.3"/>
-<path class="st1" d="M9.7,9.7H0V0h9.7V9.7z M1.2,8.5h7.3V1.2H1.2V8.5z"/>
-<path class="st1" d="M22,9.7h-9.7V0H22V9.7z M13.5,8.5h7.3V1.2h-7.3V8.5z"/>
-<path class="st1" d="M9.7,22H0v-9.7h9.7V22z M1.2,20.8h7.3v-7.3H1.2V20.8z"/>
-<polygon class="st1" points="22,17.6 20.8,17.6 20.8,13.5 18.2,13.5 18.2,16.3 13.2,16.3 13.2,12.9 14.4,12.9 14.4,15.1 17,15.1
-    17,12.3 22,12.3 "/>
-<polygon class="st1" points="21.4,22 13.2,22 13.2,19.5 14.4,19.5 14.4,20.8 21.4,20.8 "/>
-<rect x="3.8" y="3.8" class="st1" width="2.2" height="2.2"/>
-<rect x="16" y="3.8" class="st1" width="2.2" height="2.2"/>
-<rect x="3.8" y="16" class="st1" width="2.2" height="2.2"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="QR_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22 22"
+   style="enable-background:new 0 0 22 22;"
+   xml:space="preserve"
+   sodipodi:docname="ico-receive-selected.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs23" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="27.402967"
+     inkscape:cx="9.3590309"
+     inkscape:cy="10.542241"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="QR_Icon" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#343434;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     d="m 11.751962,16.124854 c 0,0 2.022169,0.82094 2.613915,0.754494 0.580406,-0.06517 3.676717,-1.814529 5.494319,-2.846031 1.462966,-0.830244 2.591582,0.660811 1.257879,1.561505 -1.521828,1.02774 -6.619354,4.020995 -7.829208,4.012197 C 11.294229,19.592512 2.1474669,17.497101 2.1474669,17.497101"
+     id="path4504"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssssc" /><g
+     id="g4582"
+     transform="matrix(0.90723485,0,0,0.90723485,2.36444,3.0085723)"
+     style="stroke-width:0.55112521;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 6.8630415,6.9967388 a 3.480648,3.480648 0 0 1 3.5396555,-3.4180565 3.480648,3.480648 0 0 1 3.420619,3.537179 3.480648,3.480648 0 0 1 -3.5347,3.4231807 3.480648,3.480648 0 0 1 -3.4257398,-3.5322204"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="3.480648"
+       sodipodi:rx="3.480648"
+       sodipodi:cy="7.0588207"
+       sodipodi:cx="10.343136"
+       sodipodi:type="arc"
+       id="path4508"
+       style="fill:#fab915;fill-opacity:1;stroke:#000000;stroke-width:0.55112521;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.44486314,0,0,0.44486314,-28.43135,-52.224958)"><path
+         id="path4527"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g><g
+     id="g4587"
+     transform="matrix(0.81854393,0,0,0.81854393,4.6439463,1.1203143)"
+     style="stroke-width:0.61084076;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="M 12.520082,4.8183773 A 2.7159257,2.7159257 0 0 1 15.282051,2.1512914 2.7159257,2.7159257 0 0 1 17.951137,4.9113277 2.7159257,2.7159257 0 0 1 15.193034,7.5824119 2.7159257,2.7159257 0 0 1 12.519953,4.8262448"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="2.7159257"
+       sodipodi:rx="2.7159257"
+       sodipodi:cy="4.8668194"
+       sodipodi:cx="15.235576"
+       sodipodi:type="arc"
+       id="path4508-3"
+       style="fill:#fab915;fill-opacity:1;stroke:#000000;stroke-width:0.54975669;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487-5"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.34712364,0,0,0.34712364,-15.019888,-41.391904)"><path
+         id="path4527-6"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     d="m 2.1474669,17.497101 c 0,0 -0.066277,-3.709739 4.4331886,-3.694935 1.3611187,-0.05817 2.6485391,0.345582 3.7287885,0.289227 0.578433,-0.03018 2.483508,-0.297611 4.139254,-0.644783 1.655745,-0.347172 1.836545,1.451895 0.476939,1.823833 -2.50459,0.685165 -5.3653783,1.33553 -5.3653783,1.33553"
+     id="path4502"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccszsc" /><rect
+     style="fill:#fab915;fill-opacity:1;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     id="rect4553"
+     width="3.5497355"
+     height="6.5393057"
+     x="0.34308091"
+     y="13.035734"
+     ry="0.35189092"
+     rx="0.17066038" /></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-receive.svg b/app-template/bitcoincom/img/tab-icons/ico-receive.svg
index aab9aec69..3aa1fa70c 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-receive.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-receive.svg
@@ -1,16 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="QR_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="QR_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22 22"
+   style="enable-background:new 0 0 22 22;"
+   xml:space="preserve"
+   sodipodi:docname="ico-receive.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs23" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="27.402967"
+     inkscape:cx="9.3590309"
+     inkscape:cy="10.542241"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="QR_Icon" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:#343434;}
-</style>
-<path class="st0" d="M9.7,9.7H0V0h9.7V9.7z M1.2,8.5h7.3V1.2H1.2V8.5z"/>
-<path class="st0" d="M22,9.7h-9.7V0H22V9.7z M13.5,8.5h7.3V1.2h-7.3V8.5z"/>
-<path class="st0" d="M9.7,22H0v-9.7h9.7V22z M1.2,20.8h7.3v-7.3H1.2V20.8z"/>
-<polygon class="st0" points="22,17.6 20.8,17.6 20.8,13.5 18.2,13.5 18.2,16.3 13.2,16.3 13.2,12.9 14.4,12.9 14.4,15.1 17,15.1
-	17,12.3 22,12.3 "/>
-<polygon class="st0" points="21.4,22 13.2,22 13.2,19.5 14.4,19.5 14.4,20.8 21.4,20.8 "/>
-<rect x="3.8" y="3.8" class="st0" width="2.2" height="2.2"/>
-<rect x="16" y="3.8" class="st0" width="2.2" height="2.2"/>
-<rect x="3.8" y="16" class="st0" width="2.2" height="2.2"/>
-</svg>
+</style><g
+     id="g4551"
+     transform="matrix(0.88187101,0,0,0.88187101,2.7807345,2.3277703)"
+     style="stroke-width:0.56697634;stroke-miterlimit:4;stroke-dasharray:none"><path
+       sodipodi:nodetypes="ccszsc"
+       inkscape:connector-curvature="0"
+       id="path4502"
+       d="m 0.04036703,13.96358 c 0,0 1.64922167,-0.968945 3.81337637,-0.993538 2.164154,-0.02458 3.4585052,0.433253 4.6834567,0.36935 0.6559164,-0.03422 2.8161809,-0.337477 4.6937179,-0.731154 1.877537,-0.393677 2.082556,1.64638 0.540827,2.068141 -2.840087,0.776944 -6.0840853,1.514427 -6.0840853,1.514427"
+       style="fill:none;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.56697637;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208" /><path
+       sodipodi:nodetypes="cssssc"
+       inkscape:connector-curvature="0"
+       id="path4504"
+       d="m 10.172947,15.64524 c 0,0 2.293045,0.930907 2.964056,0.855561 0.658153,-0.0739 4.169223,-2.05759 6.230298,-3.227265 1.658935,-0.941457 2.938732,0.749328 1.426375,1.770673 -1.72568,1.165409 -7.506034,4.559618 -8.877951,4.549641 C 9.6539005,19.5774 -0.71809548,17.201303 -0.71809548,17.201303"
+       style="fill:none;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.56697637;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208" /></g><g
+     id="g4582"
+     transform="matrix(0.90723485,0,0,0.90723485,2.36444,3.0085723)"
+     style="stroke-width:0.55112521;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 6.8630415,6.9967388 a 3.480648,3.480648 0 0 1 3.5396555,-3.4180565 3.480648,3.480648 0 0 1 3.420619,3.537179 3.480648,3.480648 0 0 1 -3.5347,3.4231807 3.480648,3.480648 0 0 1 -3.4257398,-3.5322204"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="3.480648"
+       sodipodi:rx="3.480648"
+       sodipodi:cy="7.0588207"
+       sodipodi:cx="10.343136"
+       sodipodi:type="arc"
+       id="path4508"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.55112521;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.44486314,0,0,0.44486314,-28.43135,-52.224958)"><path
+         id="path4527"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g><rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     id="rect4553"
+     width="3.5497355"
+     height="6.5393057"
+     x="0.34308091"
+     y="13.035734"
+     ry="0.35189092"
+     rx="0.17066038" /><g
+     id="g4587"
+     transform="matrix(0.81854393,0,0,0.81854393,4.6439463,1.1203143)"
+     style="stroke-width:0.61084076;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="M 12.520082,4.8183773 A 2.7159257,2.7159257 0 0 1 15.282051,2.1512914 2.7159257,2.7159257 0 0 1 17.951137,4.9113277 2.7159257,2.7159257 0 0 1 15.193034,7.5824119 2.7159257,2.7159257 0 0 1 12.519953,4.8262448"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="2.7159257"
+       sodipodi:rx="2.7159257"
+       sodipodi:cy="4.8668194"
+       sodipodi:cx="15.235576"
+       sodipodi:type="arc"
+       id="path4508-3"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.54975669;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487-5"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.34712364,0,0,0.34712364,-15.019888,-41.391904)"><path
+         id="path4527-6"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg
index e3b2472ea..3df861ae3 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg
@@ -1,17 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Scan_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 32 20" style="enable-background:new 0 0 32 20;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#616263;}
-</style>
-<path class="st0" d="M6.3,6.3c-0.5,0-0.8-0.4-0.8-0.8V1.8C5.5,1.3,5.9,1,6.3,1H11c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H7.1
-    v3C7.1,5.9,6.7,6.3,6.3,6.3z"/>
-<path class="st0" d="M25.7,13.7c0.5,0,0.8,0.4,0.8,0.8v3.8c0,0.5-0.4,0.8-0.8,0.8H21c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-    h4v-3C24.9,14.1,25.3,13.7,25.7,13.7z"/>
-<path class="st0" d="M7.1,14.4v3h4c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H6.4c-0.5,0-0.8-0.4-0.8-0.8v-3.8
-    c0-0.5,0.4-0.8,0.8-0.8C6.7,13.7,7.1,14.1,7.1,14.4z"/>
-<path class="st0" d="M24.9,5.6v-3h-4c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8h4.7c0.5,0,0.8,0.4,0.8,0.8v3.8
-    c0,0.5-0.4,0.8-0.8,0.8C25.3,6.3,24.9,5.9,24.9,5.6z"/>
-<path class="st0" d="M31.1,10.8H0.8c-0.4,0-0.8-0.3-0.8-0.7c0-0.3,0.3-0.7,0.8-0.7h30.4c0.4,0,0.8,0.3,0.8,0.7
-    C31.9,10.4,31.6,10.8,31.1,10.8z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Scan_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22.957628 22.957628"
+   xml:space="preserve"
+   sodipodi:docname="ico-scan-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="22.957628"
+   height="22.957628"><metadata
+     id="metadata6589"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6587" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6585"
+     showgrid="false"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:zoom="11.8"
+     inkscape:cx="11.478814"
+     inkscape:cy="11.478814"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Scan_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style6572">
+	.st0{fill:#343434;}
+</style><rect
+     style="fill:#fab915;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect7138"
+     width="22.457628"
+     height="22.457628"
+     x="0.25"
+     y="0.25"
+     rx="0.80811942"
+     ry="0.93948829" /><path
+     class="st0"
+     d="M 21.220234,12.178814 H 1.6728817 c -0.2580508,0 -0.5161016,-0.3 -0.5161016,-0.7 0,-0.3 0.1935381,-0.7 0.5161016,-0.7 H 21.284747 c 0.25805,0 0.516101,0.3 0.516101,0.7 -0.06452,0.3 -0.258051,0.7 -0.580614,0.7 z"
+     id="path6582"
+     style="fill:#130e00;fill-opacity:1;stroke-width:0.80319804"
+     inkscape:connector-curvature="0" /><g
+     id="g7182"
+     transform="translate(-4.8735827,1.312858)"><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140"
+       d="M 8.6405327,7.1151086 V 1.8608713 H 13.89477"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-2"
+       d="m 24.064261,13.216803 v 5.254238 h -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-9"
+       d="m 18.810023,1.8608713 h 5.254238 v 5.2542376"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-1"
+       d="M 13.89477,18.471041 H 8.6405327 v -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-scan.svg b/app-template/bitcoincom/img/tab-icons/ico-scan.svg
index ea08ae0f0..33affc34a 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-scan.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-scan.svg
@@ -1,17 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Scan_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32 20" style="enable-background:new 0 0 32 20;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Scan_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22.957628 22.957628"
+   xml:space="preserve"
+   sodipodi:docname="ico-scan.svg"
+   inkscape:version="0.92.1 r15371"
+   width="22.957628"
+   height="22.957628"><metadata
+     id="metadata6589"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6587" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6585"
+     showgrid="false"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:zoom="11.8"
+     inkscape:cx="11.478814"
+     inkscape:cy="11.478814"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Scan_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style6572">
 	.st0{fill:#343434;}
-</style>
-<path class="st0" d="M6.3,6.3c-0.5,0-0.8-0.4-0.8-0.8V1.8C5.5,1.3,5.9,1,6.3,1H11c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H7.1
-	v3C7.1,5.9,6.7,6.3,6.3,6.3z"/>
-<path class="st0" d="M25.7,13.7c0.5,0,0.8,0.4,0.8,0.8v3.8c0,0.5-0.4,0.8-0.8,0.8H21c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	h4v-3C24.9,14.1,25.3,13.7,25.7,13.7z"/>
-<path class="st0" d="M7.1,14.4v3h4c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H6.4c-0.5,0-0.8-0.4-0.8-0.8v-3.8
-	c0-0.5,0.4-0.8,0.8-0.8C6.7,13.7,7.1,14.1,7.1,14.4z"/>
-<path class="st0" d="M24.9,5.6v-3h-4c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8h4.7c0.5,0,0.8,0.4,0.8,0.8v3.8
-	c0,0.5-0.4,0.8-0.8,0.8C25.3,6.3,24.9,5.9,24.9,5.6z"/>
-<path class="st0" d="M31.1,10.8H0.8c-0.4,0-0.8-0.3-0.8-0.7c0-0.3,0.3-0.7,0.8-0.7h30.4c0.4,0,0.8,0.3,0.8,0.7
-	C31.9,10.4,31.6,10.8,31.1,10.8z"/>
-</svg>
+</style><rect
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect7138"
+     width="22.457628"
+     height="22.457628"
+     x="0.25"
+     y="0.25"
+     rx="0.80811942"
+     ry="0.93948829" /><path
+     class="st0"
+     d="M 21.220234,12.178814 H 1.6728817 c -0.2580508,0 -0.5161016,-0.3 -0.5161016,-0.7 0,-0.3 0.1935381,-0.7 0.5161016,-0.7 H 21.284747 c 0.25805,0 0.516101,0.3 0.516101,0.7 -0.06452,0.3 -0.258051,0.7 -0.580614,0.7 z"
+     id="path6582"
+     style="fill:#130e00;fill-opacity:1;stroke-width:0.80319804"
+     inkscape:connector-curvature="0" /><g
+     id="g7182"
+     transform="translate(-4.8735827,1.312858)"><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140"
+       d="M 8.6405327,7.1151086 V 1.8608713 H 13.89477"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-2"
+       d="m 24.064261,13.216803 v 5.254238 h -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-9"
+       d="m 18.810023,1.8608713 h 5.254238 v 5.2542376"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-1"
+       d="M 13.89477,18.471041 H 8.6405327 v -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg
index 4500e9859..cf9c0329e 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg
@@ -1,12 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Send_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 27 24" style="enable-background:new 0 0 27 24;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#fab915;fill-opacity:0.4;stroke:#343434;stroke-width:1.4;}
-    .st1{fill:#fab915;fill-opacity:0.7145;stroke:#343434;stroke-width:1.4;}
-</style>
-<g>
-    <polyline class="st0" points="25.5,1.5 6.3,11.7 4.9,19.3 9.8,15.3   "/>
-    <polygon class="st1" points="1.5,6.4 25.5,1.5 17.1,22.5     "/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Send_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.601198 21.865164"
+   xml:space="preserve"
+   sodipodi:docname="ico-send-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.601198"
+   height="21.865164"><metadata
+     id="metadata5393"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5391" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5389"
+     showgrid="false"
+     inkscape:zoom="18.182416"
+     inkscape:cx="6.3895446"
+     inkscape:cy="12.438757"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Send_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5380">
+	.st0{fill:none;stroke:#343434;stroke-width:1.4;stroke-miterlimit:10;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 0.53184214,5.748004 5.6379957,11.386049 6.1843105,20.467863 Z"
+     id="path5950"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5.6379957,11.386049 26.062611,0.53547329"
+     id="path5954"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 6.1843105,20.467863 11.37701,15.383346 8.8888411,13.219721 Z"
+     id="path5948"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 17.002433,21.333313 8.8888411,13.219721 Z"
+     id="path5942"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-send.svg b/app-template/bitcoincom/img/tab-icons/ico-send.svg
index a5020691d..4d23e130e 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-send.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-send.svg
@@ -1,11 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Send_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 27 24" style="enable-background:new 0 0 27 24;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Send_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.601198 21.865164"
+   xml:space="preserve"
+   sodipodi:docname="ico-send.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.601198"
+   height="21.865164"><metadata
+     id="metadata5393"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5391" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5389"
+     showgrid="false"
+     inkscape:zoom="18.182416"
+     inkscape:cx="6.3895446"
+     inkscape:cy="12.438757"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Send_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5380">
 	.st0{fill:none;stroke:#343434;stroke-width:1.4;stroke-miterlimit:10;}
-</style>
-<g>
-	<polyline class="st0" points="25.5,1.5 6.3,11.7 4.9,19.3 9.8,15.3 	"/>
-	<polygon class="st0" points="1.5,6.4 25.5,1.5 17.1,22.5 	"/>
-</g>
-</svg>
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 0.53184214,5.748004 5.6379957,11.386049 6.1843105,20.467863 Z"
+     id="path5950"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5.6379957,11.386049 26.062611,0.53547329"
+     id="path5954"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 6.1843105,20.467863 11.37701,15.383346 8.8888411,13.219721 Z"
+     id="path5948"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 17.002433,21.333313 8.8888411,13.219721 Z"
+     id="path5942"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg
index 1419d97ee..cf3ead3fc 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg
@@ -1,40 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Settings" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 23 24" style="enable-background:new 0 0 23 24;" xml:space="preserve">
-<style type="text/css">
-    .st0{fill:#fab915;}
-    .st1{fill:#343434;}
-</style>
-<path id="fill" class="st0" d="M19.9,13.3c0.1-0.4,0.1-0.9,0.1-1.3c0-0.4,0-0.9-0.1-1.3L22,8.8c0.2-0.1,0.2-0.3,0.1-0.5
-    C21.7,7,21,5.7,20,4.7c-0.1-0.2-0.3-0.2-0.5-0.1l-2.7,0.9c-0.7-0.5-1.4-1-2.2-1.3L14,1.4C14,1.2,13.8,1,13.6,1
-    c-1.4-0.3-2.9-0.3-4.3,0C9.2,1,9,1.2,9,1.4L8.4,4.2C7.6,4.5,6.8,4.9,6.2,5.5L3.5,4.5C3.3,4.4,3.1,4.5,3,4.7C2,5.7,1.3,7,0.8,8.3
-    C0.8,8.5,0.8,8.7,1,8.8l2.2,1.9C3.1,11.1,3,11.6,3,12c0,0.4,0,0.9,0.1,1.3L1,15.2c-0.2,0.1-0.2,0.3-0.1,0.5C1.3,17,2,18.3,3,19.3
-    c0.1,0.2,0.3,0.2,0.5,0.1l2.7-0.9c0.7,0.5,1.4,1,2.2,1.3L9,22.6C9,22.8,9.2,23,9.4,23c0.7,0.1,1.4,0.2,2.1,0.2s1.4-0.1,2.1-0.2
-    c0.2,0,0.3-0.2,0.4-0.4l0.5-2.8c0.8-0.3,1.6-0.8,2.2-1.3l2.7,0.9c0.2,0.1,0.4,0,0.5-0.1c0.9-1.1,1.7-2.3,2.1-3.7
-    c0.1-0.2,0-0.4-0.1-0.5L19.9,13.3z M11.5,16.2c-2.4,0-4.2-1.9-4.2-4.2c0-2.3,1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2
-    C15.7,14.3,13.8,16.2,11.5,16.2L11.5,16.2z"/>
-<path id="outline" class="st1" d="M11.5,24c-0.7,0-1.5-0.1-2.3-0.2c-0.5-0.1-0.9-0.5-1-1l-0.5-2.4c-0.6-0.3-1.2-0.6-1.7-1l-2.3,0.8
-    c-0.5,0.2-1,0.1-1.4-0.4c-1-1.2-1.8-2.5-2.3-3.9c-0.2-0.5,0-1.1,0.4-1.4L2.3,13c0-0.3-0.1-0.6-0.1-1c0-0.4,0-0.7,0.1-1L0.4,9.4
-    C0.1,9.2-0.1,8.6,0.1,8c0.4-1.4,1.2-2.7,2.3-3.9c0.3-0.4,0.9-0.5,1.4-0.3L6,4.6c0.5-0.4,1.1-0.7,1.7-1l0.5-2.4c0.1-0.5,0.5-0.9,1-1
-    c1.5-0.3,3.1-0.3,4.6,0c0.5,0.1,0.9,0.5,1,1l0.5,2.4c0.6,0.3,1.2,0.6,1.7,1l2.3-0.8c0.4-0.2,1-0.1,1.4,0.4c1,1.2,1.8,2.5,2.3,3.9
-    c0.2,0.5,0,1.1-0.4,1.4L20.7,11c0,0.3,0.1,0.6,0.1,1c0,0.4,0,0.7-0.1,1l1.8,1.6c0.4,0.3,0.6,0.9,0.3,1.4c-0.4,1.4-1.2,2.7-2.3,3.9
-    c-0.3,0.4-0.9,0.5-1.4,0.3L17,19.4c-0.5,0.4-1.1,0.7-1.7,1l-0.5,2.4c-0.1,0.5-0.5,0.9-1,1C13,23.9,12.2,24,11.5,24z M13.2,22.5
-    C13.2,22.5,13.2,22.5,13.2,22.5L13.2,22.5z M9.8,22.5L9.8,22.5C9.8,22.5,9.8,22.5,9.8,22.5z M9.7,22.3c1.3,0.2,2.3,0.2,3.6,0l0.6-3
-    l0.4-0.2c0.7-0.3,1.4-0.7,2-1.2l0.3-0.3l2.9,1c0.8-0.9,1.4-2,1.8-3.1l-2.3-2l0.1-0.4c0.1-0.3,0.1-0.7,0.1-1.2c0-0.4,0-0.8-0.1-1.2
-    L19,10.4l2.3-2c-0.4-1.1-1-2.1-1.8-3.1l-2.9,1l-0.3-0.3c-0.6-0.5-1.3-0.9-2-1.2l-0.4-0.2l-0.6-3c-1.2-0.2-2.4-0.2-3.6,0l-0.6,3
-    L8.7,4.9C8,5.2,7.3,5.6,6.7,6.1L6.4,6.3l-2.9-1C2.6,6.3,2,7.3,1.6,8.4l2.3,2l-0.1,0.4c-0.1,0.3-0.1,0.7-0.1,1.2c0,0.5,0,0.8,0.1,1.2
-    L4,13.6l-2.3,2c0.4,1.1,1,2.1,1.8,3.1l2.9-1l0.3,0.3c0.6,0.5,1.3,0.9,2,1.2l0.4,0.2L9.7,22.3z M13.5,22.2
-    C13.5,22.2,13.5,22.2,13.5,22.2C13.5,22.2,13.5,22.2,13.5,22.2z M9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2z
-     M19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8z M3.6,18.8C3.6,18.8,3.6,18.8,3.6,18.8
-    C3.6,18.8,3.6,18.8,3.6,18.8z M3.2,18.7C3.2,18.8,3.2,18.8,3.2,18.7L3.2,18.7z M19.8,18.7L19.8,18.7C19.8,18.7,19.8,18.7,19.8,18.7z
-     M21.5,15.7C21.5,15.8,21.6,15.8,21.5,15.7L21.5,15.7z M1.5,15.7L1.5,15.7C1.5,15.8,1.5,15.7,1.5,15.7z M21.4,15.4
-    C21.4,15.4,21.4,15.4,21.4,15.4C21.4,15.4,21.4,15.4,21.4,15.4z M1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4z
-     M21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6z M1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6z
-     M21.5,8.2C21.5,8.3,21.5,8.3,21.5,8.2L21.5,8.2z M1.4,8.2L1.4,8.2C1.5,8.2,1.4,8.2,1.4,8.2z M3.2,5.3C3.2,5.3,3.2,5.3,3.2,5.3
-    L3.2,5.3z M19.8,5.2L19.8,5.2C19.8,5.3,19.8,5.3,19.8,5.2z M19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2z
-     M3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2z M13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8z
-     M9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8z M13.2,1.5C13.2,1.5,13.2,1.5,13.2,1.5L13.2,1.5z M9.8,1.5L9.8,1.5
-    C9.8,1.5,9.8,1.5,9.8,1.5z M11.5,17c-2.8,0-5-2.2-5-5s2.3-5,5-5c2.8,0,5,2.2,5,5S14.3,17,11.5,17z M11.5,8.6c-1.9,0-3.4,1.5-3.4,3.4
-    c0,1.9,1.5,3.4,3.4,3.4c1.9,0,3.4-1.5,3.4-3.4S13.4,8.6,11.5,8.6z"/>
-</svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Settings"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24.682217 24.174313"
+   xml:space="preserve"
+   sodipodi:docname="ico-settings-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="24.682217"
+   height="24.174313"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="23.723718"
+     inkscape:cx="12.334441"
+     inkscape:cy="12.08863"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Settings"
+     showguides="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#343434;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;stroke:#350000;stroke-width:0.97899997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.1276802,0.48949999 a 3.4580598,3.4580598 0 0 1 0.00195,0.0761719 A 3.4580598,3.4580598 0 0 1 5.6179146,3.9660624 3.4580598,3.4580598 0 0 1 3.8952583,3.4719218 L 0.6784615,9.0441874 A 3.4580598,3.4580598 0 0 1 2.498774,12.143797 3.4580598,3.4580598 0 0 1 0.67650837,15.128172 l 3.20898433,5.554687 a 3.4580598,3.4580598 0 0 1 1.8222656,-0.484375 3.4580598,3.4580598 0 0 1 3.3984376,3.486328 h 6.4121091 a 3.4580598,3.4580598 0 0 1 -0.002,-0.07227 v -0.01172 a 3.4580598,3.4580598 0 0 1 3.517578,-3.394531 3.4580598,3.4580598 0 0 1 1.703125,0.484375 l 3.175781,-5.498047 a 3.4580598,3.4580598 0 0 1 -1.74414,-3.054688 v -0.01172 A 3.4580598,3.4580598 0 0 1 24.004633,9.1398906 L 20.737055,3.4816874 A 3.4580598,3.4580598 0 0 1 18.920649,3.9660624 3.4580598,3.4580598 0 0 1 15.516352,0.48949999 Z M 12.399165,7.0539531 a 5.0338984,5.0338984 0 0 1 4.947265,5.1152339 5.0338984,5.0338984 0 0 1 -5.111328,4.951172 5.0338984,5.0338984 0 0 1 -4.955078,-5.109375 v -0.01367 a 5.0338984,5.0338984 0 0 1 5.119141,-4.9433609 z"
+     id="path4491"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-settings.svg b/app-template/bitcoincom/img/tab-icons/ico-settings.svg
index 605bdb2fc..ba20082eb 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-settings.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-settings.svg
@@ -1,31 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Settings" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 23 24" style="enable-background:new 0 0 23 24;" xml:space="preserve">
-<style type="text/css">
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Settings"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24.682217 24.174313"
+   xml:space="preserve"
+   sodipodi:docname="ico-settings.svg"
+   inkscape:version="0.92.1 r15371"
+   width="24.682217"
+   height="24.174313"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="23.723718"
+     inkscape:cx="12.334441"
+     inkscape:cy="12.08863"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Settings"
+     showguides="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:#343434;}
-</style>
-<path id="outline" class="st0" d="M11.5,24c-0.7,0-1.5-0.1-2.3-0.2c-0.5-0.1-0.9-0.5-1-1l-0.5-2.4c-0.6-0.3-1.2-0.6-1.7-1l-2.3,0.8
-	c-0.5,0.2-1,0.1-1.4-0.4c-1-1.2-1.8-2.5-2.3-3.9c-0.2-0.5,0-1.1,0.4-1.4L2.3,13c0-0.3-0.1-0.6-0.1-1c0-0.4,0-0.7,0.1-1L0.4,9.4
-	C0.1,9.2-0.1,8.6,0.1,8c0.4-1.4,1.2-2.7,2.3-3.9c0.3-0.4,0.9-0.5,1.4-0.3L6,4.6c0.5-0.4,1.1-0.7,1.7-1l0.5-2.4c0.1-0.5,0.5-0.9,1-1
-	c1.5-0.3,3.1-0.3,4.6,0c0.5,0.1,0.9,0.5,1,1l0.5,2.4c0.6,0.3,1.2,0.6,1.7,1l2.3-0.8c0.4-0.2,1-0.1,1.4,0.4c1,1.2,1.8,2.5,2.3,3.9
-	c0.2,0.5,0,1.1-0.4,1.4L20.7,11c0,0.3,0.1,0.6,0.1,1c0,0.4,0,0.7-0.1,1l1.8,1.6c0.4,0.3,0.6,0.9,0.3,1.4c-0.4,1.4-1.2,2.7-2.3,3.9
-	c-0.3,0.4-0.9,0.5-1.4,0.3L17,19.4c-0.5,0.4-1.1,0.7-1.7,1l-0.5,2.4c-0.1,0.5-0.5,0.9-1,1C13,23.9,12.2,24,11.5,24z M13.2,22.5
-	C13.2,22.5,13.2,22.5,13.2,22.5L13.2,22.5z M9.8,22.5L9.8,22.5C9.8,22.5,9.8,22.5,9.8,22.5z M9.7,22.3c1.3,0.2,2.3,0.2,3.6,0l0.6-3
-	l0.4-0.2c0.7-0.3,1.4-0.7,2-1.2l0.3-0.3l2.9,1c0.8-0.9,1.4-2,1.8-3.1l-2.3-2l0.1-0.4c0.1-0.3,0.1-0.7,0.1-1.2c0-0.4,0-0.8-0.1-1.2
-	L19,10.4l2.3-2c-0.4-1.1-1-2.1-1.8-3.1l-2.9,1l-0.3-0.3c-0.6-0.5-1.3-0.9-2-1.2l-0.4-0.2l-0.6-3c-1.2-0.2-2.4-0.2-3.6,0l-0.6,3
-	L8.7,4.9C8,5.2,7.3,5.6,6.7,6.1L6.4,6.3l-2.9-1C2.6,6.3,2,7.3,1.6,8.4l2.3,2l-0.1,0.4c-0.1,0.3-0.1,0.7-0.1,1.2c0,0.5,0,0.8,0.1,1.2
-	L4,13.6l-2.3,2c0.4,1.1,1,2.1,1.8,3.1l2.9-1l0.3,0.3c0.6,0.5,1.3,0.9,2,1.2l0.4,0.2L9.7,22.3z M13.5,22.2
-	C13.5,22.2,13.5,22.2,13.5,22.2C13.5,22.2,13.5,22.2,13.5,22.2z M9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2z
-	 M19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8z M3.6,18.8C3.6,18.8,3.6,18.8,3.6,18.8
-	C3.6,18.8,3.6,18.8,3.6,18.8z M3.2,18.7C3.2,18.8,3.2,18.8,3.2,18.7L3.2,18.7z M19.8,18.7L19.8,18.7C19.8,18.7,19.8,18.7,19.8,18.7z
-	 M21.5,15.7C21.5,15.8,21.6,15.8,21.5,15.7L21.5,15.7z M1.5,15.7L1.5,15.7C1.5,15.8,1.5,15.7,1.5,15.7z M21.4,15.4
-	C21.4,15.4,21.4,15.4,21.4,15.4C21.4,15.4,21.4,15.4,21.4,15.4z M1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4z
-	 M21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6z M1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6z
-	 M21.5,8.2C21.5,8.3,21.5,8.3,21.5,8.2L21.5,8.2z M1.4,8.2L1.4,8.2C1.5,8.2,1.4,8.2,1.4,8.2z M3.2,5.3C3.2,5.3,3.2,5.3,3.2,5.3
-	L3.2,5.3z M19.8,5.2L19.8,5.2C19.8,5.3,19.8,5.3,19.8,5.2z M19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2z
-	 M3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2z M13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8z
-	 M9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8z M13.2,1.5C13.2,1.5,13.2,1.5,13.2,1.5L13.2,1.5z M9.8,1.5L9.8,1.5
-	C9.8,1.5,9.8,1.5,9.8,1.5z M11.5,17c-2.8,0-5-2.2-5-5s2.3-5,5-5c2.8,0,5,2.2,5,5S14.3,17,11.5,17z M11.5,8.6c-1.9,0-3.4,1.5-3.4,3.4
-	c0,1.9,1.5,3.4,3.4,3.4c1.9,0,3.4-1.5,3.4-3.4S13.4,8.6,11.5,8.6z"/>
-</svg>
+</style><path
+     style="fill:#fefefe;fill-opacity:1;stroke:#350000;stroke-width:0.97899997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.1276802,0.48949999 a 3.4580598,3.4580598 0 0 1 0.00195,0.0761719 A 3.4580598,3.4580598 0 0 1 5.6179146,3.9660624 3.4580598,3.4580598 0 0 1 3.8952583,3.4719218 L 0.6784615,9.0441874 A 3.4580598,3.4580598 0 0 1 2.498774,12.143797 3.4580598,3.4580598 0 0 1 0.67650837,15.128172 l 3.20898433,5.554687 a 3.4580598,3.4580598 0 0 1 1.8222656,-0.484375 3.4580598,3.4580598 0 0 1 3.3984376,3.486328 h 6.4121091 a 3.4580598,3.4580598 0 0 1 -0.002,-0.07227 v -0.01172 a 3.4580598,3.4580598 0 0 1 3.517578,-3.394531 3.4580598,3.4580598 0 0 1 1.703125,0.484375 l 3.175781,-5.498047 a 3.4580598,3.4580598 0 0 1 -1.74414,-3.054688 v -0.01172 A 3.4580598,3.4580598 0 0 1 24.004633,9.1398906 L 20.737055,3.4816874 A 3.4580598,3.4580598 0 0 1 18.920649,3.9660624 3.4580598,3.4580598 0 0 1 15.516352,0.48949999 Z M 12.399165,7.0539531 a 5.0338984,5.0338984 0 0 1 4.947265,5.1152339 5.0338984,5.0338984 0 0 1 -5.111328,4.951172 5.0338984,5.0338984 0 0 1 -4.955078,-5.109375 v -0.01367 a 5.0338984,5.0338984 0 0 1 5.119141,-4.9433609 z"
+     id="path4491"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/src/js/controllers/pricechart.js b/src/js/controllers/pricechart.js
index 8db3ca757..aa4b4057c 100644
--- a/src/js/controllers/pricechart.js
+++ b/src/js/controllers/pricechart.js
@@ -20,7 +20,6 @@ angular.module('copayApp.controllers').controller('pricechartController',
 	request.onload = function () {
 	    if (request.status >= 200 && request.status < 400) {
 		// Success!
-		console.log(request.responseText);
 
 		var data = {
 		    series: [
@@ -30,11 +29,10 @@ angular.module('copayApp.controllers').controller('pricechartController',
 		        }
 		    ]
 		};
-		console.log(data);
 		rawData = JSON.parse("" + request.responseText + "");
 		for (var i = rawData.length - 1; i > 0; i--) {
 		    var tuple = rawData[i];
-		    data.series[0].data.push({x: new Date(tuple[0]), y: tuple[1]});
+		    data.series[0].data.push({x: new Date(tuple[0]*1000), y: tuple[1]});
 
 		    if (priceHigh < tuple[1])
 		    {
@@ -52,19 +50,12 @@ angular.module('copayApp.controllers').controller('pricechartController',
 		document.getElementById("high-price").innerHTML = (priceHigh / 100).toFixed(2);
 
 		var chartContainer = document.querySelector('.chart-container');
-                var chartHeader = document.querySelector('.chart-header');
-		console.log("Height: " + window.getComputedStyle(chartContainer).height);
-                console.log("Height2: " + window.getComputedStyle(chartHeader).height);
-		console.log("Width: " + window.getComputedStyle(chartContainer).width);
 
-                var chartHeight = window.getComputedStyle(chartContainer).height - window.getComputedStyle(chartHeader).height;
                 var chartWidth = window.getComputedStyle(chartContainer).width;
 
-                console.log(chartHeight);
-
 		var options = {
                     width: chartWidth,
-                    height: 570,
+                    height: 250,
 		    // Don't draw the line chart points
 		    showPoint: false,
 		    // Disable line smoothing
diff --git a/src/js/services/pricechartService.js b/src/js/services/pricechartService.js
index d29704565..d26e02a74 100644
--- a/src/js/services/pricechartService.js
+++ b/src/js/services/pricechartService.js
@@ -13,7 +13,7 @@ angular.module('copayApp.services').factory('pricechartService', function($http,
   var nextStepItem = {
     name: 'pricechart',
     title: 'Bitcoin Price Chart',
-    icon: 'icon-bitcoincom',
+    icon: 'icon-chart',
     sref: 'tabs.pricechart',
   };
 
diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css
index 5972e92da..073725ead 100644
--- a/www/css/bitcoin.com.css
+++ b/www/css/bitcoin.com.css
@@ -202,27 +202,37 @@ div.slide-success__background.fill-screen {
 }
 .latest-price {
     box-sizing: border-box;
-    padding: .6em .2em 0 .4em;
     font-size: 1.6em;
-    background-color: #F9B016;
-    width:40%;
+    width: 100%;
+    display: block;
+    text-align: center;
+    margin-top: 20px;
 }
 .high-price {
     box-sizing: border-box;
-    padding:.7em 1em;
     font-size: 1em;
-    background-color: #EFA406;
-    width:30%;
-    height:64px;
+    width: 100%;
+    height: 64px;
+    text-align: center;
+    margin-top: 20px;
 }
 .low-price {
     box-sizing: border-box;
-    padding:.7em 0em;
     font-size: 1em;
-    background-color: #EFA406;
-    width:30%;
-    height:64px;
+    width: 100%;
+    height: 64px;
+    text-align: center;
+    margin-top: 20px;
 }
 .light-yellow {
-    color:#FFD579;
+    color:#555;
 }
+
+.icon-chart {
+    background: url('../img/chart.svg');
+}
+
+.tabs .tab-item .icon {
+    background-size: contain;
+}
+
diff --git a/www/css/main.css b/www/css/main.css
index c795d37a7..01017927d 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -10374,6 +10374,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
     float: none; }
     #view-confirm .item-note .fee-rate {
       display: inline-block; }
+      #view-confirm .item-note .fee-rate .warn {
+        color: red; }
   #view-confirm .icon-amazon {
     background-image: url("../img/icon-amazon.svg"); }
   #view-confirm .tx-details-content > .scroll {
@@ -10438,6 +10440,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
     display: table-cell;
     vertical-align: middle;
     text-align: center; }
+  #starting .block-spinner {
+    display: block; }
 
 #tab-home .icon-create-wallet {
   background-color: #4A90E2; }
@@ -11254,7 +11258,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
   font-size: 14px;
   font-weight: 300;
   color: #727272;
-  padding: 2px 1rem;
+  padding: 1rem;
   background: #f8f8f9; }
 
 #walletDetails {
@@ -11369,7 +11373,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
   display: block;
   text-decoration: none;
   z-index: 9999;
-  position: relative; }
+  position: relative;
+  padding: 2px 5px; }
 
 a.item {
   cursor: pointer; }
@@ -11415,7 +11420,7 @@ a.item {
     font-size: 14px;
     font-weight: 300;
     color: #727272;
-    padding: 2px 1rem;
+    padding: 1rem;
     background: #f8f8f9; }
     #bitpayCard .status-label i {
       position: absolute;
@@ -11444,8 +11449,8 @@ a.item {
         margin-right: 1rem;
         height: 35px;
         width: 35px; }
-      #bitpayCard .head .sending-label span {
-        text-transform: capitalize; }
+      #bitpayCard .head .sending-label .big-icon-svg {
+        padding: 0 12px 0 0; }
     #bitpayCard .head .amount-label {
       line-height: 30px; }
       #bitpayCard .head .amount-label .amount-final {
@@ -11478,6 +11483,8 @@ a.item {
       #bitpayCard .item.activity.pending .tx-icon .houston {
         stroke: #fab915;
         color: #fab915; }
+    #bitpayCard .item .total {
+      font-weight: bold; }
   #bitpayCard .tx-icon {
     margin-right: 25px; }
     #bitpayCard .tx-icon .houston {
@@ -13108,7 +13115,6 @@ click-to-accept {
     height: 100%;
     width: 100%;
     z-index: 4;
-    text-transform: capitalize;
     -webkit-transform: translateY(2rem);
     transform: translateY(2rem);
     opacity: 0;
@@ -13289,7 +13295,6 @@ slide-to-accept {
     width: 100%;
     font-size: 17px;
     letter-spacing: 0.02rem;
-    text-transform: capitalize;
     -webkit-transform: translateY(2rem);
     transform: translateY(2rem);
     opacity: 0; }
@@ -13330,6 +13335,11 @@ slide-to-accept-success {
   display: flex;
   align-items: center;
   justify-content: center; }
+  slide-to-accept-success .slide-success__windows-background {
+    background: #11D1A6;
+    height: 100%;
+    width: 100%;
+    position: fixed; }
   slide-to-accept-success .slide-success__background {
     height: 10vmax;
     width: 10vmax;
@@ -13401,6 +13411,13 @@ slide-to-accept-success {
 #tx-details .action-rejected {
   color: red; }
 
+#txp-details .item-note,
+#view-confirm .item-note {
+  float: none; }
+  #txp-details .item-note .fee-rate,
+  #view-confirm .item-note .fee-rate {
+    display: inline-block; }
+
 #txp-details .list,
 #view-confirm .list {
   background: #f5f5f5; }
@@ -13424,9 +13441,6 @@ slide-to-accept-success {
       margin-right: 1rem;
       height: 35px;
       width: 35px; }
-    #txp-details .head .sending-label span,
-    #view-confirm .head .sending-label span {
-      text-transform: capitalize; }
   #txp-details .head .amount-label,
   #view-confirm .head .amount-label {
     line-height: 30px; }
@@ -13487,7 +13501,7 @@ slide-to-accept-success {
   #view-confirm .info .item.low-fees {
     display: flex;
     font-size: 14px;
-    color: #aaa;
+    color: #777;
     align-items: center; }
     #txp-details .info .item.low-fees i,
     #view-confirm .info .item.low-fees i {
@@ -13831,8 +13845,6 @@ account-selector {
       margin-right: 1rem;
       height: 35px;
       width: 35px; }
-    #coinbase .head .sending-label span {
-      text-transform: capitalize; }
   #coinbase .head .amount-label {
     line-height: 30px; }
     #coinbase .head .amount-label .amount {
@@ -13923,8 +13935,6 @@ account-selector {
       margin-right: 1rem;
       height: 35px;
       width: 35px; }
-    #glidera .head .sending-label span {
-      text-transform: capitalize; }
   #glidera .head .amount-label {
     line-height: 30px; }
     #glidera .head .amount-label .amount {
@@ -14043,8 +14053,6 @@ account-selector {
       margin-right: 1rem;
       height: 35px;
       width: 35px; }
-    #amazon .head .sending-label span {
-      text-transform: capitalize; }
     #amazon .head .sending-label .big-icon-svg {
       margin-right: 0.6rem; }
   #amazon .head .amount-label {
diff --git a/www/img/chart.svg b/www/img/chart.svg
new file mode 100644
index 000000000..d1cf0f66a
--- /dev/null
+++ b/www/img/chart.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="1000"
+   viewBox="0 0 264.58333 264.58334"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="chart.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#494949"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.83599997"
+     inkscape:cx="500.00002"
+     inkscape:cy="499.99999"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-to-guides="false" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-32.41665)">
+    <rect
+       id="rect14"
+       width="264.58334"
+       height="264.58334"
+       x="0"
+       y="32.416649"
+       style="stroke-width:0.24498457"
+       ry="9.0714283"
+       rx="7.5595236" />
+    <g
+       id="g4643"
+       transform="translate(0.055194,1.8411461)">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path18"
+         d="m 26.458333,261.23929 32.505951,-65.46132 32.505953,41.57738 19.654763,-46.86904 18.14286,15.875 32.50595,-65.3143 29.48215,41.87977 46.76505,-118.462089"
+         style="fill:none;stroke:#fab915;stroke-width:11.66499996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498"
+         d="M 26.458333,266.08154 H 242.66071"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-9"
+         d="M 43.618453,227.52797 H 243.41667"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-3"
+         d="M 135.92024,189.73035 H 243.06901"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-98"
+         d="m 201.08333,149.66487 h 41.57739"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-5"
+         d="m 216.95833,112.24524 h 25.70238"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-7"
+         d="M 242.66071,63.637484 V 266.08154"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-7-8"
+         d="M 203.12441,156.69523 V 266.00595"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-7-8-6"
+         d="M 161.24464,141.04701 V 266.7619"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-7-8-6-9"
+         d="m 118.68453,196.38272 v 69.62323"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4498-7-8-6-6"
+         d="m 76.35119,217.54939 v 48.45656"
+         style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4630"
+       transform="matrix(0.73998713,0,0,0.73998713,21.841499,24.62316)">
+      <circle
+         r="45.732407"
+         cy="105.99992"
+         cx="73.266808"
+         id="path4626"
+         style="fill:#fab915;fill-opacity:1;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="m 88.490422,104.66296 v -0.12733 q 3.11954,-1.52793 4.83848,-4.52015 1.7826,-2.992228 1.7826,-6.875739 0,-4.265505 -2.03725,-7.38505 -2.03725,-3.119544 -5.22047,-4.583817 -1.973585,-0.891301 -4.201833,-1.209621 -2.164582,-0.318322 -5.029469,-0.318322 h -1.973606 v -4.329166 q 0,-0.636642 -0.445641,-1.082299 -0.445641,-0.445643 -1.082284,-0.445643 h -4.456505 q -0.636641,0 -1.082284,0.445643 -0.445657,0.445657 -0.445657,1.082299 v 4.329166 h -4.965811 v -4.329166 q 0,-0.636642 -0.445645,-1.082299 -0.445656,-0.445643 -1.082298,-0.445643 h -4.329155 q -0.700317,0 -1.145961,0.445643 -0.381982,0.445657 -0.381982,1.082299 v 4.329166 h -4.583828 q -0.381983,0 -0.700303,0.318322 -0.254659,0.254645 -0.254659,0.700302 v 4.201833 q 0,0.445662 0.254659,0.763979 0.31832,0.254663 0.700303,0.254663 h 4.583828 v 40.49044 h -4.265507 q -0.509318,0 -0.891301,0.38198 -0.318321,0.31833 -0.318321,0.82764 v 3.69253 q 0,0.50931 0.318321,0.89131 0.381983,0.31831 0.891301,0.31831 h 4.265507 v 4.20183 q 0,0.70031 0.381982,1.08231 0.445644,0.44564 1.145961,0.44564 h 4.456491 q 0.636641,0 1.018624,-0.44564 0.445657,-0.382 0.445657,-1.08231 v -4.20183 h 5.029473 v 4.20183 q 0,0.70031 0.445644,1.08231 0.445657,0.44564 1.082299,0.44564 h 4.456489 q 0.636639,0 1.082287,-0.44564 0.445655,-0.382 0.445655,-1.08231 v -4.20183 h 2.928547 q 2.164589,0 4.074514,-0.12732 1.973598,-0.19099 3.819864,-0.8913 4.074504,-1.33696 6.939384,-5.02947 2.8649,-3.75619 2.8649,-9.104 -0.0636,-4.39283 -2.35558,-7.89436 -2.22825,-3.56519 -6.55742,-4.77481 z M 78.62248,85.882016 q 1.718926,0 2.992212,0.254658 1.336952,0.254657 2.419239,0.827637 1.718941,0.954963 2.610245,2.801228 0.891282,1.84626 0.891282,4.138163 0,3.5652 -2.164582,5.79345 -2.100909,2.228258 -5.666116,2.228258 H 64.234366 V 85.882016 Z m 5.984432,39.726474 q -1.082288,0.50931 -2.355581,0.63664 -1.273285,0.12732 -2.355573,0.12732 H 64.234366 v -18.33529 h 16.298039 q 4.201832,0 6.684737,2.4829 2.4829,2.41925 2.4829,6.49376 0,3.05589 -1.4006,5.34779 -1.336951,2.29192 -3.69253,3.24688 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#494949;fill-opacity:1;stroke:none;stroke-width:1.62980402px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path4486"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/www/img/tab-icons/ico-home-selected.svg b/www/img/tab-icons/ico-home-selected.svg
index 011b1ad8d..9088ea1f4 100644
--- a/www/img/tab-icons/ico-home-selected.svg
+++ b/www/img/tab-icons/ico-home-selected.svg
@@ -1,10 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Home" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 24" style="enable-background:new 0 0 20 24;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#fab915;}
-	.st1{fill:#343434;}
-</style>
-<polygon class="st0" points="10,0.9 0.7,9.4 0.7,23.3 6.9,23.3 6.9,15.8 13.1,15.8 13.1,23.3 19.3,23.3 19.3,9.4 "/>
-<path class="st1" d="M20,24h-7.5v-7.5H7.5V24H0V9.1L10,0l10,9.1V24z M13.8,22.6h4.8V9.7L10,1.9L1.4,9.7v12.9h4.8v-7.5h7.6V22.6z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Home"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.441246 23.999983"
+   xml:space="preserve"
+   sodipodi:docname="ico-home-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.441246"
+   height="23.999983"><metadata
+     id="metadata5945"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5943" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5941"
+     showgrid="false"
+     inkscape:zoom="33.04169"
+     inkscape:cx="13.220621"
+     inkscape:cy="11.999991"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Home"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5936">
+	.st0{fill:#343434;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 13.093671,0.49998273 0.4999207,11.947249 H 3.644452 v 11.552734 h 3.7617187 v -9.326172 h 4.9375003 v 9.326172 h 10.296874 l 0.05859,-11.552734 h 3.242188 L 20.12492,6.7656078 V 2.300764 H 17.400311 V 4.3378734 Z M 15.158123,14.173811 h 4.029297 v 4.541016 h -4.029297 z"
+     id="path4483"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-home.svg b/www/img/tab-icons/ico-home.svg
index 4297cf20c..d57482412 100644
--- a/www/img/tab-icons/ico-home.svg
+++ b/www/img/tab-icons/ico-home.svg
@@ -1,8 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Home" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 24" style="enable-background:new 0 0 20 24;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Home"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.441246 23.999983"
+   xml:space="preserve"
+   sodipodi:docname="ico-home.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.441246"
+   height="23.999983"><metadata
+     id="metadata5945"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5943" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5941"
+     showgrid="false"
+     inkscape:zoom="33.04169"
+     inkscape:cx="13.220621"
+     inkscape:cy="11.999991"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Home"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5936">
 	.st0{fill:#343434;}
-</style>
-<path class="st0" d="M20,24h-7.5v-7.5H7.5V24H0V9.1L10,0l10,9.1V24z M13.8,22.6h4.8V9.7L10,1.9L1.4,9.7v12.9h4.8v-7.5h7.6V22.6z"/>
-</svg>
+</style><path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 13.093671,0.49998273 0.4999207,11.947249 H 3.644452 v 11.552734 h 3.7617187 v -9.326172 h 4.9375003 v 9.326172 h 10.296874 l 0.05859,-11.552734 h 3.242188 L 20.12492,6.7656078 V 2.300764 H 17.400311 V 4.3378734 Z M 15.158123,14.173811 h 4.029297 v 4.541016 h -4.029297 z"
+     id="path4483"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-receive-selected.svg b/www/img/tab-icons/ico-receive-selected.svg
index 1b544dda5..deccc0f1e 100644
--- a/www/img/tab-icons/ico-receive-selected.svg
+++ b/www/img/tab-icons/ico-receive-selected.svg
@@ -1,20 +1,107 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="QR_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#D5DFFF;}
-	.st1{fill:#647ce8;}
-</style>
-<rect x="13.5" y="1.2" class="st0" width="7.3" height="7.3"/>
-<rect x="1.2" y="13.5" class="st0" width="7.3" height="7.3"/>
-<rect x="1.2" y="1.2" class="st0" width="7.3" height="7.3"/>
-<path class="st1" d="M9.7,9.7H0V0h9.7V9.7z M1.2,8.5h7.3V1.2H1.2V8.5z"/>
-<path class="st1" d="M22,9.7h-9.7V0H22V9.7z M13.5,8.5h7.3V1.2h-7.3V8.5z"/>
-<path class="st1" d="M9.7,22H0v-9.7h9.7V22z M1.2,20.8h7.3v-7.3H1.2V20.8z"/>
-<polygon class="st1" points="22,17.6 20.8,17.6 20.8,13.5 18.2,13.5 18.2,16.3 13.2,16.3 13.2,12.9 14.4,12.9 14.4,15.1 17,15.1
-	17,12.3 22,12.3 "/>
-<polygon class="st1" points="21.4,22 13.2,22 13.2,19.5 14.4,19.5 14.4,20.8 21.4,20.8 "/>
-<rect x="3.8" y="3.8" class="st1" width="2.2" height="2.2"/>
-<rect x="16" y="3.8" class="st1" width="2.2" height="2.2"/>
-<rect x="3.8" y="16" class="st1" width="2.2" height="2.2"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="QR_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22 22"
+   style="enable-background:new 0 0 22 22;"
+   xml:space="preserve"
+   sodipodi:docname="ico-receive-selected.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs23" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="27.402967"
+     inkscape:cx="9.3590309"
+     inkscape:cy="10.542241"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="QR_Icon" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#343434;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     d="m 11.751962,16.124854 c 0,0 2.022169,0.82094 2.613915,0.754494 0.580406,-0.06517 3.676717,-1.814529 5.494319,-2.846031 1.462966,-0.830244 2.591582,0.660811 1.257879,1.561505 -1.521828,1.02774 -6.619354,4.020995 -7.829208,4.012197 C 11.294229,19.592512 2.1474669,17.497101 2.1474669,17.497101"
+     id="path4504"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssssc" /><g
+     id="g4582"
+     transform="matrix(0.90723485,0,0,0.90723485,2.36444,3.0085723)"
+     style="stroke-width:0.55112521;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 6.8630415,6.9967388 a 3.480648,3.480648 0 0 1 3.5396555,-3.4180565 3.480648,3.480648 0 0 1 3.420619,3.537179 3.480648,3.480648 0 0 1 -3.5347,3.4231807 3.480648,3.480648 0 0 1 -3.4257398,-3.5322204"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="3.480648"
+       sodipodi:rx="3.480648"
+       sodipodi:cy="7.0588207"
+       sodipodi:cx="10.343136"
+       sodipodi:type="arc"
+       id="path4508"
+       style="fill:#fab915;fill-opacity:1;stroke:#000000;stroke-width:0.55112521;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.44486314,0,0,0.44486314,-28.43135,-52.224958)"><path
+         id="path4527"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g><g
+     id="g4587"
+     transform="matrix(0.81854393,0,0,0.81854393,4.6439463,1.1203143)"
+     style="stroke-width:0.61084076;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="M 12.520082,4.8183773 A 2.7159257,2.7159257 0 0 1 15.282051,2.1512914 2.7159257,2.7159257 0 0 1 17.951137,4.9113277 2.7159257,2.7159257 0 0 1 15.193034,7.5824119 2.7159257,2.7159257 0 0 1 12.519953,4.8262448"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="2.7159257"
+       sodipodi:rx="2.7159257"
+       sodipodi:cy="4.8668194"
+       sodipodi:cx="15.235576"
+       sodipodi:type="arc"
+       id="path4508-3"
+       style="fill:#fab915;fill-opacity:1;stroke:#000000;stroke-width:0.54975669;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487-5"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.34712364,0,0,0.34712364,-15.019888,-41.391904)"><path
+         id="path4527-6"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     d="m 2.1474669,17.497101 c 0,0 -0.066277,-3.709739 4.4331886,-3.694935 1.3611187,-0.05817 2.6485391,0.345582 3.7287885,0.289227 0.578433,-0.03018 2.483508,-0.297611 4.139254,-0.644783 1.655745,-0.347172 1.836545,1.451895 0.476939,1.823833 -2.50459,0.685165 -5.3653783,1.33553 -5.3653783,1.33553"
+     id="path4502"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccszsc" /><rect
+     style="fill:#fab915;fill-opacity:1;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     id="rect4553"
+     width="3.5497355"
+     height="6.5393057"
+     x="0.34308091"
+     y="13.035734"
+     ry="0.35189092"
+     rx="0.17066038" /></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-receive.svg b/www/img/tab-icons/ico-receive.svg
index aab9aec69..3aa1fa70c 100644
--- a/www/img/tab-icons/ico-receive.svg
+++ b/www/img/tab-icons/ico-receive.svg
@@ -1,16 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="QR_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 22 22" style="enable-background:new 0 0 22 22;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="QR_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22 22"
+   style="enable-background:new 0 0 22 22;"
+   xml:space="preserve"
+   sodipodi:docname="ico-receive.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs23" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="27.402967"
+     inkscape:cx="9.3590309"
+     inkscape:cy="10.542241"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="QR_Icon" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:#343434;}
-</style>
-<path class="st0" d="M9.7,9.7H0V0h9.7V9.7z M1.2,8.5h7.3V1.2H1.2V8.5z"/>
-<path class="st0" d="M22,9.7h-9.7V0H22V9.7z M13.5,8.5h7.3V1.2h-7.3V8.5z"/>
-<path class="st0" d="M9.7,22H0v-9.7h9.7V22z M1.2,20.8h7.3v-7.3H1.2V20.8z"/>
-<polygon class="st0" points="22,17.6 20.8,17.6 20.8,13.5 18.2,13.5 18.2,16.3 13.2,16.3 13.2,12.9 14.4,12.9 14.4,15.1 17,15.1
-	17,12.3 22,12.3 "/>
-<polygon class="st0" points="21.4,22 13.2,22 13.2,19.5 14.4,19.5 14.4,20.8 21.4,20.8 "/>
-<rect x="3.8" y="3.8" class="st0" width="2.2" height="2.2"/>
-<rect x="16" y="3.8" class="st0" width="2.2" height="2.2"/>
-<rect x="3.8" y="16" class="st0" width="2.2" height="2.2"/>
-</svg>
+</style><g
+     id="g4551"
+     transform="matrix(0.88187101,0,0,0.88187101,2.7807345,2.3277703)"
+     style="stroke-width:0.56697634;stroke-miterlimit:4;stroke-dasharray:none"><path
+       sodipodi:nodetypes="ccszsc"
+       inkscape:connector-curvature="0"
+       id="path4502"
+       d="m 0.04036703,13.96358 c 0,0 1.64922167,-0.968945 3.81337637,-0.993538 2.164154,-0.02458 3.4585052,0.433253 4.6834567,0.36935 0.6559164,-0.03422 2.8161809,-0.337477 4.6937179,-0.731154 1.877537,-0.393677 2.082556,1.64638 0.540827,2.068141 -2.840087,0.776944 -6.0840853,1.514427 -6.0840853,1.514427"
+       style="fill:none;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.56697637;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208" /><path
+       sodipodi:nodetypes="cssssc"
+       inkscape:connector-curvature="0"
+       id="path4504"
+       d="m 10.172947,15.64524 c 0,0 2.293045,0.930907 2.964056,0.855561 0.658153,-0.0739 4.169223,-2.05759 6.230298,-3.227265 1.658935,-0.941457 2.938732,0.749328 1.426375,1.770673 -1.72568,1.165409 -7.506034,4.559618 -8.877951,4.549641 C 9.6539005,19.5774 -0.71809548,17.201303 -0.71809548,17.201303"
+       style="fill:none;fill-rule:evenodd;stroke:#001c2f;stroke-width:0.56697637;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208" /></g><g
+     id="g4582"
+     transform="matrix(0.90723485,0,0,0.90723485,2.36444,3.0085723)"
+     style="stroke-width:0.55112521;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="m 6.8630415,6.9967388 a 3.480648,3.480648 0 0 1 3.5396555,-3.4180565 3.480648,3.480648 0 0 1 3.420619,3.537179 3.480648,3.480648 0 0 1 -3.5347,3.4231807 3.480648,3.480648 0 0 1 -3.4257398,-3.5322204"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="3.480648"
+       sodipodi:rx="3.480648"
+       sodipodi:cy="7.0588207"
+       sodipodi:cx="10.343136"
+       sodipodi:type="arc"
+       id="path4508"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.55112521;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.44486314,0,0,0.44486314,-28.43135,-52.224958)"><path
+         id="path4527"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.23886464;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g><rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#001c2f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98837208"
+     id="rect4553"
+     width="3.5497355"
+     height="6.5393057"
+     x="0.34308091"
+     y="13.035734"
+     ry="0.35189092"
+     rx="0.17066038" /><g
+     id="g4587"
+     transform="matrix(0.81854393,0,0,0.81854393,4.6439463,1.1203143)"
+     style="stroke-width:0.61084076;stroke-miterlimit:4;stroke-dasharray:none"><path
+       d="M 12.520082,4.8183773 A 2.7159257,2.7159257 0 0 1 15.282051,2.1512914 2.7159257,2.7159257 0 0 1 17.951137,4.9113277 2.7159257,2.7159257 0 0 1 15.193034,7.5824119 2.7159257,2.7159257 0 0 1 12.519953,4.8262448"
+       sodipodi:open="true"
+       sodipodi:end="3.1565327"
+       sodipodi:start="3.1594299"
+       sodipodi:ry="2.7159257"
+       sodipodi:rx="2.7159257"
+       sodipodi:cy="4.8668194"
+       sodipodi:cx="15.235576"
+       sodipodi:type="arc"
+       id="path4508-3"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.54975669;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
+       id="text4487-5"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       aria-label=""
+       transform="matrix(0.34712364,0,0,0.34712364,-15.019888,-41.391904)"><path
+         id="path4527-6"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.75972102;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 89.784378,132.93788 v -0.0207 q 0.506429,-0.24804 0.785482,-0.7338 0.289388,-0.48576 0.289388,-1.11621 0,-0.69247 -0.330729,-1.1989 -0.33073,-0.50642 -0.847494,-0.74414 -0.320394,-0.14469 -0.682129,-0.19637 -0.3514,-0.0517 -0.816487,-0.0517 h -0.320394 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.72347 q -0.103353,0 -0.1757,0.0724 -0.07235,0.0723 -0.07235,0.1757 v 0.7028 h -0.806152 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 h -0.7028 q -0.113688,0 -0.186035,0.0724 -0.06201,0.0723 -0.06201,0.1757 v 0.7028 h -0.74414 q -0.06201,0 -0.113688,0.0517 -0.04134,0.0413 -0.04134,0.11369 v 0.68213 q 0,0.0724 0.04134,0.12402 0.05168,0.0413 0.113688,0.0413 h 0.74414 v 6.57324 h -0.692464 q -0.08268,0 -0.144694,0.062 -0.05168,0.0517 -0.05168,0.13436 v 0.59944 q 0,0.0827 0.05168,0.1447 0.06201,0.0517 0.144694,0.0517 h 0.692464 v 0.68213 q 0,0.11369 0.06201,0.1757 0.07235,0.0724 0.186035,0.0724 h 0.72347 q 0.103353,0 0.165365,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.816487 v 0.68213 q 0,0.11369 0.07235,0.1757 0.07235,0.0724 0.1757,0.0724 h 0.72347 q 0.103353,0 0.1757,-0.0724 0.07235,-0.062 0.07235,-0.1757 v -0.68213 h 0.475423 q 0.3514,0 0.661459,-0.0207 0.320394,-0.031 0.620117,-0.14469 0.661458,-0.21704 1.126546,-0.81649 0.465088,-0.60978 0.465088,-1.47794 -0.01034,-0.71314 -0.382406,-1.28158 -0.361735,-0.57877 -1.064534,-0.77515 z m -1.601969,-3.0489 q 0.279052,0 0.485758,0.0413 0.217041,0.0413 0.392741,0.13436 0.279053,0.15502 0.423747,0.45475 0.144694,0.29972 0.144694,0.67179 0,0.57878 -0.3514,0.94051 -0.341065,0.36174 -0.919841,0.36174 h -2.511474 v -2.60449 h 2.335775 z m 0.971516,6.44921 q -0.175699,0.0827 -0.382405,0.10336 -0.206706,0.0207 -0.382406,0.0207 h -2.54248 v -2.97657 h 2.645833 q 0.682129,0 1.085205,0.40308 0.403076,0.39274 0.403076,1.0542 0,0.49609 -0.227376,0.86816 -0.217041,0.37207 -0.599447,0.5271 z"
+         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-scan-selected.svg b/www/img/tab-icons/ico-scan-selected.svg
index 6a5c8f589..3df861ae3 100644
--- a/www/img/tab-icons/ico-scan-selected.svg
+++ b/www/img/tab-icons/ico-scan-selected.svg
@@ -1,17 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Scan_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32 20" style="enable-background:new 0 0 32 20;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#647ce8;}
-</style>
-<path class="st0" d="M6.3,6.3c-0.5,0-0.8-0.4-0.8-0.8V1.8C5.5,1.3,5.9,1,6.3,1H11c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H7.1
-	v3C7.1,5.9,6.7,6.3,6.3,6.3z"/>
-<path class="st0" d="M25.7,13.7c0.5,0,0.8,0.4,0.8,0.8v3.8c0,0.5-0.4,0.8-0.8,0.8H21c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	h4v-3C24.9,14.1,25.3,13.7,25.7,13.7z"/>
-<path class="st0" d="M7.1,14.4v3h4c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H6.4c-0.5,0-0.8-0.4-0.8-0.8v-3.8
-	c0-0.5,0.4-0.8,0.8-0.8C6.7,13.7,7.1,14.1,7.1,14.4z"/>
-<path class="st0" d="M24.9,5.6v-3h-4c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8h4.7c0.5,0,0.8,0.4,0.8,0.8v3.8
-	c0,0.5-0.4,0.8-0.8,0.8C25.3,6.3,24.9,5.9,24.9,5.6z"/>
-<path class="st0" d="M31.1,10.8H0.8c-0.4,0-0.8-0.3-0.8-0.7c0-0.3,0.3-0.7,0.8-0.7h30.4c0.4,0,0.8,0.3,0.8,0.7
-	C31.9,10.4,31.6,10.8,31.1,10.8z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Scan_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22.957628 22.957628"
+   xml:space="preserve"
+   sodipodi:docname="ico-scan-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="22.957628"
+   height="22.957628"><metadata
+     id="metadata6589"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6587" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6585"
+     showgrid="false"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:zoom="11.8"
+     inkscape:cx="11.478814"
+     inkscape:cy="11.478814"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Scan_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style6572">
+	.st0{fill:#343434;}
+</style><rect
+     style="fill:#fab915;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect7138"
+     width="22.457628"
+     height="22.457628"
+     x="0.25"
+     y="0.25"
+     rx="0.80811942"
+     ry="0.93948829" /><path
+     class="st0"
+     d="M 21.220234,12.178814 H 1.6728817 c -0.2580508,0 -0.5161016,-0.3 -0.5161016,-0.7 0,-0.3 0.1935381,-0.7 0.5161016,-0.7 H 21.284747 c 0.25805,0 0.516101,0.3 0.516101,0.7 -0.06452,0.3 -0.258051,0.7 -0.580614,0.7 z"
+     id="path6582"
+     style="fill:#130e00;fill-opacity:1;stroke-width:0.80319804"
+     inkscape:connector-curvature="0" /><g
+     id="g7182"
+     transform="translate(-4.8735827,1.312858)"><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140"
+       d="M 8.6405327,7.1151086 V 1.8608713 H 13.89477"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-2"
+       d="m 24.064261,13.216803 v 5.254238 h -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-9"
+       d="m 18.810023,1.8608713 h 5.254238 v 5.2542376"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-1"
+       d="M 13.89477,18.471041 H 8.6405327 v -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-scan.svg b/www/img/tab-icons/ico-scan.svg
index ea08ae0f0..33affc34a 100644
--- a/www/img/tab-icons/ico-scan.svg
+++ b/www/img/tab-icons/ico-scan.svg
@@ -1,17 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Scan_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 32 20" style="enable-background:new 0 0 32 20;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Scan_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 22.957628 22.957628"
+   xml:space="preserve"
+   sodipodi:docname="ico-scan.svg"
+   inkscape:version="0.92.1 r15371"
+   width="22.957628"
+   height="22.957628"><metadata
+     id="metadata6589"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6587" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6585"
+     showgrid="false"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:zoom="11.8"
+     inkscape:cx="11.478814"
+     inkscape:cy="11.478814"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Scan_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style6572">
 	.st0{fill:#343434;}
-</style>
-<path class="st0" d="M6.3,6.3c-0.5,0-0.8-0.4-0.8-0.8V1.8C5.5,1.3,5.9,1,6.3,1H11c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H7.1
-	v3C7.1,5.9,6.7,6.3,6.3,6.3z"/>
-<path class="st0" d="M25.7,13.7c0.5,0,0.8,0.4,0.8,0.8v3.8c0,0.5-0.4,0.8-0.8,0.8H21c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8
-	h4v-3C24.9,14.1,25.3,13.7,25.7,13.7z"/>
-<path class="st0" d="M7.1,14.4v3h4c0.5,0,0.8,0.4,0.8,0.8c0,0.5-0.4,0.8-0.8,0.8H6.4c-0.5,0-0.8-0.4-0.8-0.8v-3.8
-	c0-0.5,0.4-0.8,0.8-0.8C6.7,13.7,7.1,14.1,7.1,14.4z"/>
-<path class="st0" d="M24.9,5.6v-3h-4c-0.5,0-0.8-0.4-0.8-0.8c0-0.5,0.4-0.8,0.8-0.8h4.7c0.5,0,0.8,0.4,0.8,0.8v3.8
-	c0,0.5-0.4,0.8-0.8,0.8C25.3,6.3,24.9,5.9,24.9,5.6z"/>
-<path class="st0" d="M31.1,10.8H0.8c-0.4,0-0.8-0.3-0.8-0.7c0-0.3,0.3-0.7,0.8-0.7h30.4c0.4,0,0.8,0.3,0.8,0.7
-	C31.9,10.4,31.6,10.8,31.1,10.8z"/>
-</svg>
+</style><rect
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect7138"
+     width="22.457628"
+     height="22.457628"
+     x="0.25"
+     y="0.25"
+     rx="0.80811942"
+     ry="0.93948829" /><path
+     class="st0"
+     d="M 21.220234,12.178814 H 1.6728817 c -0.2580508,0 -0.5161016,-0.3 -0.5161016,-0.7 0,-0.3 0.1935381,-0.7 0.5161016,-0.7 H 21.284747 c 0.25805,0 0.516101,0.3 0.516101,0.7 -0.06452,0.3 -0.258051,0.7 -0.580614,0.7 z"
+     id="path6582"
+     style="fill:#130e00;fill-opacity:1;stroke-width:0.80319804"
+     inkscape:connector-curvature="0" /><g
+     id="g7182"
+     transform="translate(-4.8735827,1.312858)"><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140"
+       d="M 8.6405327,7.1151086 V 1.8608713 H 13.89477"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-2"
+       d="m 24.064261,13.216803 v 5.254238 h -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-9"
+       d="m 18.810023,1.8608713 h 5.254238 v 5.2542376"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path7140-1"
+       d="M 13.89477,18.471041 H 8.6405327 v -5.254237"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-send-selected.svg b/www/img/tab-icons/ico-send-selected.svg
index 2f812b891..cf9c0329e 100644
--- a/www/img/tab-icons/ico-send-selected.svg
+++ b/www/img/tab-icons/ico-send-selected.svg
@@ -1,12 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Send_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 27 24" style="enable-background:new 0 0 27 24;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#647ce8;fill-opacity:0.4;stroke:#647ce8;stroke-width:1.4;}
-	.st1{fill:#D5DFFF;fill-opacity:0.7145;stroke:#647ce8;stroke-width:1.4;}
-</style>
-<g>
-	<polyline class="st0" points="25.5,1.5 6.3,11.7 4.9,19.3 9.8,15.3 	"/>
-	<polygon class="st1" points="1.5,6.4 25.5,1.5 17.1,22.5 	"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Send_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.601198 21.865164"
+   xml:space="preserve"
+   sodipodi:docname="ico-send-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.601198"
+   height="21.865164"><metadata
+     id="metadata5393"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5391" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5389"
+     showgrid="false"
+     inkscape:zoom="18.182416"
+     inkscape:cx="6.3895446"
+     inkscape:cy="12.438757"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Send_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5380">
+	.st0{fill:none;stroke:#343434;stroke-width:1.4;stroke-miterlimit:10;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 0.53184214,5.748004 5.6379957,11.386049 6.1843105,20.467863 Z"
+     id="path5950"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5.6379957,11.386049 26.062611,0.53547329"
+     id="path5954"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 6.1843105,20.467863 11.37701,15.383346 8.8888411,13.219721 Z"
+     id="path5948"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 17.002433,21.333313 8.8888411,13.219721 Z"
+     id="path5942"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-send.svg b/www/img/tab-icons/ico-send.svg
index a5020691d..4d23e130e 100644
--- a/www/img/tab-icons/ico-send.svg
+++ b/www/img/tab-icons/ico-send.svg
@@ -1,11 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Send_Icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 27 24" style="enable-background:new 0 0 27 24;" xml:space="preserve">
-<style type="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Send_Icon"
+   x="0px"
+   y="0px"
+   viewBox="0 0 26.601198 21.865164"
+   xml:space="preserve"
+   sodipodi:docname="ico-send.svg"
+   inkscape:version="0.92.1 r15371"
+   width="26.601198"
+   height="21.865164"><metadata
+     id="metadata5393"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5391" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview5389"
+     showgrid="false"
+     inkscape:zoom="18.182416"
+     inkscape:cx="6.3895446"
+     inkscape:cy="12.438757"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Send_Icon"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style5380">
 	.st0{fill:none;stroke:#343434;stroke-width:1.4;stroke-miterlimit:10;}
-</style>
-<g>
-	<polyline class="st0" points="25.5,1.5 6.3,11.7 4.9,19.3 9.8,15.3 	"/>
-	<polygon class="st0" points="1.5,6.4 25.5,1.5 17.1,22.5 	"/>
-</g>
-</svg>
+</style><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 0.53184214,5.748004 5.6379957,11.386049 6.1843105,20.467863 Z"
+     id="path5950"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5.6379957,11.386049 26.062611,0.53547329"
+     id="path5954"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 6.1843105,20.467863 11.37701,15.383346 8.8888411,13.219721 Z"
+     id="path5948"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#fab915;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06378198px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 26.062611,0.53547329 17.002433,21.333313 8.8888411,13.219721 Z"
+     id="path5942"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-settings-selected.svg b/www/img/tab-icons/ico-settings-selected.svg
index 220c8ca5f..cf3ead3fc 100644
--- a/www/img/tab-icons/ico-settings-selected.svg
+++ b/www/img/tab-icons/ico-settings-selected.svg
@@ -1,40 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Settings" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 23 24" style="enable-background:new 0 0 23 24;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#D5DFFF;}
-	.st1{fill:#647ce8;}
-</style>
-<path id="fill" class="st0" d="M19.9,13.3c0.1-0.4,0.1-0.9,0.1-1.3c0-0.4,0-0.9-0.1-1.3L22,8.8c0.2-0.1,0.2-0.3,0.1-0.5
-	C21.7,7,21,5.7,20,4.7c-0.1-0.2-0.3-0.2-0.5-0.1l-2.7,0.9c-0.7-0.5-1.4-1-2.2-1.3L14,1.4C14,1.2,13.8,1,13.6,1
-	c-1.4-0.3-2.9-0.3-4.3,0C9.2,1,9,1.2,9,1.4L8.4,4.2C7.6,4.5,6.8,4.9,6.2,5.5L3.5,4.5C3.3,4.4,3.1,4.5,3,4.7C2,5.7,1.3,7,0.8,8.3
-	C0.8,8.5,0.8,8.7,1,8.8l2.2,1.9C3.1,11.1,3,11.6,3,12c0,0.4,0,0.9,0.1,1.3L1,15.2c-0.2,0.1-0.2,0.3-0.1,0.5C1.3,17,2,18.3,3,19.3
-	c0.1,0.2,0.3,0.2,0.5,0.1l2.7-0.9c0.7,0.5,1.4,1,2.2,1.3L9,22.6C9,22.8,9.2,23,9.4,23c0.7,0.1,1.4,0.2,2.1,0.2s1.4-0.1,2.1-0.2
-	c0.2,0,0.3-0.2,0.4-0.4l0.5-2.8c0.8-0.3,1.6-0.8,2.2-1.3l2.7,0.9c0.2,0.1,0.4,0,0.5-0.1c0.9-1.1,1.7-2.3,2.1-3.7
-	c0.1-0.2,0-0.4-0.1-0.5L19.9,13.3z M11.5,16.2c-2.4,0-4.2-1.9-4.2-4.2c0-2.3,1.9-4.2,4.2-4.2c2.3,0,4.2,1.9,4.2,4.2
-	C15.7,14.3,13.8,16.2,11.5,16.2L11.5,16.2z"/>
-<path id="outline" class="st1" d="M11.5,24c-0.7,0-1.5-0.1-2.3-0.2c-0.5-0.1-0.9-0.5-1-1l-0.5-2.4c-0.6-0.3-1.2-0.6-1.7-1l-2.3,0.8
-	c-0.5,0.2-1,0.1-1.4-0.4c-1-1.2-1.8-2.5-2.3-3.9c-0.2-0.5,0-1.1,0.4-1.4L2.3,13c0-0.3-0.1-0.6-0.1-1c0-0.4,0-0.7,0.1-1L0.4,9.4
-	C0.1,9.2-0.1,8.6,0.1,8c0.4-1.4,1.2-2.7,2.3-3.9c0.3-0.4,0.9-0.5,1.4-0.3L6,4.6c0.5-0.4,1.1-0.7,1.7-1l0.5-2.4c0.1-0.5,0.5-0.9,1-1
-	c1.5-0.3,3.1-0.3,4.6,0c0.5,0.1,0.9,0.5,1,1l0.5,2.4c0.6,0.3,1.2,0.6,1.7,1l2.3-0.8c0.4-0.2,1-0.1,1.4,0.4c1,1.2,1.8,2.5,2.3,3.9
-	c0.2,0.5,0,1.1-0.4,1.4L20.7,11c0,0.3,0.1,0.6,0.1,1c0,0.4,0,0.7-0.1,1l1.8,1.6c0.4,0.3,0.6,0.9,0.3,1.4c-0.4,1.4-1.2,2.7-2.3,3.9
-	c-0.3,0.4-0.9,0.5-1.4,0.3L17,19.4c-0.5,0.4-1.1,0.7-1.7,1l-0.5,2.4c-0.1,0.5-0.5,0.9-1,1C13,23.9,12.2,24,11.5,24z M13.2,22.5
-	C13.2,22.5,13.2,22.5,13.2,22.5L13.2,22.5z M9.8,22.5L9.8,22.5C9.8,22.5,9.8,22.5,9.8,22.5z M9.7,22.3c1.3,0.2,2.3,0.2,3.6,0l0.6-3
-	l0.4-0.2c0.7-0.3,1.4-0.7,2-1.2l0.3-0.3l2.9,1c0.8-0.9,1.4-2,1.8-3.1l-2.3-2l0.1-0.4c0.1-0.3,0.1-0.7,0.1-1.2c0-0.4,0-0.8-0.1-1.2
-	L19,10.4l2.3-2c-0.4-1.1-1-2.1-1.8-3.1l-2.9,1l-0.3-0.3c-0.6-0.5-1.3-0.9-2-1.2l-0.4-0.2l-0.6-3c-1.2-0.2-2.4-0.2-3.6,0l-0.6,3
-	L8.7,4.9C8,5.2,7.3,5.6,6.7,6.1L6.4,6.3l-2.9-1C2.6,6.3,2,7.3,1.6,8.4l2.3,2l-0.1,0.4c-0.1,0.3-0.1,0.7-0.1,1.2c0,0.5,0,0.8,0.1,1.2
-	L4,13.6l-2.3,2c0.4,1.1,1,2.1,1.8,3.1l2.9-1l0.3,0.3c0.6,0.5,1.3,0.9,2,1.2l0.4,0.2L9.7,22.3z M13.5,22.2
-	C13.5,22.2,13.5,22.2,13.5,22.2C13.5,22.2,13.5,22.2,13.5,22.2z M9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2z
-	 M19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8z M3.6,18.8C3.6,18.8,3.6,18.8,3.6,18.8
-	C3.6,18.8,3.6,18.8,3.6,18.8z M3.2,18.7C3.2,18.8,3.2,18.8,3.2,18.7L3.2,18.7z M19.8,18.7L19.8,18.7C19.8,18.7,19.8,18.7,19.8,18.7z
-	 M21.5,15.7C21.5,15.8,21.6,15.8,21.5,15.7L21.5,15.7z M1.5,15.7L1.5,15.7C1.5,15.8,1.5,15.7,1.5,15.7z M21.4,15.4
-	C21.4,15.4,21.4,15.4,21.4,15.4C21.4,15.4,21.4,15.4,21.4,15.4z M1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4z
-	 M21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6z M1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6z
-	 M21.5,8.2C21.5,8.3,21.5,8.3,21.5,8.2L21.5,8.2z M1.4,8.2L1.4,8.2C1.5,8.2,1.4,8.2,1.4,8.2z M3.2,5.3C3.2,5.3,3.2,5.3,3.2,5.3
-	L3.2,5.3z M19.8,5.2L19.8,5.2C19.8,5.3,19.8,5.3,19.8,5.2z M19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2z
-	 M3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2z M13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8z
-	 M9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8z M13.2,1.5C13.2,1.5,13.2,1.5,13.2,1.5L13.2,1.5z M9.8,1.5L9.8,1.5
-	C9.8,1.5,9.8,1.5,9.8,1.5z M11.5,17c-2.8,0-5-2.2-5-5s2.3-5,5-5c2.8,0,5,2.2,5,5S14.3,17,11.5,17z M11.5,8.6c-1.9,0-3.4,1.5-3.4,3.4
-	c0,1.9,1.5,3.4,3.4,3.4c1.9,0,3.4-1.5,3.4-3.4S13.4,8.6,11.5,8.6z"/>
-</svg>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Settings"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24.682217 24.174313"
+   xml:space="preserve"
+   sodipodi:docname="ico-settings-selected.svg"
+   inkscape:version="0.92.1 r15371"
+   width="24.682217"
+   height="24.174313"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="23.723718"
+     inkscape:cx="12.334441"
+     inkscape:cy="12.08863"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Settings"
+     showguides="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#343434;}
+</style><path
+     style="fill:#fab915;fill-opacity:1;stroke:#350000;stroke-width:0.97899997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.1276802,0.48949999 a 3.4580598,3.4580598 0 0 1 0.00195,0.0761719 A 3.4580598,3.4580598 0 0 1 5.6179146,3.9660624 3.4580598,3.4580598 0 0 1 3.8952583,3.4719218 L 0.6784615,9.0441874 A 3.4580598,3.4580598 0 0 1 2.498774,12.143797 3.4580598,3.4580598 0 0 1 0.67650837,15.128172 l 3.20898433,5.554687 a 3.4580598,3.4580598 0 0 1 1.8222656,-0.484375 3.4580598,3.4580598 0 0 1 3.3984376,3.486328 h 6.4121091 a 3.4580598,3.4580598 0 0 1 -0.002,-0.07227 v -0.01172 a 3.4580598,3.4580598 0 0 1 3.517578,-3.394531 3.4580598,3.4580598 0 0 1 1.703125,0.484375 l 3.175781,-5.498047 a 3.4580598,3.4580598 0 0 1 -1.74414,-3.054688 v -0.01172 A 3.4580598,3.4580598 0 0 1 24.004633,9.1398906 L 20.737055,3.4816874 A 3.4580598,3.4580598 0 0 1 18.920649,3.9660624 3.4580598,3.4580598 0 0 1 15.516352,0.48949999 Z M 12.399165,7.0539531 a 5.0338984,5.0338984 0 0 1 4.947265,5.1152339 5.0338984,5.0338984 0 0 1 -5.111328,4.951172 5.0338984,5.0338984 0 0 1 -4.955078,-5.109375 v -0.01367 a 5.0338984,5.0338984 0 0 1 5.119141,-4.9433609 z"
+     id="path4491"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-settings.svg b/www/img/tab-icons/ico-settings.svg
index 605bdb2fc..ba20082eb 100644
--- a/www/img/tab-icons/ico-settings.svg
+++ b/www/img/tab-icons/ico-settings.svg
@@ -1,31 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Settings" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 23 24" style="enable-background:new 0 0 23 24;" xml:space="preserve">
-<style type="text/css">
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Settings"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24.682217 24.174313"
+   xml:space="preserve"
+   sodipodi:docname="ico-settings.svg"
+   inkscape:version="0.92.1 r15371"
+   width="24.682217"
+   height="24.174313"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="23.723718"
+     inkscape:cx="12.334441"
+     inkscape:cy="12.08863"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Settings"
+     showguides="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:#343434;}
-</style>
-<path id="outline" class="st0" d="M11.5,24c-0.7,0-1.5-0.1-2.3-0.2c-0.5-0.1-0.9-0.5-1-1l-0.5-2.4c-0.6-0.3-1.2-0.6-1.7-1l-2.3,0.8
-	c-0.5,0.2-1,0.1-1.4-0.4c-1-1.2-1.8-2.5-2.3-3.9c-0.2-0.5,0-1.1,0.4-1.4L2.3,13c0-0.3-0.1-0.6-0.1-1c0-0.4,0-0.7,0.1-1L0.4,9.4
-	C0.1,9.2-0.1,8.6,0.1,8c0.4-1.4,1.2-2.7,2.3-3.9c0.3-0.4,0.9-0.5,1.4-0.3L6,4.6c0.5-0.4,1.1-0.7,1.7-1l0.5-2.4c0.1-0.5,0.5-0.9,1-1
-	c1.5-0.3,3.1-0.3,4.6,0c0.5,0.1,0.9,0.5,1,1l0.5,2.4c0.6,0.3,1.2,0.6,1.7,1l2.3-0.8c0.4-0.2,1-0.1,1.4,0.4c1,1.2,1.8,2.5,2.3,3.9
-	c0.2,0.5,0,1.1-0.4,1.4L20.7,11c0,0.3,0.1,0.6,0.1,1c0,0.4,0,0.7-0.1,1l1.8,1.6c0.4,0.3,0.6,0.9,0.3,1.4c-0.4,1.4-1.2,2.7-2.3,3.9
-	c-0.3,0.4-0.9,0.5-1.4,0.3L17,19.4c-0.5,0.4-1.1,0.7-1.7,1l-0.5,2.4c-0.1,0.5-0.5,0.9-1,1C13,23.9,12.2,24,11.5,24z M13.2,22.5
-	C13.2,22.5,13.2,22.5,13.2,22.5L13.2,22.5z M9.8,22.5L9.8,22.5C9.8,22.5,9.8,22.5,9.8,22.5z M9.7,22.3c1.3,0.2,2.3,0.2,3.6,0l0.6-3
-	l0.4-0.2c0.7-0.3,1.4-0.7,2-1.2l0.3-0.3l2.9,1c0.8-0.9,1.4-2,1.8-3.1l-2.3-2l0.1-0.4c0.1-0.3,0.1-0.7,0.1-1.2c0-0.4,0-0.8-0.1-1.2
-	L19,10.4l2.3-2c-0.4-1.1-1-2.1-1.8-3.1l-2.9,1l-0.3-0.3c-0.6-0.5-1.3-0.9-2-1.2l-0.4-0.2l-0.6-3c-1.2-0.2-2.4-0.2-3.6,0l-0.6,3
-	L8.7,4.9C8,5.2,7.3,5.6,6.7,6.1L6.4,6.3l-2.9-1C2.6,6.3,2,7.3,1.6,8.4l2.3,2l-0.1,0.4c-0.1,0.3-0.1,0.7-0.1,1.2c0,0.5,0,0.8,0.1,1.2
-	L4,13.6l-2.3,2c0.4,1.1,1,2.1,1.8,3.1l2.9-1l0.3,0.3c0.6,0.5,1.3,0.9,2,1.2l0.4,0.2L9.7,22.3z M13.5,22.2
-	C13.5,22.2,13.5,22.2,13.5,22.2C13.5,22.2,13.5,22.2,13.5,22.2z M9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2C9.5,22.2,9.5,22.2,9.5,22.2z
-	 M19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8C19.4,18.8,19.4,18.8,19.4,18.8z M3.6,18.8C3.6,18.8,3.6,18.8,3.6,18.8
-	C3.6,18.8,3.6,18.8,3.6,18.8z M3.2,18.7C3.2,18.8,3.2,18.8,3.2,18.7L3.2,18.7z M19.8,18.7L19.8,18.7C19.8,18.7,19.8,18.7,19.8,18.7z
-	 M21.5,15.7C21.5,15.8,21.6,15.8,21.5,15.7L21.5,15.7z M1.5,15.7L1.5,15.7C1.5,15.8,1.5,15.7,1.5,15.7z M21.4,15.4
-	C21.4,15.4,21.4,15.4,21.4,15.4C21.4,15.4,21.4,15.4,21.4,15.4z M1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4C1.6,15.4,1.6,15.4,1.6,15.4z
-	 M21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6C21.4,8.6,21.4,8.6,21.4,8.6z M1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6C1.6,8.6,1.6,8.6,1.6,8.6z
-	 M21.5,8.2C21.5,8.3,21.5,8.3,21.5,8.2L21.5,8.2z M1.4,8.2L1.4,8.2C1.5,8.2,1.4,8.2,1.4,8.2z M3.2,5.3C3.2,5.3,3.2,5.3,3.2,5.3
-	L3.2,5.3z M19.8,5.2L19.8,5.2C19.8,5.3,19.8,5.3,19.8,5.2z M19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2C19.4,5.2,19.4,5.2,19.4,5.2z
-	 M3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2C3.6,5.2,3.6,5.2,3.6,5.2z M13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8C13.5,1.8,13.5,1.8,13.5,1.8z
-	 M9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8C9.5,1.8,9.5,1.8,9.5,1.8z M13.2,1.5C13.2,1.5,13.2,1.5,13.2,1.5L13.2,1.5z M9.8,1.5L9.8,1.5
-	C9.8,1.5,9.8,1.5,9.8,1.5z M11.5,17c-2.8,0-5-2.2-5-5s2.3-5,5-5c2.8,0,5,2.2,5,5S14.3,17,11.5,17z M11.5,8.6c-1.9,0-3.4,1.5-3.4,3.4
-	c0,1.9,1.5,3.4,3.4,3.4c1.9,0,3.4-1.5,3.4-3.4S13.4,8.6,11.5,8.6z"/>
-</svg>
+</style><path
+     style="fill:#fefefe;fill-opacity:1;stroke:#350000;stroke-width:0.97899997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.1276802,0.48949999 a 3.4580598,3.4580598 0 0 1 0.00195,0.0761719 A 3.4580598,3.4580598 0 0 1 5.6179146,3.9660624 3.4580598,3.4580598 0 0 1 3.8952583,3.4719218 L 0.6784615,9.0441874 A 3.4580598,3.4580598 0 0 1 2.498774,12.143797 3.4580598,3.4580598 0 0 1 0.67650837,15.128172 l 3.20898433,5.554687 a 3.4580598,3.4580598 0 0 1 1.8222656,-0.484375 3.4580598,3.4580598 0 0 1 3.3984376,3.486328 h 6.4121091 a 3.4580598,3.4580598 0 0 1 -0.002,-0.07227 v -0.01172 a 3.4580598,3.4580598 0 0 1 3.517578,-3.394531 3.4580598,3.4580598 0 0 1 1.703125,0.484375 l 3.175781,-5.498047 a 3.4580598,3.4580598 0 0 1 -1.74414,-3.054688 v -0.01172 A 3.4580598,3.4580598 0 0 1 24.004633,9.1398906 L 20.737055,3.4816874 A 3.4580598,3.4580598 0 0 1 18.920649,3.9660624 3.4580598,3.4580598 0 0 1 15.516352,0.48949999 Z M 12.399165,7.0539531 a 5.0338984,5.0338984 0 0 1 4.947265,5.1152339 5.0338984,5.0338984 0 0 1 -5.111328,4.951172 5.0338984,5.0338984 0 0 1 -4.955078,-5.109375 v -0.01367 a 5.0338984,5.0338984 0 0 1 5.119141,-4.9433609 z"
+     id="path4491"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 7ffd0805d..6d5e112c9 100644
--- a/www/index.html
+++ b/www/index.html
@@ -31,7 +31,6 @@
   <script src="lib/angular-components.js"></script>
   <script src="js/moment.min.js"></script>
   <script src="js/chartist.min.js"></script>
-
   <script type="text/javascript" charset="utf-8" src="cordova.js"></script>
 
   <script src="js/app.js"></script>
diff --git a/www/views/pricechart.html b/www/views/pricechart.html
index 16ca36f4c..46b8daa60 100644
--- a/www/views/pricechart.html
+++ b/www/views/pricechart.html
@@ -6,13 +6,12 @@
   </ion-nav-bar>
   <ion-content>
         <div class="chart-container">
-            <div class="chart-header">
-                <div class="latest-price">$<span id="latest-price">2500</span></div>
-                <div class="high-price"><span class="light-yellow">High:</span><br/>$<span id="high-price">2500</span></div>
-                <div class="low-price"><span  class="light-yellow">Low:</span><br/>$<span id="low-price">2500</span></div>
-            </div>
             <div class="chart">
             <div class="ct-chart"></div>
+
+                <div class="latest-price"><span class="light-yellow" style="font-size: 16px;">Latest price:</span><br/>$<span id="latest-price">2500</span></div>
+                <div class="high-price"><span class="light-yellow">High:</span><br/>$<span id="high-price">2500</span></div>
+                <div class="low-price"><span  class="light-yellow">Low:</span><br/>$<span id="low-price">2500</span></div>
             </div>
         </div>
   </ion-content>