diff --git a/app-template/bitcoincom/img/128x128.png b/app-template/bitcoincom/img/128x128.png
index e2a715a69..1d552b383 100755
Binary files a/app-template/bitcoincom/img/128x128.png and b/app-template/bitcoincom/img/128x128.png differ
diff --git a/app-template/bitcoincom/img/16x16.png b/app-template/bitcoincom/img/16x16.png
old mode 100755
new mode 100644
index 66a7f6960..7c7c3b6b6
Binary files a/app-template/bitcoincom/img/16x16.png and b/app-template/bitcoincom/img/16x16.png differ
diff --git a/app-template/bitcoincom/img/24x24.png b/app-template/bitcoincom/img/24x24.png
index f857b2562..6dc3ed09d 100755
Binary files a/app-template/bitcoincom/img/24x24.png and b/app-template/bitcoincom/img/24x24.png differ
diff --git a/app-template/bitcoincom/img/256x256.png b/app-template/bitcoincom/img/256x256.png
index 8f2f6d5c9..01b97b7b6 100755
Binary files a/app-template/bitcoincom/img/256x256.png and b/app-template/bitcoincom/img/256x256.png differ
diff --git a/app-template/bitcoincom/img/32x32.png b/app-template/bitcoincom/img/32x32.png
old mode 100755
new mode 100644
index 6111d3120..d8b4f3f7d
Binary files a/app-template/bitcoincom/img/32x32.png and b/app-template/bitcoincom/img/32x32.png differ
diff --git a/app-template/bitcoincom/img/48x48.png b/app-template/bitcoincom/img/48x48.png
index b8206bd53..4a2eef9cd 100755
Binary files a/app-template/bitcoincom/img/48x48.png and b/app-template/bitcoincom/img/48x48.png differ
diff --git a/app-template/bitcoincom/img/64x64.png b/app-template/bitcoincom/img/64x64.png
index 87985f3e4..6c74c91f9 100755
Binary files a/app-template/bitcoincom/img/64x64.png and b/app-template/bitcoincom/img/64x64.png differ
diff --git a/app-template/bitcoincom/img/96x96.png b/app-template/bitcoincom/img/96x96.png
index 047a88431..3cbd54aca 100755
Binary files a/app-template/bitcoincom/img/96x96.png and b/app-template/bitcoincom/img/96x96.png differ
diff --git a/app-template/bitcoincom/img/backup-warning.svg b/app-template/bitcoincom/img/backup-warning.svg
index a44e1e82a..c7bd12bbc 100644
--- a/app-template/bitcoincom/img/backup-warning.svg
+++ b/app-template/bitcoincom/img/backup-warning.svg
@@ -1,29 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="247px" height="247px" viewBox="0 0 247 247" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
-    <title>backup-warning</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="89.4673583%" id="linearGradient-1">
-            <stop stop-color="#192C3A" offset="0%"></stop>
-            <stop stop-color="#192C3A" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#BCBCBC" offset="0%"></stop>
-            <stop stop-color="#707D89" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="backup-warning" fill-rule="nonzero">
-            <g id="Onboarding">
-                <g id="0.5.a.1-–-Backup-Warning">
-                    <g id="being-watched">
-                        <path d="M123.5,247 C191.707167,247 247,191.707167 247,123.5 C247,55.2928334 191.707167,1.42108547e-14 123.5,1.42108547e-14 C55.2928334,1.42108547e-14 1.42108547e-14,55.2928334 1.42108547e-14,123.5 C1.42108547e-14,191.707167 55.2928334,247 123.5,247 Z" id="Oval-2" fill="url(#linearGradient-1)" opacity="0.300000012"></path>
-                        <path d="M157.693521,46.9114761 C157.371158,45.8451979 156.16141,44.9808396 155.003028,45.000323 L114.123129,53.1444209 L91.810993,45.2164126 C90.6490687,45.2358961 89.43755,46.1020257 89.1151868,47.1700751 L74.3927551,96.5571737 L172.607245,96.5571737 L157.693521,46.9114761 L157.693521,46.9114761 Z M123.5,107.871766 C94.152554,107.871766 67.1927208,114.280062 46,124.997752 L201,124.997752 C179.786024,114.280062 152.847446,107.871766 123.5,107.871766 L123.5,107.871766 Z" id="Shape" fill="url(#linearGradient-2)"></path>
-                        <path d="M155.018969,132.110996 C143.095075,132.110996 133.220489,140.938787 131.51657,152.396849 C126.220603,151.222526 120.738658,151.215441 115.440921,152.370281 C113.613016,141.055688 103.805736,132.37668 91.982802,132.37668 C78.8651011,132.37668 68.1916924,143.050089 68.1916924,156.16779 C68.1916924,169.28549 78.8633299,179.958899 91.982802,179.958899 C103.956291,179.958899 113.86453,171.058488 115.508228,159.531348 C120.765227,158.119681 126.298537,158.140936 131.54668,159.596883 C133.330305,170.962842 143.162381,179.693215 155.02074,179.693215 C168.138441,179.693215 178.81185,169.021578 178.81185,155.902106 C178.808308,142.784405 168.13667,132.110996 155.018969,132.110996 Z M91.9810307,173.570086 C82.3685864,173.570086 74.5769626,165.778463 74.5769626,156.166018 C74.5769626,146.553574 82.3685864,138.76195 91.9810307,138.76195 C101.593475,138.76195 109.385099,146.553574 109.385099,156.166018 C109.385099,165.778463 101.593475,173.570086 91.9810307,173.570086 Z M155.018969,173.306174 C145.406525,173.306174 137.614901,165.51455 137.614901,155.902106 C137.614901,146.289661 145.406525,138.498038 155.018969,138.498038 C164.631414,138.498038 172.423037,146.289661 172.423037,155.902106 C172.421266,165.51455 164.629642,173.306174 155.018969,173.306174 Z" id="Combined-Shape" fill="#707D89" opacity="0.400000006"></path>
-                    </g>
-                </g>
+<?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"
+   width="247px"
+   height="247px"
+   viewBox="0 0 247 247"
+   version="1.1"
+   id="svg26"
+   sodipodi:docname="backup-warning.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata30">
+    <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>
+  <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="namedview28"
+     showgrid="false"
+     inkscape:zoom="3.2105263"
+     inkscape:cx="40.959016"
+     inkscape:cy="123.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg26" />
+  <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">backup-warning</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs16">
+    <linearGradient
+       x1="123.5"
+       y1="1.4210855e-14"
+       x2="123.5"
+       y2="220.98438"
+       id="linearGradient-1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#192C3A"
+         offset="0%"
+         id="stop6" />
+      <stop
+         stop-color="#192C3A"
+         offset="100%"
+         id="stop8" />
+    </linearGradient>
+    <linearGradient
+       x1="88.723773"
+       y1="62.638229"
+       x2="88.723773"
+       y2="173.99195"
+       id="linearGradient-2"
+       gradientTransform="scale(1.3919606,0.71841111)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#BCBCBC"
+         offset="0%"
+         id="stop11" />
+      <stop
+         stop-color="#707D89"
+         offset="100%"
+         id="stop13" />
+    </linearGradient>
+  </defs>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:1;fill:#8b8b8b;fill-rule:nonzero;stroke:none;stroke-width:1;fill-opacity:1"
+     id="Oval-2"
+     d="M 123.5,247 C 191.70717,247 247,191.70717 247,123.5 247,55.292833 191.70717,0 123.5,0 55.292833,0 0,55.292833 0,123.5 0,191.70717 55.292833,247 123.5,247 Z" />
+  <g
+     id="g4573"
+     style="fill:#ffffff;fill-opacity:1">
+    <g
+       id="g4564"
+       style="fill:#ffffff;fill-opacity:1">
+      <g
+         id="g4556"
+         style="fill:#ffffff;fill-opacity:1">
+        <g
+           id="g4549"
+           style="fill:#ffffff;fill-opacity:1">
+          <g
+             id="g4543"
+             style="fill:#ffffff;fill-opacity:1">
+            <g
+               id="g4538"
+               style="fill:#ffffff;fill-opacity:1">
+              <g
+                 id="g4534"
+                 style="fill:#ffffff;fill-opacity:1">
+                <path
+                   d="m 157.69352,46.911476 c -0.32236,-1.066278 -1.53211,-1.930636 -2.69049,-1.911153 l -40.8799,8.144098 -22.312137,-7.928008 c -1.161924,0.01948 -2.373443,0.885613 -2.695806,1.953662 L 74.392755,96.557174 H 172.60724 Z M 123.5,107.87177 c -29.347446,0 -56.307279,6.40829 -77.5,17.12598 h 155 c -21.21398,-10.71769 -48.15255,-17.12598 -77.5,-17.12598 z"
+                   id="Shape"
+                   style="fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;fill-opacity:1"
+                   inkscape:connector-curvature="0" />
+              </g>
             </g>
+          </g>
         </g>
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+  <path
+     style="opacity:1;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="Combined-Shape"
+     d="m 155.01897,132.111 c -11.9239,0 -21.79848,8.82779 -23.5024,20.28585 -5.29597,-1.17432 -10.77791,-1.18141 -16.07565,-0.0266 -1.8279,-11.31459 -11.63518,-19.9936 -23.458118,-19.9936 -13.117701,0 -23.79111,10.67341 -23.79111,23.79111 0,13.1177 10.671638,23.79111 23.79111,23.79111 11.973488,0 21.881728,-8.90041 23.525428,-20.42755 5.257,-1.41167 10.79031,-1.39041 16.03845,0.0655 1.78362,11.36596 11.6157,20.09633 23.47406,20.09633 13.1177,0 23.79111,-10.67163 23.79111,-23.7911 -0.004,-13.11771 -10.67518,-23.79111 -23.79288,-23.79111 z m -63.037939,41.45909 c -9.612445,0 -17.404068,-7.79163 -17.404068,-17.40407 0,-9.61245 7.791623,-17.40407 17.404068,-17.40407 9.612439,0 17.404069,7.79162 17.404069,17.40407 0,9.61244 -7.79163,17.40407 -17.404069,17.40407 z m 63.037939,-0.26392 c -9.61245,0 -17.40407,-7.79162 -17.40407,-17.40406 0,-9.61245 7.79162,-17.40407 17.40407,-17.40407 9.61244,0 17.40407,7.79162 17.40407,17.40407 -0.002,9.61244 -7.7934,17.40406 -17.40407,17.40406 z" />
+</svg>
diff --git a/app-template/bitcoincom/img/favicon.ico b/app-template/bitcoincom/img/favicon.ico
index e2f92139d..ccfd55dcc 100644
Binary files a/app-template/bitcoincom/img/favicon.ico and b/app-template/bitcoincom/img/favicon.ico differ
diff --git a/app-template/bitcoincom/img/icon-bitcoin-small.svg b/app-template/bitcoincom/img/icon-bitcoin-small.svg
new file mode 100644
index 000000000..2e976d07a
--- /dev/null
+++ b/app-template/bitcoincom/img/icon-bitcoin-small.svg
@@ -0,0 +1,66 @@
+<?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"
+   width="12px"
+   height="16px"
+   viewBox="0 0 12 16"
+   version="1.1"
+   id="svg13"
+   sodipodi:docname="icon-bitcoin-small.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata17">
+    <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>
+  <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="namedview15"
+     showgrid="false"
+     inkscape:zoom="52.772096"
+     inkscape:cx="1.1706314"
+     inkscape:cy="8.3282828"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg13" />
+  <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">Bitcoin_Symbol</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs6" />
+  <g
+     transform="matrix(1.4198302,0,0,1.4198302,-117.88848,-168.05238)"
+     aria-label=""
+     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:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="stroke-width:0.26458332px;fill:#5d5d5d;fill-opacity:1"
+       id="path4527" />
+  </g>
+</svg>
diff --git a/app-template/bitcoincom/img/icon-bitcoin-symbol.svg b/app-template/bitcoincom/img/icon-bitcoin-symbol.svg
new file mode 100644
index 000000000..928864222
--- /dev/null
+++ b/app-template/bitcoincom/img/icon-bitcoin-symbol.svg
@@ -0,0 +1,55 @@
+<?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
+   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="Bitcoin_Symbol"
+   x="0px"
+   y="0px"
+   viewBox="0 0 12 16"
+   style="enable-background:new 0 0 12 16;"
+   xml:space="preserve"
+   sodipodi:docname="icon-bitcoin-symbol.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata11"><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="defs9" /><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="namedview7"
+     showgrid="false"
+     inkscape:zoom="49.959867"
+     inkscape:cx="0.74422872"
+     inkscape:cy="7.995485"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Bitcoin_Symbol" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#5D5D5D;}
+</style><g
+     transform="matrix(1.5122135,0,0,1.5122135,-125.99239,-179.21313)"
+     aria-label=""
+     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:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487"><path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="fill:#5d5d5d;fill-opacity:1;stroke-width:0.26458332px"
+       id="path4527" /></g></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/icon-bitcoin-white.svg b/app-template/bitcoincom/img/icon-bitcoin-white.svg
new file mode 100644
index 000000000..4f5d50cad
--- /dev/null
+++ b/app-template/bitcoincom/img/icon-bitcoin-white.svg
@@ -0,0 +1,66 @@
+<?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"
+   width="22px"
+   height="32px"
+   viewBox="0 0 22 32"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="icon-bitcoin-white.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata16">
+    <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>
+  <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="namedview14"
+     showgrid="false"
+     inkscape:zoom="20.059887"
+     inkscape:cx="2.8118239"
+     inkscape:cy="17.526157"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12" />
+  <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">Imported Layers</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs6" />
+  <g
+     transform="matrix(2.8088042,0,0,2.8088042,-234.50148,-331.90876)"
+     aria-label=""
+     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:#fbfbfb;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="fill:#fbfbfb;fill-opacity:1;stroke-width:0.26458332px"
+       id="path4527" />
+  </g>
+</svg>
diff --git a/app-template/bitcoincom/img/icon-bitcoin.svg b/app-template/bitcoincom/img/icon-bitcoin.svg
index 3733702c6..5d80c5d57 100644
--- a/app-template/bitcoincom/img/icon-bitcoin.svg
+++ b/app-template/bitcoincom/img/icon-bitcoin.svg
@@ -1,13 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="51px" height="51px" viewBox="0 0 51 51" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-bitcoin</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon-bitcoin" fill-rule="nonzero">
-            <path d="M25.5,51 C39.6,51 51,39.6 51,25.5 C51,11.4 39.5,0 25.5,0 C11.5,0 0,11.4 0,25.5 C0,39.6 11.4,51 25.5,51 Z" id="coin" fill="#FF9900"></path>
-            <path d="M33.5,19.1 C32.9,16.1 30.2,15.3 27,15.2 L26.5,11 L24,11.2 L24.5,15.4 C23.8,15.5 23.2,15.5 22.5,15.6 L22,11.4 L19.5,11.6 L20,15.9 C19.5,15.9 18.9,16 18.4,16.1 L18.4,16.1 L15,16.4 L15.3,19.2 C15.3,19.2 17.1,19 17.1,19.1 C18.1,19 18.5,19.6 18.6,20.1 L19.1,25 L19.4,25 L19.1,25 L19.9,31.8 C19.9,32.1 19.7,32.7 19.1,32.7 L17.3,32.9 L17.2,36 L20.4,35.7 C21,35.7 21.6,35.6 22.2,35.6 L22.7,39.9 L25.2,39.7 L24.7,35.4 C25.4,35.4 26.1,35.3 26.7,35.3 L27.2,39.5 L29.7,39.3 L29.2,35 C33.4,34.4 36.2,33 36.1,28.9 C36,25.6 34.4,24.2 31.9,23.8 C33.2,22.8 34,21.4 33.5,19.1 L33.5,19.1 Z M31,28.7 C31.4,31.9 26,32 24.3,32.2 L23.7,26.5 C25.5,26.3 30.7,25.3 31,28.7 L31,28.7 Z M23.5,23.8 L23,18.6 C24.4,18.5 28.8,17.6 29.1,20.7 C29.3,23.6 24.9,23.7 23.5,23.8 Z" id="BitPay-Bitcoin_Symbol" fill="#FFFFFF"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?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="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 51 51"
+   style="enable-background:new 0 0 51 51;"
+   xml:space="preserve"
+   sodipodi:docname="icon-bitcoin.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata23"><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><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="15.54902"
+     inkscape:cx="25.5"
+     inkscape:cy="25.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:url(#coin_1_);}
+	.st1{filter:url(#Adobe_OpacityMaskFilter);}
+	.st2{fill:#FFFFFF;}
+	.st3{mask:url(#mask-3);fill:#FFFFFF;}
+</style><linearGradient
+     id="coin_1_"
+     gradientUnits="userSpaceOnUse"
+     x1="-273.8224"
+     y1="413.966"
+     x2="-274.172"
+     y2="414.57"
+     gradientTransform="matrix(50.3194 0 0 -50.3886 13809.4346 20893.9863)"><stop
+       offset="0"
+       style="stop-color:#FFA24B"
+       id="stop4" /><stop
+       offset="1"
+       style="stop-color:#F7891C"
+       id="stop6" /></linearGradient><path
+     id="coin"
+     class="st0"
+     d="M25.5,51c14.1,0,25.5-11.4,25.5-25.5S39.5,0,25.5,0S0,11.4,0,25.5S11.4,51,25.5,51z"
+     style="fill:#fab915;fill-opacity:1" /><defs
+     id="defs13"><filter
+       id="Adobe_OpacityMaskFilter"
+       filterUnits="userSpaceOnUse"
+       x="15"
+       y="11"
+       width="21"
+       height="28.7"><feColorMatrix
+         type="matrix"
+         values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+         id="feColorMatrix10" /></filter></defs><mask
+     maskUnits="userSpaceOnUse"
+     x="15"
+     y="11"
+     width="21"
+     height="28.7"
+     id="mask-3"><g
+       class="st1"
+       id="g16"><path
+         id="path-2"
+         class="st2"
+         d="M26.2,50.4c13.9,0,25.2-11.3,25.2-25.2S40.1,0,26.2,0S1,11.3,1,25.2S12.3,50.4,26.2,50.4z" /></g></mask><g
+     transform="matrix(2.7667404,0,0,2.7667404,-215.6998,-317.27681)"
+     aria-label=""
+     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:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487"><path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.26458332px"
+       id="path4527" /></g></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/icon-wallet.svg b/app-template/bitcoincom/img/icon-wallet.svg
new file mode 100644
index 000000000..fba9bca0b
--- /dev/null
+++ b/app-template/bitcoincom/img/icon-wallet.svg
@@ -0,0 +1,62 @@
+<?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="Wallet"
+   x="0px"
+   y="0px"
+   viewBox="0 0 40 40"
+   style="enable-background:new 0 0 40 40;"
+   xml:space="preserve"
+   sodipodi:docname="icon-wallet.svg"
+   inkscape:version="0.92.1 r15371"><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:pagecheckerboard="true"
+     inkscape:zoom="19.825"
+     inkscape:cx="12.559899"
+     inkscape:cy="26.610103"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Wallet" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:none;stroke:#FFFFFF;}
+</style><text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:42.66666667px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     x="-7.263556"
+     y="11.197982"
+     id="text4493"><tspan
+       sodipodi:role="line"
+       id="tspan4491"
+       x="-7.263556"
+       y="46.588608" /></text>
+<g
+     aria-label=""
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.29528046px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.607382px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4497"><path
+       d="m 30.194736,19.685663 h -3.226717 q -0.735501,0 -1.233744,0.521969 -0.498243,0.498243 -0.498243,1.210019 0,0.711776 0.498243,1.233745 0.521969,0.498243 1.233744,0.498243 h 3.226717 q 0.308437,0 0.521969,-0.213533 0.237259,-0.237259 0.237259,-0.545695 v -2.016698 q 0,-0.260984 -0.237259,-0.474517 -0.213532,-0.213533 -0.521969,-0.213533 z m -11.649397,2.06415 h -2.775925 v 3.155539 h 2.704748 q 0.166081,0 0.379613,-0.02372 0.237259,-0.02373 0.427066,-0.0949 0.379614,-0.166081 0.616872,-0.569421 0.237259,-0.403339 0.237259,-0.901582 0,-0.711776 -0.450791,-1.138842 -0.427066,-0.427065 -1.138842,-0.427065 z m 8.42268,2.396312 q -1.138841,0 -1.94552,-0.782954 -0.782953,-0.806679 -0.782953,-1.94552 0,-1.138841 0.782953,-1.945521 0.806679,-0.806679 1.94552,-0.806679 h 3.226717 q 0,0 0,0 0,0 0,0 v -3.962218 q 0,-0.949035 -0.664324,-1.589633 -0.664324,-0.664324 -1.589632,-0.664324 V 11.45279 q 0,-0.735502 -0.521969,-1.233745 Q 26.920568,9.7208021 26.208792,9.7208021 H 9.5295125 q -0.7117758,0 -1.2337447,0.5219689 -0.498243,0.498243 -0.498243,1.210019 v 16.655553 q 0,0.949035 0.664324,1.613359 0.6643241,0.640598 1.5896322,0.640598 h 17.913025 q 0.949034,0 1.589632,-0.640598 0.664324,-0.664324 0.664324,-1.613359 v -3.962218 q 0,0 0,0 0,0 0,0 H 26.968019 Z M 9.6481418,12.449276 q -0.3558879,0 -0.6168723,-0.260984 Q 8.770285,11.927307 8.770285,11.571419 v 0 q 0,-0.355888 0.2609845,-0.616872 0.2609844,-0.260985 0.6168723,-0.260985 H 26.090163 q 0.355888,0 0.616872,0.260985 0.260984,0.260984 0.260984,0.616872 v 0.877857 H 9.6481418 Z M 19.779084,25.783209 q -0.332162,0.118629 -0.664324,0.166081 -0.332162,0.02373 -0.711776,0.02373 h -0.521969 v 0.711776 q 0,0.118629 -0.07118,0.213533 -0.07118,0.07118 -0.189807,0.07118 h -0.759228 q -0.118629,0 -0.213533,-0.07118 -0.07118,-0.0949 -0.07118,-0.213533 v -0.711776 h -0.854131 v 0.711776 q 0,0.118629 -0.07118,0.213533 -0.07118,0.07118 -0.189807,0.07118 H 14.70175 q -0.118629,0 -0.213533,-0.07118 -0.07118,-0.0949 -0.07118,-0.213533 v -0.711776 h -0.711776 q -0.0949,0 -0.166081,-0.07118 -0.04745,-0.07118 -0.04745,-0.142355 v -0.640598 q 0,-0.0949 0.04745,-0.142355 0.07118,-0.07118 0.166081,-0.07118 h 0.711776 v -6.951677 h -0.782954 q -0.07118,0 -0.118629,-0.04745 -0.02373,-0.04745 -0.02373,-0.11863 v -0.711775 q 0,-0.07118 0.02373,-0.11863 0.04745,-0.04745 0.118629,-0.04745 h 0.782954 v -0.735502 q 0,-0.0949 0.07118,-0.166081 0.0949,-0.0949 0.213533,-0.0949 h 0.759227 q 0.11863,0 0.189807,0.0949 0.07118,0.07118 0.07118,0.166081 v 0.735502 h 0.854131 v -0.735502 q 0,-0.0949 0.07118,-0.166081 0.0949,-0.0949 0.213533,-0.0949 h 0.759228 q 0.118629,0 0.189807,0.0949 0.07118,0.07118 0.07118,0.166081 v 0.735502 h 0.332162 q 0.498243,0 0.877857,0.07118 0.379614,0.04745 0.711776,0.213533 0.545695,0.237259 0.877857,0.782953 0.355888,0.521969 0.355888,1.233745 0,0.664324 -0.308437,1.186293 -0.28471,0.498243 -0.830405,0.759228 v 0.04745 q 0.711776,0.189807 1.115116,0.806679 0.403339,0.616873 0.403339,1.3761 0.02373,0.877857 -0.474517,1.518455 -0.474517,0.640599 -1.162567,0.877857 z m 0,-6.47716 q 0,-0.379613 -0.166081,-0.688049 -0.142355,-0.332163 -0.427066,-0.498244 -0.166081,-0.07118 -0.403339,-0.118629 -0.237259,-0.04745 -0.521969,-0.04745 H 15.79314 v 2.7522 h 2.681022 q 0.593146,0 0.949034,-0.379614 0.355888,-0.403339 0.355888,-1.020212 z"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.607382px"
+       id="path4499" /></g></svg>
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/icon.png b/app-template/bitcoincom/img/icon.png
index cba4cf27a..f7e170d1e 100644
Binary files a/app-template/bitcoincom/img/icon.png and b/app-template/bitcoincom/img/icon.png differ
diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js
index 1d8c2c01c..3a155f207 100644
--- a/src/js/controllers/onboarding/collectEmail.js
+++ b/src/js/controllers/onboarding/collectEmail.js
@@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
   var wallet, walletId;
   $scope.data = {};
   // Get more info: https://mashe.hawksey.info/2014/07/google-sheets-as-a-database-insert-with-apps-script-using-postget-methods-with-ajax-example/
-  var URL = "https://script.google.com/macros/s/1ihZK47nRXHV8O8sA4VFKkRV8wB9iI-l4DwPOWAxIaJs/exec";
+  var URL = "https://script.google.com/macros/s/AKfycbyuuLpN7UvtMMHv2BNLfZ7N2m4y4N6MeTpGRGFvnkGHFr9SM60/exec";
 
   var _post = function(dataSrc) {
     return {
diff --git a/src/js/services/feedbackService.js b/src/js/services/feedbackService.js
index b35c4c323..d1fad22fe 100644
--- a/src/js/services/feedbackService.js
+++ b/src/js/services/feedbackService.js
@@ -1,7 +1,8 @@
 'use strict';
 angular.module('copayApp.services').factory('feedbackService', function($http, $log, $httpParamSerializer, configService) {
   var root = {};
-  var URL = "https://script.google.com/macros/s/AKfycbybtvNSQKUfgzgXcj3jYLlvCKrcBoktjiJ1V8_cwd2yVkpUBGe3/exec";
+//  var URL = "https://script.google.com/macros/s/1pWGRxVSUX9CxPqNAKZTppWHtDvyVtZv9HteY_TRQbWc/exec";
+  var URL = "https://script.google.com/macros/s/AKfycbyl6h1fTDQxS_Y-rubYN2O8eMZMa6hgAYrIlttdi0lsjsLMLVQ/exec";
 
   root.send = function(dataSrc, cb) {
     $http(_post(dataSrc)).then(function() {
diff --git a/www/img/backup-warning.svg b/www/img/backup-warning.svg
index bfb4c0bff..c7bd12bbc 100644
--- a/www/img/backup-warning.svg
+++ b/www/img/backup-warning.svg
@@ -1,25 +1,132 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="247px" height="247px" viewBox="0 0 247 247" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>being-watched</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="89.4673583%" id="linearGradient-1">
-            <stop stop-color="#3950B5" offset="0%"></stop>
-            <stop stop-color="#162360" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#9EB3F6" offset="0%"></stop>
-            <stop stop-color="#647CE8" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Onboarding" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="0.5.a.1-–-Backup-Warning" transform="translate(-64.000000, -210.000000)">
-            <g id="being-watched" transform="translate(64.000000, 210.000000)">
-                <path d="M123.5,247 C191.707167,247 247,191.707167 247,123.5 C247,55.2928334 191.707167,1.42108547e-14 123.5,1.42108547e-14 C55.2928334,1.42108547e-14 1.42108547e-14,55.2928334 1.42108547e-14,123.5 C1.42108547e-14,191.707167 55.2928334,247 123.5,247 Z" id="Oval-2" fill="url(#linearGradient-1)" opacity="0.300000012"></path>
-                <path d="M157.693521,46.9114761 C157.371158,45.8451979 156.16141,44.9808396 155.003028,45.000323 L114.123129,53.1444209 L91.810993,45.2164126 C90.6490687,45.2358961 89.43755,46.1020257 89.1151868,47.1700751 L74.3927551,96.5571737 L172.607245,96.5571737 L157.693521,46.9114761 L157.693521,46.9114761 Z M123.5,107.871766 C94.152554,107.871766 67.1927208,114.280062 46,124.997752 L201,124.997752 C179.786024,114.280062 152.847446,107.871766 123.5,107.871766 L123.5,107.871766 Z" id="Shape" fill="url(#linearGradient-2)"></path>
-                <path d="M155.018969,132.110996 C143.095075,132.110996 133.220489,140.938787 131.51657,152.396849 C126.220603,151.222526 120.738658,151.215441 115.440921,152.370281 C113.613016,141.055688 103.805736,132.37668 91.982802,132.37668 C78.8651011,132.37668 68.1916924,143.050089 68.1916924,156.16779 C68.1916924,169.28549 78.8633299,179.958899 91.982802,179.958899 C103.956291,179.958899 113.86453,171.058488 115.508228,159.531348 C120.765227,158.119681 126.298537,158.140936 131.54668,159.596883 C133.330305,170.962842 143.162381,179.693215 155.02074,179.693215 C168.138441,179.693215 178.81185,169.021578 178.81185,155.902106 C178.808308,142.784405 168.13667,132.110996 155.018969,132.110996 Z M91.9810307,173.570086 C82.3685864,173.570086 74.5769626,165.778463 74.5769626,156.166018 C74.5769626,146.553574 82.3685864,138.76195 91.9810307,138.76195 C101.593475,138.76195 109.385099,146.553574 109.385099,156.166018 C109.385099,165.778463 101.593475,173.570086 91.9810307,173.570086 Z M155.018969,173.306174 C145.406525,173.306174 137.614901,165.51455 137.614901,155.902106 C137.614901,146.289661 145.406525,138.498038 155.018969,138.498038 C164.631414,138.498038 172.423037,146.289661 172.423037,155.902106 C172.421266,165.51455 164.629642,173.306174 155.018969,173.306174 Z" id="Combined-Shape" fill="#647CE8" opacity="0.400000006"></path>
+<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="247px"
+   height="247px"
+   viewBox="0 0 247 247"
+   version="1.1"
+   id="svg26"
+   sodipodi:docname="backup-warning.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata30">
+    <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>
+  <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="namedview28"
+     showgrid="false"
+     inkscape:zoom="3.2105263"
+     inkscape:cx="40.959016"
+     inkscape:cy="123.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg26" />
+  <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">backup-warning</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs16">
+    <linearGradient
+       x1="123.5"
+       y1="1.4210855e-14"
+       x2="123.5"
+       y2="220.98438"
+       id="linearGradient-1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#192C3A"
+         offset="0%"
+         id="stop6" />
+      <stop
+         stop-color="#192C3A"
+         offset="100%"
+         id="stop8" />
+    </linearGradient>
+    <linearGradient
+       x1="88.723773"
+       y1="62.638229"
+       x2="88.723773"
+       y2="173.99195"
+       id="linearGradient-2"
+       gradientTransform="scale(1.3919606,0.71841111)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#BCBCBC"
+         offset="0%"
+         id="stop11" />
+      <stop
+         stop-color="#707D89"
+         offset="100%"
+         id="stop13" />
+    </linearGradient>
+  </defs>
+  <path
+     inkscape:connector-curvature="0"
+     style="opacity:1;fill:#8b8b8b;fill-rule:nonzero;stroke:none;stroke-width:1;fill-opacity:1"
+     id="Oval-2"
+     d="M 123.5,247 C 191.70717,247 247,191.70717 247,123.5 247,55.292833 191.70717,0 123.5,0 55.292833,0 0,55.292833 0,123.5 0,191.70717 55.292833,247 123.5,247 Z" />
+  <g
+     id="g4573"
+     style="fill:#ffffff;fill-opacity:1">
+    <g
+       id="g4564"
+       style="fill:#ffffff;fill-opacity:1">
+      <g
+         id="g4556"
+         style="fill:#ffffff;fill-opacity:1">
+        <g
+           id="g4549"
+           style="fill:#ffffff;fill-opacity:1">
+          <g
+             id="g4543"
+             style="fill:#ffffff;fill-opacity:1">
+            <g
+               id="g4538"
+               style="fill:#ffffff;fill-opacity:1">
+              <g
+                 id="g4534"
+                 style="fill:#ffffff;fill-opacity:1">
+                <path
+                   d="m 157.69352,46.911476 c -0.32236,-1.066278 -1.53211,-1.930636 -2.69049,-1.911153 l -40.8799,8.144098 -22.312137,-7.928008 c -1.161924,0.01948 -2.373443,0.885613 -2.695806,1.953662 L 74.392755,96.557174 H 172.60724 Z M 123.5,107.87177 c -29.347446,0 -56.307279,6.40829 -77.5,17.12598 h 155 c -21.21398,-10.71769 -48.15255,-17.12598 -77.5,-17.12598 z"
+                   id="Shape"
+                   style="fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;fill-opacity:1"
+                   inkscape:connector-curvature="0" />
+              </g>
             </g>
+          </g>
         </g>
+      </g>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+  <path
+     style="opacity:1;fill:#ffffff;fill-rule:nonzero;stroke:none;stroke-width:1;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="Combined-Shape"
+     d="m 155.01897,132.111 c -11.9239,0 -21.79848,8.82779 -23.5024,20.28585 -5.29597,-1.17432 -10.77791,-1.18141 -16.07565,-0.0266 -1.8279,-11.31459 -11.63518,-19.9936 -23.458118,-19.9936 -13.117701,0 -23.79111,10.67341 -23.79111,23.79111 0,13.1177 10.671638,23.79111 23.79111,23.79111 11.973488,0 21.881728,-8.90041 23.525428,-20.42755 5.257,-1.41167 10.79031,-1.39041 16.03845,0.0655 1.78362,11.36596 11.6157,20.09633 23.47406,20.09633 13.1177,0 23.79111,-10.67163 23.79111,-23.7911 -0.004,-13.11771 -10.67518,-23.79111 -23.79288,-23.79111 z m -63.037939,41.45909 c -9.612445,0 -17.404068,-7.79163 -17.404068,-17.40407 0,-9.61245 7.791623,-17.40407 17.404068,-17.40407 9.612439,0 17.404069,7.79162 17.404069,17.40407 0,9.61244 -7.79163,17.40407 -17.404069,17.40407 z m 63.037939,-0.26392 c -9.61245,0 -17.40407,-7.79162 -17.40407,-17.40406 0,-9.61245 7.79162,-17.40407 17.40407,-17.40407 9.61244,0 17.40407,7.79162 17.40407,17.40407 -0.002,9.61244 -7.7934,17.40406 -17.40407,17.40406 z" />
+</svg>
diff --git a/www/img/icon-bitcoin-small.svg b/www/img/icon-bitcoin-small.svg
index 23477ff69..2e976d07a 100644
--- a/www/img/icon-bitcoin-small.svg
+++ b/www/img/icon-bitcoin-small.svg
@@ -1,16 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
-    <title>Bitcoin_Symbol</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.8">
-        <g id="Address-(Bitcoin)" transform="translate(-11.000000, -12.000000)" fill="#5D5D5D">
-            <g id="Items/Bitcoin-Address">
-                <g id="Items/Bitcoin-Address-Copy">
-                    <path d="M19.6342548,15.1610219 L20.1628282,12.9767055 L18.8173687,12.6561808 L18.3048127,14.7930121 C17.9484261,14.7099131 17.5880351,14.6268141 17.2316485,14.5555864 L17.7442045,12.4187551 L16.3827276,12.0982304 L15.8541542,14.2825468 C15.5658415,14.2152762 15.2735244,14.163834 14.9852116,14.0965634 L13.1312004,13.6573258 L12.7908312,15.0700087 C12.7908312,15.0700087 13.7959215,15.2876489 13.7598824,15.3074344 C14.3044732,15.4419756 14.4085861,15.7941571 14.3885644,16.0632396 L13.7919172,18.5522523 C13.8279562,18.5680807 13.8760084,18.5680807 13.9280648,18.6036945 C13.8760084,18.5878661 13.8439736,18.5878661 13.7919172,18.5720378 L12.975031,22.0542813 C12.9069572,22.2204793 12.7347704,22.457905 12.3623664,22.374806 C12.3783838,22.3906344 11.3732935,22.1373803 11.3732935,22.1373803 L10.7366028,23.6687761 L12.4905054,24.0723998 C12.8148572,24.1554988 13.1392091,24.2227694 13.4435392,24.3098255 L12.9149658,26.5139274 L14.2604254,26.8344521 L14.7889988,24.6501356 C15.1654071,24.749063 15.5217937,24.8361191 15.8621629,24.9192181 L15.3335895,27.0877061 L16.6790491,27.4082308 L17.2076225,25.2041289 C19.5061158,25.6077526 21.2239794,25.4217691 21.9207352,23.3522085 C22.4813433,21.7020999 21.8686787,20.7603113 20.6433495,20.1390474 C21.5403225,19.9372355 22.1890262,19.3634568 22.3572087,18.1881996 C22.5774476,16.5737048 21.336101,15.7308436 19.6342548,15.1610219 Z M19.3299247,22.4737334 C18.937499,24.123842 16.1144366,23.2651524 15.2094549,23.0475122 L15.9062107,20.1192619 C16.8272098,20.3408592 19.7383678,20.7444829 19.3299247,22.4737334 L19.3299247,22.4737334 Z M19.7023287,18.1881996 C19.3459421,19.6839814 16.9953922,18.9637902 16.2305626,18.7778067 L16.8792663,16.122596 C17.6280786,16.3046223 20.078737,16.625147 19.7023287,18.1881996 L19.7023287,18.1881996 Z" id="Bitcoin_Symbol" transform="translate(16.559574, 19.753231) rotate(-13.000000) translate(-16.559574, -19.753231) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?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"
+   width="12px"
+   height="16px"
+   viewBox="0 0 12 16"
+   version="1.1"
+   id="svg13"
+   sodipodi:docname="icon-bitcoin-small.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata17">
+    <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>
+  <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="namedview15"
+     showgrid="false"
+     inkscape:zoom="52.772096"
+     inkscape:cx="1.1706314"
+     inkscape:cy="8.3282828"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg13" />
+  <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">Bitcoin_Symbol</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs6" />
+  <g
+     transform="matrix(1.4198302,0,0,1.4198302,-117.88848,-168.05238)"
+     aria-label=""
+     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:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="stroke-width:0.26458332px;fill:#5d5d5d;fill-opacity:1"
+       id="path4527" />
+  </g>
+</svg>
diff --git a/www/img/icon-bitcoin-symbol.svg b/www/img/icon-bitcoin-symbol.svg
index 39d4cc30b..928864222 100644
--- a/www/img/icon-bitcoin-symbol.svg
+++ b/www/img/icon-bitcoin-symbol.svg
@@ -1,13 +1,55 @@
-<?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="Bitcoin_Symbol" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 12 16" style="enable-background:new 0 0 12 16;" 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="Bitcoin_Symbol"
+   x="0px"
+   y="0px"
+   viewBox="0 0 12 16"
+   style="enable-background:new 0 0 12 16;"
+   xml:space="preserve"
+   sodipodi:docname="icon-bitcoin-symbol.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata11"><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="defs9" /><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="namedview7"
+     showgrid="false"
+     inkscape:zoom="49.959867"
+     inkscape:cx="0.74422872"
+     inkscape:cy="7.995485"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Bitcoin_Symbol" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:#5D5D5D;}
-</style>
-<path class="st0" d="M7.4,2.5l0-2.4L6,0.2l0,2.3c-0.4,0-0.8,0-1.2,0l0-2.3l-1.5,0l0,2.4c-0.3,0-0.6,0-0.9,0l-2,0l0,1.5
-	c0,0,1.1,0,1,0c0.6,0,0.8,0.3,0.8,0.6l0,6.5c0,0.2-0.2,0.5-0.6,0.5c0,0-1.1,0-1.1,0l-0.3,1.7l1.9,0c0.4,0,0.7,0,1,0l0,2.4l1.5,0
-	l0-2.4c0.4,0,0.8,0,1.2,0l0,2.3l1.5,0l0-2.4c2.5-0.1,4.2-0.7,4.4-3c0.2-1.8-0.7-2.6-2.1-3C10.5,7,11,6.2,10.9,5
-	C10.7,3.3,9.3,2.7,7.4,2.5z M8.8,10.1c0,1.8-3.1,1.6-4.1,1.6l0-3.2C5.7,8.5,8.8,8.2,8.8,10.1L8.8,10.1z M8.2,5.6
-	c0,1.6-2.6,1.4-3.4,1.4l0-2.9C5.6,4.2,8.2,3.9,8.2,5.6L8.2,5.6z"/>
-</svg>
+</style><g
+     transform="matrix(1.5122135,0,0,1.5122135,-125.99239,-179.21313)"
+     aria-label=""
+     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:#5d5d5d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487"><path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="fill:#5d5d5d;fill-opacity:1;stroke-width:0.26458332px"
+       id="path4527" /></g></svg>
\ No newline at end of file
diff --git a/www/img/icon-bitcoin-white.svg b/www/img/icon-bitcoin-white.svg
index ef8cee901..4f5d50cad 100644
--- a/www/img/icon-bitcoin-white.svg
+++ b/www/img/icon-bitcoin-white.svg
@@ -1,14 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="32px" viewBox="0 0 22 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
-    <title>Imported Layers</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.229999989">
-        <g id="Button/Slide-to-complete" transform="translate(-21.000000, -30.000000)" fill="#FFFFFF">
-            <g id="Imported-Layers-+-Imported-Layers" transform="translate(29.296522, 45.671231) rotate(-13.000000) translate(-29.296522, -45.671231) translate(5.796522, 21.671231)">
-                <path d="M33.836573,25.7756997 C34.7704654,25.0754201 35.4853422,24.0606858 35.7717349,22.8201828 C36.673248,18.9153006 34.9235595,16.0435455 31.105899,15.1621691 L31.1083424,15.1627332 L32.1877147,10.4763105 C32.2275616,10.3037147 32.2072923,10.361553 32.2545315,10.1569372 L30.1219459,9.67034919 C29.9573284,9.63234424 29.8275684,9.59662857 29.8275684,9.59662857 L28.6650396,14.5986523 L26.2217369,14.0345715 L27.3011093,9.34814878 C27.3409562,9.17555298 27.3311499,9.21524176 27.3738817,9.03015035 L24.9336331,8.46677457 C24.8693732,8.74511457 24.9080695,8.60746054 24.8630626,8.77244875 L23.7784342,13.4704906 L18.2691133,12.1942861 C18.2691133,12.1942861 18.2452251,12.3409526 18.2048311,12.5124349 L17.6912795,14.6971594 L18.311573,14.8403654 C19.6608869,15.1518791 20.4965381,16.5234293 20.1779073,17.9035709 L17.8733934,27.9008449 C17.5718192,29.207106 17.2972414,30.3330336 15.693824,29.9628555 C15.5637181,29.9328182 14.6597278,29.7295447 14.242992,29.6333337 L13.7475204,31.7794569 C13.7159762,31.9049424 13.6506979,32.1988413 13.6506979,32.1988413 C13.6506979,32.1988413 13.960357,32.2621057 14.0544242,32.2838228 L19.1627593,33.4631749 L18.0063793,38.46086 L20.449682,39.0249409 L20.5218031,38.7125503 L21.6060621,34.0272558 L24.0493648,34.5913367 L22.8953655,39.6232981 L25.0088224,40.1112281 L25.3223287,40.1836067 L26.4926675,35.1554175 L27.7118755,35.4368939 C31.529536,36.3182703 34.3610402,34.5041668 35.2625533,30.5992846 C35.684858,28.7700816 35.0727322,26.9723687 33.836573,25.7756997 L33.836573,25.7756997 Z M25.3513718,17.7831539 L29.0163259,18.6292752 C30.3656398,18.9407888 31.201291,20.3123391 30.8826602,21.6924806 C30.5640294,23.0726222 29.211703,23.939038 27.8623891,23.6275243 L24.197435,22.781403 L25.3513718,17.7831539 L25.3513718,17.7831539 Z M27.3581643,31.4071903 L22.4715589,30.2790286 L23.6254956,25.2807794 L28.512101,26.4089411 C29.861415,26.7204548 30.6970662,28.0920051 30.3784354,29.4721466 C30.0598046,30.8522882 28.7074782,31.718704 27.3581643,31.4071903 L27.3581643,31.4071903 Z" id="Imported-Layers"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?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"
+   width="22px"
+   height="32px"
+   viewBox="0 0 22 32"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="icon-bitcoin-white.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata16">
+    <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>
+  <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="namedview14"
+     showgrid="false"
+     inkscape:zoom="20.059887"
+     inkscape:cx="2.8118239"
+     inkscape:cy="17.526157"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12" />
+  <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">Imported Layers</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs6" />
+  <g
+     transform="matrix(2.8088042,0,0,2.8088042,-234.50148,-331.90876)"
+     aria-label=""
+     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:#fbfbfb;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="fill:#fbfbfb;fill-opacity:1;stroke-width:0.26458332px"
+       id="path4527" />
+  </g>
+</svg>
diff --git a/www/img/icon-bitcoin.svg b/www/img/icon-bitcoin.svg
index 5c532c555..5d80c5d57 100644
--- a/www/img/icon-bitcoin.svg
+++ b/www/img/icon-bitcoin.svg
@@ -1,31 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 51 51" style="enable-background:new 0 0 51 51;" 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="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 51 51"
+   style="enable-background:new 0 0 51 51;"
+   xml:space="preserve"
+   sodipodi:docname="icon-bitcoin.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata23"><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><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="15.54902"
+     inkscape:cx="25.5"
+     inkscape:cy="25.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:url(#coin_1_);}
 	.st1{filter:url(#Adobe_OpacityMaskFilter);}
 	.st2{fill:#FFFFFF;}
 	.st3{mask:url(#mask-3);fill:#FFFFFF;}
-</style>
-<linearGradient id="coin_1_" gradientUnits="userSpaceOnUse" x1="-273.8224" y1="413.966" x2="-274.172" y2="414.57" gradientTransform="matrix(50.3194 0 0 -50.3886 13809.4346 20893.9863)">
-	<stop  offset="0" style="stop-color:#FFA24B"/>
-	<stop  offset="1" style="stop-color:#F7891C"/>
-</linearGradient>
-<path id="coin" class="st0" d="M25.5,51c14.1,0,25.5-11.4,25.5-25.5S39.5,0,25.5,0S0,11.4,0,25.5S11.4,51,25.5,51z"/>
-<defs>
-	<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="15" y="11" width="21" height="28.7">
-		<feColorMatrix  type="matrix" values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"/>
-	</filter>
-</defs>
-<mask maskUnits="userSpaceOnUse" x="15" y="11" width="21" height="28.7" id="mask-3">
-	<g class="st1">
-		<path id="path-2" class="st2" d="M26.2,50.4c13.9,0,25.2-11.3,25.2-25.2S40.1,0,26.2,0S1,11.3,1,25.2S12.3,50.4,26.2,50.4z"/>
-	</g>
-</mask>
-<path id="BitPay-Bitcoin_Symbol" class="st3" d="M33.5,19.1c-0.6-3-3.3-3.8-6.5-3.9L26.5,11l-2.5,0.2l0.5,4.2c-0.7,0.1-1.3,0.1-2,0.2
-	l-0.5-4.2l-2.5,0.2l0.5,4.3c-0.5,0-1.1,0.1-1.6,0.2l0,0L15,16.4l0.3,2.8c0,0,1.8-0.2,1.8-0.1c1-0.1,1.4,0.5,1.5,1l0.5,4.9
-	c0.1,0,0.2,0,0.3,0c-0.1,0-0.2,0-0.3,0l0.8,6.8c0,0.3-0.2,0.9-0.8,0.9c0,0-1.8,0.2-1.8,0.2l-0.1,3.1l3.2-0.3c0.6,0,1.2-0.1,1.8-0.1
-	l0.5,4.3l2.5-0.2l-0.5-4.3c0.7,0,1.4-0.1,2-0.1l0.5,4.2l2.5-0.2l-0.5-4.3c4.2-0.6,7-2,6.9-6.1c-0.1-3.3-1.7-4.7-4.2-5.1
-	C33.2,22.8,34,21.4,33.5,19.1L33.5,19.1z M31,28.7c0.4,3.2-5,3.3-6.7,3.5l-0.6-5.7C25.5,26.3,30.7,25.3,31,28.7L31,28.7z M23.5,23.8
-	l-0.5-5.2c1.4-0.1,5.8-1,6.1,2.1C29.3,23.6,24.9,23.7,23.5,23.8z"/>
-</svg>
+</style><linearGradient
+     id="coin_1_"
+     gradientUnits="userSpaceOnUse"
+     x1="-273.8224"
+     y1="413.966"
+     x2="-274.172"
+     y2="414.57"
+     gradientTransform="matrix(50.3194 0 0 -50.3886 13809.4346 20893.9863)"><stop
+       offset="0"
+       style="stop-color:#FFA24B"
+       id="stop4" /><stop
+       offset="1"
+       style="stop-color:#F7891C"
+       id="stop6" /></linearGradient><path
+     id="coin"
+     class="st0"
+     d="M25.5,51c14.1,0,25.5-11.4,25.5-25.5S39.5,0,25.5,0S0,11.4,0,25.5S11.4,51,25.5,51z"
+     style="fill:#fab915;fill-opacity:1" /><defs
+     id="defs13"><filter
+       id="Adobe_OpacityMaskFilter"
+       filterUnits="userSpaceOnUse"
+       x="15"
+       y="11"
+       width="21"
+       height="28.7"><feColorMatrix
+         type="matrix"
+         values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
+         id="feColorMatrix10" /></filter></defs><mask
+     maskUnits="userSpaceOnUse"
+     x="15"
+     y="11"
+     width="21"
+     height="28.7"
+     id="mask-3"><g
+       class="st1"
+       id="g16"><path
+         id="path-2"
+         class="st2"
+         d="M26.2,50.4c13.9,0,25.2-11.3,25.2-25.2S40.1,0,26.2,0S1,11.3,1,25.2S12.3,50.4,26.2,50.4z" /></g></mask><g
+     transform="matrix(2.7667404,0,0,2.7667404,-215.6998,-317.27681)"
+     aria-label=""
+     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:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4487"><path
+       inkscape:connector-curvature="0"
+       d="m 89.710383,123.60521 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 87.78802 v -0.7028 q 0,-0.10336 -0.07235,-0.1757 -0.07235,-0.0724 -0.1757,-0.0724 H 86.8165 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"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.26458332px"
+       id="path4527" /></g></svg>
\ No newline at end of file
diff --git a/www/img/icon-wallet.svg b/www/img/icon-wallet.svg
index 73406a0cd..fba9bca0b 100644
--- a/www/img/icon-wallet.svg
+++ b/www/img/icon-wallet.svg
@@ -1,9 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Wallet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" 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="Wallet"
+   x="0px"
+   y="0px"
+   viewBox="0 0 40 40"
+   style="enable-background:new 0 0 40 40;"
+   xml:space="preserve"
+   sodipodi:docname="icon-wallet.svg"
+   inkscape:version="0.92.1 r15371"><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:pagecheckerboard="true"
+     inkscape:zoom="19.825"
+     inkscape:cx="12.559899"
+     inkscape:cy="26.610103"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Wallet" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:none;stroke:#FFFFFF;}
-</style>
-<path id="Icon" class="st0" d="M6.5,26.9c0,1.6,1.3,2.9,3.1,2.9h20.8c1.7,0,3.1-1.2,3.1-2.9V13.3H6.5V26.9L6.5,26.9z M26.7,13.3
-	v-3.1H6.5v3.1H26.7z M28.5,24.3c0.9,0,1.7-0.7,1.7-1.6c0-0.9-0.7-1.6-1.7-1.6s-1.7,0.7-1.7,1.6C26.7,23.6,27.5,24.3,28.5,24.3z"/>
-</svg>
+</style><text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:42.66666667px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+     x="-7.263556"
+     y="11.197982"
+     id="text4493"><tspan
+       sodipodi:role="line"
+       id="tspan4491"
+       x="-7.263556"
+       y="46.588608" /></text>
+<g
+     aria-label=""
+     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24.29528046px;line-height:125%;font-family:icomoon;-inkscape-font-specification:icomoon;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.607382px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text4497"><path
+       d="m 30.194736,19.685663 h -3.226717 q -0.735501,0 -1.233744,0.521969 -0.498243,0.498243 -0.498243,1.210019 0,0.711776 0.498243,1.233745 0.521969,0.498243 1.233744,0.498243 h 3.226717 q 0.308437,0 0.521969,-0.213533 0.237259,-0.237259 0.237259,-0.545695 v -2.016698 q 0,-0.260984 -0.237259,-0.474517 -0.213532,-0.213533 -0.521969,-0.213533 z m -11.649397,2.06415 h -2.775925 v 3.155539 h 2.704748 q 0.166081,0 0.379613,-0.02372 0.237259,-0.02373 0.427066,-0.0949 0.379614,-0.166081 0.616872,-0.569421 0.237259,-0.403339 0.237259,-0.901582 0,-0.711776 -0.450791,-1.138842 -0.427066,-0.427065 -1.138842,-0.427065 z m 8.42268,2.396312 q -1.138841,0 -1.94552,-0.782954 -0.782953,-0.806679 -0.782953,-1.94552 0,-1.138841 0.782953,-1.945521 0.806679,-0.806679 1.94552,-0.806679 h 3.226717 q 0,0 0,0 0,0 0,0 v -3.962218 q 0,-0.949035 -0.664324,-1.589633 -0.664324,-0.664324 -1.589632,-0.664324 V 11.45279 q 0,-0.735502 -0.521969,-1.233745 Q 26.920568,9.7208021 26.208792,9.7208021 H 9.5295125 q -0.7117758,0 -1.2337447,0.5219689 -0.498243,0.498243 -0.498243,1.210019 v 16.655553 q 0,0.949035 0.664324,1.613359 0.6643241,0.640598 1.5896322,0.640598 h 17.913025 q 0.949034,0 1.589632,-0.640598 0.664324,-0.664324 0.664324,-1.613359 v -3.962218 q 0,0 0,0 0,0 0,0 H 26.968019 Z M 9.6481418,12.449276 q -0.3558879,0 -0.6168723,-0.260984 Q 8.770285,11.927307 8.770285,11.571419 v 0 q 0,-0.355888 0.2609845,-0.616872 0.2609844,-0.260985 0.6168723,-0.260985 H 26.090163 q 0.355888,0 0.616872,0.260985 0.260984,0.260984 0.260984,0.616872 v 0.877857 H 9.6481418 Z M 19.779084,25.783209 q -0.332162,0.118629 -0.664324,0.166081 -0.332162,0.02373 -0.711776,0.02373 h -0.521969 v 0.711776 q 0,0.118629 -0.07118,0.213533 -0.07118,0.07118 -0.189807,0.07118 h -0.759228 q -0.118629,0 -0.213533,-0.07118 -0.07118,-0.0949 -0.07118,-0.213533 v -0.711776 h -0.854131 v 0.711776 q 0,0.118629 -0.07118,0.213533 -0.07118,0.07118 -0.189807,0.07118 H 14.70175 q -0.118629,0 -0.213533,-0.07118 -0.07118,-0.0949 -0.07118,-0.213533 v -0.711776 h -0.711776 q -0.0949,0 -0.166081,-0.07118 -0.04745,-0.07118 -0.04745,-0.142355 v -0.640598 q 0,-0.0949 0.04745,-0.142355 0.07118,-0.07118 0.166081,-0.07118 h 0.711776 v -6.951677 h -0.782954 q -0.07118,0 -0.118629,-0.04745 -0.02373,-0.04745 -0.02373,-0.11863 v -0.711775 q 0,-0.07118 0.02373,-0.11863 0.04745,-0.04745 0.118629,-0.04745 h 0.782954 v -0.735502 q 0,-0.0949 0.07118,-0.166081 0.0949,-0.0949 0.213533,-0.0949 h 0.759227 q 0.11863,0 0.189807,0.0949 0.07118,0.07118 0.07118,0.166081 v 0.735502 h 0.854131 v -0.735502 q 0,-0.0949 0.07118,-0.166081 0.0949,-0.0949 0.213533,-0.0949 h 0.759228 q 0.118629,0 0.189807,0.0949 0.07118,0.07118 0.07118,0.166081 v 0.735502 h 0.332162 q 0.498243,0 0.877857,0.07118 0.379614,0.04745 0.711776,0.213533 0.545695,0.237259 0.877857,0.782953 0.355888,0.521969 0.355888,1.233745 0,0.664324 -0.308437,1.186293 -0.28471,0.498243 -0.830405,0.759228 v 0.04745 q 0.711776,0.189807 1.115116,0.806679 0.403339,0.616873 0.403339,1.3761 0.02373,0.877857 -0.474517,1.518455 -0.474517,0.640599 -1.162567,0.877857 z m 0,-6.47716 q 0,-0.379613 -0.166081,-0.688049 -0.142355,-0.332163 -0.427066,-0.498244 -0.166081,-0.07118 -0.403339,-0.118629 -0.237259,-0.04745 -0.521969,-0.04745 H 15.79314 v 2.7522 h 2.681022 q 0.593146,0 0.949034,-0.379614 0.355888,-0.403339 0.355888,-1.020212 z"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.607382px"
+       id="path4499" /></g></svg>
\ No newline at end of file
diff --git a/www/views/onboarding/collectEmail.html b/www/views/onboarding/collectEmail.html
index 501eacb05..aaf5e59f3 100644
--- a/www/views/onboarding/collectEmail.html
+++ b/www/views/onboarding/collectEmail.html
@@ -12,7 +12,7 @@
           <label class="item item-input" id="email-label">
             <input type="email" name="email" ng-model="data.email" placeholder="{{'Enter your email'|translate}}" required></input>
           </label>
-          <ion-checkbox ng-model="data.accept"><span translate>Get news and updates from BitPay</span></ion-checkbox>
+          <ion-checkbox ng-model="data.accept"><span translate>Get news and updates from Bitcoin.com</span></ion-checkbox>
           <button class="button button-standard button-primary" ng-disabled="emailForm.$invalid">
             Continue &rarr;
           </button>
diff --git a/www/views/preferencesBwsUrl.html b/www/views/preferencesBwsUrl.html
index 71f60203b..e98b73233 100644
--- a/www/views/preferencesBwsUrl.html
+++ b/www/views/preferencesBwsUrl.html
@@ -19,7 +19,7 @@
     </div>
     <div class="settings-explanation">
       <div class="settings-description" translate>
-        {{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitcoin.com (Bitcoin.com's public BWS instance).
+        {{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and wallet synchronization. The default configuration points to https://bws.bitcoin.com (Bitcoin.com's public BWS instance).
       </div>
     </div>
     <button class="button button-standard button-primary" ng-click="save()" translate>Save</button>