diff --git a/css/amount.css b/css/amount.css
index 9d4e7f97..bbe4c9cb 100644
--- a/css/amount.css
+++ b/css/amount.css
@@ -37,7 +37,7 @@
 	display: inline-block;
 }
 .amount.crypto .amount-value {
-	font-weight: 200
+	font-weight: 200;
 }
 .amount.crypto .amount-currency {
 	font-weight: 500;
diff --git a/css/header.css b/css/header.css
index a20960cd..47f36f8d 100644
--- a/css/header.css
+++ b/css/header.css
@@ -24,7 +24,7 @@ html.screen-saver-on #header {
 	top: 0;
 	display: block;
 	line-height: 4.1rem;
-	font-weight: 200
+	font-weight: 200;
 	padding: 0 1rem;
 }
 .header-button {
diff --git a/css/page.css b/css/page.css
index dc0e707f..3e078915 100644
--- a/css/page.css
+++ b/css/page.css
@@ -1,6 +1,6 @@
 .page h1 {
 	font-size: 1.8rem;
-	font-weight: 200
+	font-weight: 200;
 	margin-bottom: 1rem;
 }
 .page h2 {
diff --git a/css/payment-method.css b/css/payment-method.css
index 05ef82ec..5f4677e9 100644
--- a/css/payment-method.css
+++ b/css/payment-method.css
@@ -5,17 +5,19 @@
 	width: 4.8rem;
 	height: 4.8rem;
 	background-size: 4.8rem;
-	background-position: center center;
+	background-position: center;
 	background-repeat: no-repeat;
 	box-sizing: border-box;
 	padding: 0;
 	margin: 0;
 }
 .payment-method.bitcoin,
-.payment-method.bitcoinTestnet,
-.payment-method.bitcoinLightning {
+.payment-method.bitcoinTestnet {
 	background-image: url('../images/bitcoin.svg');
 }
+.payment-method.bitcoinLightning {
+	background-image: url('../images/bitcoin-lightning.svg');
+}
 .payment-method.litecoin,
 .payment-method.litecoinTestnet {
 	background-image: url('../images/litecoin.svg');
@@ -34,13 +36,13 @@
 .payment-method.bitcoinLightning:after {
 	position: absolute;
 	right: -.7rem;
-	bottom: -.7rem;
+	bottom: -.2rem;
 	z-index: 20;
 	content: ' ';
 	display: block;
-	width: 3rem;
-	height: 3rem;
-	background-size: 3rem;
+	width: 2.5rem;
+	height: 4.25rem;
+	background-size: 2.5rem 4.25rem;
 	background-color: transparent;
 	background-position: center center;
 	background-repeat: no-repeat;
diff --git a/css/result-indicator.css b/css/result-indicator.css
index c649a79c..f0c236c8 100644
--- a/css/result-indicator.css
+++ b/css/result-indicator.css
@@ -17,7 +17,7 @@
 .result-indicator-inner {
 	color: #fff;
 	font-size: 2.2rem;
-	font-weight: 200
+	font-weight: 200;
 	text-align: center;
 }
 @-webkit-keyframes resultIndicatorScale {
diff --git a/css/views/admin.css b/css/views/admin.css
index 2848f057..533f386c 100644
--- a/css/views/admin.css
+++ b/css/views/admin.css
@@ -17,19 +17,20 @@
 
 /*  General Settings  */
 .view.admin .form-group.configurableCryptoCurrencies .button.payment-method {
-	width: 3.2rem;
-	height: 3.2rem;
-	background-size: 3.2rem;
-	opacity: 0.5;
+	width: 5rem;
+	height: 5rem;
+	background-size: 4.5rem;
+	opacity: .33;
+	box-sizing: border-box;
+	padding: 0;
 	margin: 0 .4rem .4rem 0;
-	padding: .5rem;
 }
 .view.admin .form-group.configurableCryptoCurrencies .button.payment-method.bitcoinLightning:after {
-	right: -.4rem;
-	bottom: -.4rem;
-	width: 2.4rem;
-	height: 2.4rem;
-	background-size: 2.4rem;
+	right: -.5rem;
+	bottom: -.15rem;
+	width: 1.7rem;
+	height: 2.89rem;
+	background-size: 2rem 2.89rem;
 }
 .view.admin .form-group.configurableCryptoCurrencies input[type="checkbox"] {
 	position: absolute;
diff --git a/css/views/choose-payment-method.css b/css/views/choose-payment-method.css
index 370f3fbb..93279d75 100644
--- a/css/views/choose-payment-method.css
+++ b/css/views/choose-payment-method.css
@@ -8,7 +8,7 @@
 .view.choose-payment-method .payment-method {
 	width: 6rem;
 	height: 6rem;
-	background-size: 5.4rem;
+	background-size: 6rem;
 }
 .view.choose-payment-method .button.secondary-control {
 	background-position: center center;
diff --git a/css/views/enter-pin.css b/css/views/enter-pin.css
index a512f1d3..86a1ab66 100644
--- a/css/views/enter-pin.css
+++ b/css/views/enter-pin.css
@@ -19,7 +19,7 @@
 }
 .enter-pin-keys:empty:after {
 	content: '-';
-	font-weight: 200
+	font-weight: 200;
 }
 .enter-pin-inner {
 	margin: 0 auto;
diff --git a/css/views/payment-details.css b/css/views/payment-details.css
index 1d033487..6827bd17 100644
--- a/css/views/payment-details.css
+++ b/css/views/payment-details.css
@@ -27,14 +27,14 @@
 .view.payment-detail .payment-details-info-item-value-timestamp,
 .view.payment-detail .payment-details-amount-crypto {
 	font-size: .9rem;
-	font-weight: 200
+	font-weight: 200;
 	margin-top: .2rem;
 }
 .view.payment-detail .payment-details-info-item-value.status {
 	display: inline-block;
 	vertical-align: top;
 	font-size: 1.1rem;
-	font-weight: 200
+	font-weight: 200;
 	background-color: rgba(210, 210, 210, 0.5);
 	border-radius: .5rem;
 	padding: .5rem 1rem;
diff --git a/css/views/payment-history.css b/css/views/payment-history.css
index 7500c3d6..bbbf3467 100644
--- a/css/views/payment-history.css
+++ b/css/views/payment-history.css
@@ -44,7 +44,7 @@
 .view.admin .payment-history-item-timestamp,
 .view.admin .payment-history-item-amount-crypto {
 	font-size: 0.9rem;
-	font-weight: 200
+	font-weight: 200;
 	margin-top: .2rem;
 }
 .view.admin .payment-history-status-and-timestamp {
diff --git a/css/views/recommended-mobile-wallets.css b/css/views/recommended-mobile-wallets.css
index 3f52b9dd..19e1e5ad 100644
--- a/css/views/recommended-mobile-wallets.css
+++ b/css/views/recommended-mobile-wallets.css
@@ -26,9 +26,10 @@
 	margin-top: .4rem;
 }
 .view.recommended-mobile-wallets .recommendations-group-item-payment-methods .payment-method {
-	width: 1.8rem;
-	height: 1.8rem;
-	background-size: 1.8rem;
+	width: 2.4rem;
+	height: 2.4rem;
+	background-size: 2.4rem;
+	background-position: 0;
 }
 .view.recommended-mobile-wallets .recommendations-group-item-payment-methods .payment-method.bitcoinTestnet {
 	font-size: .6rem;
@@ -37,9 +38,9 @@
 	left: -.15rem;
 }
 .view.recommended-mobile-wallets .recommendations-group-item-payment-methods .payment-method.bitcoinLightning:after {
-	right: -.3rem;
-	bottom: -.3rem;
-	width: 1.2rem;
-	height: 1.2rem;
-	background-size: 1.2rem;
+	right: -.5rem;
+	bottom: -.4rem;
+	width: 1rem;
+	height: 1.7rem;
+	background-size: 1rem 1.7rem;
 }
diff --git a/html/templates/admin-general-settings.html b/html/templates/admin-general-settings.html
index e337ab77..bbbfab6f 100644
--- a/html/templates/admin-general-settings.html
+++ b/html/templates/admin-general-settings.html
@@ -1,6 +1,19 @@
 <form>
 	<div class="form">
 		<div class="form-group settings">
+			{{#each inputs}}
+				{{> formFieldRow .}}
+			{{/each}}
+		</div>
+		<div class="form-group configurableCryptoCurrencies">
+			<div class="form-group-label">{{i18n "settings.accept-crypto-currencies.label"}}</div>
+			{{#each paymentMethods}}
+			<input id="settings-configurableCryptoCurrencies-{{key}}" type="checkbox" name="configurableCryptoCurrencies[]" value="{{key}}"{{#if accepted}} checked{{/if}}>
+			<label for="settings-configurableCryptoCurrencies-{{key}}" class="button payment-method {{key}}" title="{{label}}" data-key="{{key}}"></label>
+			{{/each}}
+			<div class="clearfix"></div>
+		</div>
+		<div class="form-group other">
 			<div class="form-row">
 				<div class="form-label">{{i18n "admin.pin.label"}}</div>
 				<div class="form-field">
@@ -15,17 +28,6 @@
 					</div>
 				</div>
 			</div>
-			{{#each inputs}}
-				{{> formFieldRow .}}
-			{{/each}}
-		</div>
-		<div class="form-group configurableCryptoCurrencies">
-			<div class="form-group-label">{{i18n "settings.accept-crypto-currencies.label"}}</div>
-			{{#each paymentMethods}}
-			<input id="settings-configurableCryptoCurrencies-{{key}}" type="checkbox" name="configurableCryptoCurrencies[]" value="{{key}}"{{#if accepted}} checked{{/if}}>
-			<label for="settings-configurableCryptoCurrencies-{{key}}" class="button payment-method {{key}}" title="{{label}}" data-key="{{key}}"></label>
-			{{/each}}
-			<div class="clearfix"></div>
 		</div>
 	</div>
 </form>
\ No newline at end of file
diff --git a/images/bitcoin-lightning.svg b/images/bitcoin-lightning.svg
new file mode 100644
index 00000000..6a4156c4
--- /dev/null
+++ b/images/bitcoin-lightning.svg
@@ -0,0 +1,29 @@
+<?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"
+   height="340"
+   width="339.99741"
+   version="1.1"
+   viewBox="0 0 339.99741 340"
+   data-name="Layer 2"
+   id="Layer_2">
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#ff9000;}.cls-2{fill:#fff;}.cls-3{fill:#ffba00;}.cls-4{font-size:260px;letter-spacing:-0.03em;}.cls-4,.cls-7{fill:#4e4e4e;font-family:Ubuntu-BoldItalic, Ubuntu;font-style:italic;}.cls-4,.cls-8,.cls-9{font-weight:700;}.cls-5{letter-spacing:-0.04em;}.cls-6{letter-spacing:-0.05em;}.cls-7{font-size:57px;}.cls-12,.cls-9{letter-spacing:0.01em;}.cls-10,.cls-11,.cls-12,.cls-13,.cls-14{font-family:Ubuntu-LightItalic, Ubuntu;}.cls-10{letter-spacing:-0.02em;}.cls-11{letter-spacing:-0.02em;}.cls-13{letter-spacing:-0.01em;}.cls-14{letter-spacing:0.01em;}</style>
+  </defs>
+  <path
+     style="fill:#ff9000"
+     id="path8"
+     d="m 339.99742,169.06283 a 170,170 0 1 0 -39.66,110.08 l -47.31,-13.14 z"
+     class="cls-1" />
+  <path
+     style="fill:#ffffff"
+     id="path10"
+     d="m 244.97742,145.78283 c 3.39,-22.62 -13.84,-34.78 -37.39,-42.89 l 7.67,-30.639996 -18.65,-4.65 -7.44,29.83 c -4.9,-1.22 -9.93,-2.37 -14.94,-3.51 l 7.49,-30 -18.64,-4.64 -7.64,30.63 c -4.06,-0.93 -8.05,-1.84 -11.92,-2.8 v -0.1 l -25.73,-6.42 -5,19.919996 c 0,0 13.84,3.17 13.55,3.37 7.59,1.81 8.92,6.81 8.73,10.81 l -8.7,34.91 a 14.91,14.91 0 0 1 1.94,0.62 l -2,-0.49 -12.2,48.9 c -0.93,2.29 -3.27,5.74 -8.55,4.43 0.19,0.27 -13.560006,-3.38 -13.560006,-3.38 l -9.26,21.35 24.280006,6 c 4.51,1.13 8.94,2.31 13.29,3.43 l -7.72,31 18.67,4.69 7.64,-30.66 c 5.09,1.38 10,2.65 14.86,3.85 l -7.61,30.52 18.65,4.65 7.72,-30.93 c 31.8,6 55.72,3.59 65.79,-25.18 8.11,-23.16 -0.41,-36.52 -17.14,-45.23 12.18,-2.81 21.36,-10.83 23.81,-27.39 z m -42.61,59.76 c -5.77,23.16 -44.77,10.64 -57.41,7.5 l 10.24,-41.06 c 12.65,3.16 53.19,9.41 47.17,33.56 z m 5.77,-60.09 c -5.26,21.07 -37.72,10.36 -48.25,7.74 l 9.29,-37.24 c 10.52,2.62 44.43,7.52 38.96,29.5 z"
+     class="cls-2" />
+</svg>
diff --git a/images/bitcoin.svg b/images/bitcoin.svg
index dad069b5..b4b3b4c3 100644
--- a/images/bitcoin.svg
+++ b/images/bitcoin.svg
@@ -1,21 +1 @@
-<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"
-	 width="226.777px" height="226.777px" viewBox="0 0 226.777 226.777" enable-background="new 0 0 226.777 226.777"
-	 xml:space="preserve">
-<g id="BTC_2_">
-	<circle cx="113.3885" cy="113.3885" r="113.3885" fill="#fff" />
-	<path d="M135.715,122.244c-2.614-1.31-8.437-3.074-15.368-3.533c-6.934-0.458-15.828,0-15.828,0v30.02c0,0,9.287,0.198,15.503-0.26
-		c6.21-0.458,12.621-2.027,15.826-3.795c3.203-1.766,7.063-4.513,7.063-11.379C142.911,126.428,138.332,123.552,135.715,122.244z" fill="#f7931a"/>
-	<path d="M116.16,104.779c5.104-0.197,10.532-1.373,14.453-3.532c3.925-2.158,6.148-5.557,6.02-10.66
-		c-0.134-5.102-3.532-9.418-9.287-11.186c-5.757-1.766-9.613-1.897-13.998-1.962c-4.382-0.064-8.83,0.328-8.83,0.328v27.012
-		C104.519,104.779,111.059,104.976,116.16,104.779z" fill="#f7931a"/>
-	<path d="M113.413,0C50.777,0,0,50.776,0,113.413c0,62.636,50.777,113.413,113.413,113.413s113.411-50.777,113.411-113.413
-		C226.824,50.776,176.049,0,113.413,0z M159.591,156.777c-8.44,5.887-17.465,6.935-21.455,7.456
-		c-1.969,0.259-5.342,0.532-8.959,0.744v22.738h-13.998v-22.37c-2.615,0-6.361,0-10.66,0v22.37H90.522v-22.37
-		c-13.852,0-27.535,0-27.535,0l2.877-16.812c0,0,5.559,0,8.371,0c2.814,0,3.989-0.261,5.166-1.372
-		c1.177-1.113,1.439-2.812,1.439-4.188c0-1.373,0-54.286,0-57.916c0-3.628-0.295-4.61-1.963-6.473
-		c-1.668-1.867-5.591-2.112-7.8-2.112c-2.207,0-8.091,0-8.091,0V61.939c0,0,13.246,0,27.535,0V39.505h13.996v22.434
-		c3.889,0,7.537,0,10.66,0V39.505h13.998v22.703c10.435,0.647,18.203,2.635,24.983,7.645c8.766,6.475,8.306,17.724,8.11,20.406
-		c-0.195,2.682-1.372,7.85-3.729,11.183c-2.352,3.337-8.108,6.673-8.108,6.673s6.801,1.438,11.578,5.036
-		c4.771,3.598,8.307,9.941,8.106,19.229C169.923,141.668,168.027,150.891,159.591,156.777z" fill="#f7931a"/>
-</g>
-</svg>
+<?xml version="1.0" ?><svg height="60px" version="1.1" viewBox="0 0 60 60" width="60px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title/><desc/><defs/><g fill="none" fill-rule="evenodd" id="Page-1" stroke="none" stroke-width="1"><g id="Social_icons" transform="translate(-322.000000, -954.000000)"><g id="Bitcoin" transform="translate(322.000000, 954.000000)"><path d="M30,60 C46.5685435,60 60,46.5685435 60,30 C60,13.4314565 46.5685435,0 30,0 C13.4314565,0 0,13.4314565 0,30 C0,46.5685435 13.4314565,60 30,60 Z" fill="#ff9900" id="Oval"/><path d="M42.4796923,25.3329231 C43.0676923,21.4024615 40.0750769,19.2895385 35.9830769,17.88 L37.3104615,12.5556923 L34.0695385,11.748 L32.7772308,16.932 C31.9252308,16.7196923 31.0501538,16.5193846 30.1806154,16.3209231 L31.4821538,11.1027692 L28.2430769,10.2950769 L26.9147692,15.6175385 C26.2095385,15.4569231 25.5172308,15.2981538 24.8452308,15.1310769 L24.8489231,15.1144615 L20.3793846,13.9984615 L19.5172308,17.46 C19.5172308,17.46 21.9218462,18.0110769 21.8710769,18.0452308 C23.1836923,18.3729231 23.4209231,19.2415385 23.3812308,19.9301538 L21.8692308,25.9956923 C21.9596923,26.0187692 22.0769231,26.052 22.2061538,26.1036923 C22.0981538,26.0769231 21.9827692,26.0473846 21.8636923,26.0187692 L19.7443077,34.5156923 C19.5836923,34.9144615 19.1766154,35.5126154 18.2590769,35.2855385 C18.2913846,35.3326154 15.9033846,34.6975385 15.9033846,34.6975385 L14.2944615,38.4073846 L18.512,39.4587692 C19.2966154,39.6553846 20.0655385,39.8612308 20.8224615,40.0550769 L19.4812308,45.4403077 L22.7184615,46.248 L24.0467692,40.92 C24.9310769,41.16 25.7895385,41.3815385 26.6295385,41.5901538 L25.3058462,46.8932308 L28.5467692,47.7009231 L29.888,42.3258462 C35.4144615,43.3716923 39.5701538,42.9498462 41.3193846,37.9513846 C42.7289231,33.9267692 41.2492308,31.6052308 38.3415385,30.0913846 C40.4590769,29.6030769 42.0541538,28.2101538 42.4796923,25.3329231 L42.4796923,25.3329231 Z M35.0747692,35.7166154 C34.0732308,39.7412308 27.2969231,37.5655385 25.1,37.02 L26.8796923,29.8855385 C29.0766154,30.4338462 36.1215385,31.5193846 35.0747692,35.7166154 Z M36.0772308,25.2747692 C35.1633846,28.9356923 29.5233846,27.0756923 27.6938462,26.6196923 L29.3073846,20.1489231 C31.1369231,20.6049231 37.0289231,21.456 36.0772308,25.2747692 L36.0772308,25.2747692 Z" fill="#fff" id="Shape"/></g></g></g></svg>
\ No newline at end of file
diff --git a/images/lightning.svg b/images/lightning.svg
index 796d7697..eda3bc8a 100644
--- a/images/lightning.svg
+++ b/images/lightning.svg
@@ -5,51 +5,21 @@
    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"
-   xml:space="preserve"
-   enable-background="new 0 0 226.777 226.777"
-   viewBox="0 0 216.78101 225.11001"
-   height="225.11"
-   width="216.78101"
-   y="0px"
-   x="0px"
-   id="Layer_1"
-   version="1.1"><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" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs14"><filter
-       id="Blurx"><feGaussianBlur
-         id="feGaussianBlur2"
-         stdDeviation="0.4"
-         in="SourceGraphic" /></filter><filter
-       id="Blurx-3"><feGaussianBlur
-         id="feGaussianBlur2-6"
-         stdDeviation="0.4"
-         in="SourceGraphic" /></filter><filter
-       height="1.0509214"
-       y="-0.02546072"
-       width="1.1018429"
-       x="-0.050921439"
-       id="filter4683"
-       style="color-interpolation-filters:sRGB"><feGaussianBlur
-         id="feGaussianBlur4685"
-         stdDeviation="0.42434533" /></filter></defs><path
-     transform="matrix(8.6955822,0,0,4.5213514,-104.95583,3.563782)"
-     style="opacity:1;fill:#222222;fill-opacity:1;filter:url(#filter4683)"
-     id="use8"
-     d="m 15,28 h 9 L 20,45 35,22 H 26 L 30,5" /><path
-     id="path10"
-     d="M 0,126.59757 H 86.955822 L 43.47791,212.50325 208.69397,90.426758 H 121.73815 L 165.21606,-2.7198965e-4"
-     style="fill:#eecc00;stroke-width:6.27022982" /><path
-     style="fill:#eecc00;stroke-width:6.27022982"
-     id="use12"
-     d="m 17.391163,122.07622 h 78.26024 L 60.869074,198.93919 191.30281,94.948108 H 113.04257 L 147.8249,18.085134" /><path
-     id="path14"
-     d="M 147.8249,18.085134 17.391163,122.07622 60.869074,108.51216"
-     style="fill:#ffffee;stroke-width:6.27022982" /><path
-     id="path16"
-     d="m 139.12931,108.51216 52.1735,-13.564052 H 113.04257 L 60.869075,108.51216 h 78.260235 l -78.260235,90.42703 34.782328,-76.86297"
-     style="fill:#ffffcc;stroke-width:6.27022982" /><path
-     id="path18"
-     d="M 60.869074,108.51216 113.04257,94.948108 147.8249,18.085134 60.869074,108.51216 H 139.12931 L 60.869074,198.93919 191.30281,94.948108 139.12931,108.51216"
-     style="fill:#bbaa00;stroke-width:6.27022982" /></svg>
\ No newline at end of file
+   id="Layer_2"
+   data-name="Layer 2"
+   viewBox="0 0 121 205"
+   version="1.1"
+   width="121"
+   height="205">
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#ff9000;}.cls-2{fill:#fff;}.cls-3{fill:#ffba00;}.cls-4{font-size:260px;letter-spacing:-0.03em;}.cls-4,.cls-7{fill:#4e4e4e;font-family:Ubuntu-BoldItalic, Ubuntu;font-style:italic;}.cls-4,.cls-8,.cls-9{font-weight:700;}.cls-5{letter-spacing:-0.04em;}.cls-6{letter-spacing:-0.05em;}.cls-7{font-size:57px;}.cls-12,.cls-9{letter-spacing:0.01em;}.cls-10,.cls-11,.cls-12,.cls-13,.cls-14{font-family:Ubuntu-LightItalic, Ubuntu;}.cls-10{letter-spacing:-0.02em;}.cls-11{letter-spacing:-0.02em;}.cls-13{letter-spacing:-0.01em;}.cls-14{letter-spacing:0.01em;}</style>
+  </defs>
+  <polygon
+     class="cls-3"
+     points="400.77,261.31 337.77,244.31 375.77,162.31 279.77,269.31 333.77,284.31 295.77,367.31 "
+     id="polygon12"
+     style="fill:#ffba00"
+     transform="translate(-279.77,-162.31)" />
+</svg>