diff --git a/BTCPayServer/Views/Account/_WelcomeLayout.cshtml b/BTCPayServer/Views/Account/_WelcomeLayout.cshtml
index 9a94e0924..62f4dd476 100644
--- a/BTCPayServer/Views/Account/_WelcomeLayout.cshtml
+++ b/BTCPayServer/Views/Account/_WelcomeLayout.cshtml
@@ -2,7 +2,7 @@
 @{
     Layout = null;
 }
-
+@inject BTCPayServer.Services.BTCPayServerEnvironment env
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -84,10 +84,20 @@
                 </div>
                 <div class="col-md-5 order-md-2 order-1">
                     @RenderBody()
+
+                    @if (env.OnionUrl != null)
+                    {
+                        <div class="input-group form-group">
+                            <div class="input-group-prepend">
+                                <a href="@env.OnionUrl" class="input-group-text"><span class="input-group-addon"></span><img style="display:inline" src="~/img/icons/Onion_Color.svg" height="20" /></a>
+                            </div>
+                            <input class="form-control" type="text" style="font-size:0.75em;" value="@env.OnionUrl" readonly>
+                        </div>
+                    }
                 </div>
             </div>
         </div>
-</section>
+    </section>
     @await Html.PartialAsync("_ValidationScriptsPartial")
 </body>
 </html>
diff --git a/BTCPayServer/wwwroot/img/icons/Onion_Color.svg b/BTCPayServer/wwwroot/img/icons/Onion_Color.svg
new file mode 100644
index 000000000..16e56c06f
--- /dev/null
+++ b/BTCPayServer/wwwroot/img/icons/Onion_Color.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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 69.9 107.3" enable-background="new 0 0 69.9 107.3" xml:space="preserve">
+<g>
+	<g>
+		<g id="layer3_16_" transform="translate(-92,-63.999774)">
+			<g id="layer5_16_">
+				<g id="path2554_27_">
+					<path fill="#68B044" d="M132.1,72l-2.9,11.3c4-8,10.5-14,17.8-19.3c-5.4,6.3-10.3,12.5-13.3,18.8c5.1-7.1,11.9-11.1,19.6-13.7
+						C143.2,78.2,135,88,128.9,97.8l-4.9-2.1C124.8,87.8,127.8,79.8,132.1,72L132.1,72z"/>
+				</g>
+				<g id="path2534_10_">
+					<path fill="#F5F8DE" d="M119,93.6l9.4,3.9c0,2.4-0.2,9.6,1.3,11.8c15.6,20,12.9,60.2-3.2,61.2c-24.5,0-33.8-16.6-33.8-31.9
+						c0-14,16.7-23.2,26.7-31.5C121.9,104.8,121.5,99.9,119,93.6L119,93.6z"/>
+				</g>
+				<g id="path2536_17_">
+					<path fill="#7E4798" d="M128.4,97.3l3.4,1.7c-0.3,2.2,0.2,7.1,2.4,8.4c9.8,6.1,19.1,12.8,22.8,19.4c13,23.5-9.1,45.2-28.2,43.1
+						c10.4-7.7,13.4-23.5,9.5-40.7c-1.6-6.7-4-12.8-8.4-19.7C127.9,106.2,128.5,102,128.4,97.3L128.4,97.3z"/>
+				</g>
+			</g>
+			<g id="layer4_16_">
+				<g id="path2540_17_">
+					<path fill="#010101" d="M124.6,108.5c-0.7,3.6-1.5,10.2-4.7,12.7c-1.3,1-2.7,1.9-4.1,2.9c-5.7,3.9-11.4,7.5-14,16.9
+						c-0.6,2-0.1,4.1,0.4,6.1c1.4,5.7,5.5,11.9,8.6,15.5c0,0.2,0.6,0.6,0.6,0.7c2.6,3.1,3.4,4,13.3,6.2l-0.2,1.1
+						c-5.9-1.6-10.9-3-14-6.6c0-0.1-0.6-0.6-0.6-0.6c-3.3-3.8-7.4-10.1-8.9-16.1c-0.6-2.4-1-4.2-0.4-6.7c2.7-9.7,8.6-13.5,14.5-17.5
+						c1.3-0.9,2.9-1.7,4.2-2.7C121.9,118.5,123.3,113,124.6,108.5L124.6,108.5z"/>
+				</g>
+				<g id="path2542_17_">
+					<path fill="#010101" d="M127.1,123.7c0.1,4.1-0.3,6.2,0.7,9.1c0.6,1.7,2.8,4.1,3.4,6.4c0.9,3.1,1.8,6.5,1.7,8.6
+						c0,2.4-0.1,6.8-1.2,11.6c-0.8,3.9-2.6,7.3-5.6,9.2c-3.1-0.6-6.8-1.7-8.9-3.6c-4.2-3.6-7.9-9.7-8.4-15.1
+						c-0.4-4.4,3.6-10.8,9.3-14c4.8-2.8,5.9-5.9,6.9-11c-1.4,4.4-2.8,8.2-7.4,10.5c-6.7,3.5-10.1,9.3-9.8,14.9
+						c0.5,7.1,3.3,12,9,15.9c2.4,1.7,6.8,3.4,9.6,3.9v-0.4c2.1-0.4,4.8-3.8,6.2-8.5c1.2-4.2,1.7-9.6,1.6-13c-0.1-2-1-6.3-2.5-10.2
+						c-0.9-2.1-2.2-4.3-3.1-5.8C127.6,130.8,127.6,127.5,127.1,123.7z"/>
+				</g>
+				<g id="path2544_17_">
+					<path fill="#010101" d="M126.4,140c0.1,2.8,1.2,6.3,1.7,10c0.4,2.7,0.2,5.4,0.1,7.8c-0.1,2.8-1,7.7-2.2,10.1
+						c-1.2-0.5-1.6-1.2-2.4-2.2c-1-1.3-1.6-2.7-2.2-4.3c-0.5-1.2-1-2.6-1.3-4.1c-0.3-2.4-0.2-6.1,2.5-9.9c2.1-3,2.5-3.2,3.2-6.7
+						c-1,3.1-1.7,3.4-3.9,6c-2.5,2.9-2.9,7.1-2.9,10.5c0,1.4,0.6,3,1.1,4.5c0.6,1.6,1.2,3.2,2,4.4c1.3,1.9,3,3,3.8,3.2c0,0,0,0,0,0
+						c0,0,0,0,0.1,0v-0.1c1.5-1.7,2.5-3.4,2.8-5.1c0.4-2.1,0.5-4.1,0.7-6.6c0.2-2.1,0.1-4.8-0.5-7.7
+						C128.3,146.1,127,142.5,126.4,140L126.4,140z"/>
+				</g>
+				<g id="path2550_17_">
+					<path fill="#010101" d="M126.9,105.1c0.1,4.1,0.4,11.8,1.5,14.8c0.3,1,3.2,5.5,5.3,11c1.4,3.8,1.7,7.3,2,8.3
+						c1,4.5-0.2,12.1-1.8,19.3c-0.8,3.9-3.5,8.7-6.6,10.6l-0.6,1.1c1.7-0.1,6-4.3,7.5-9.5c2.5-8.9,3.6-13,2.4-22.8
+						c-0.2-1-0.6-4.2-2.1-7.7c-2.2-5.3-5.4-10.4-5.8-11.4C128,117.3,127.1,110.1,126.9,105.1L126.9,105.1z"/>
+				</g>
+				<g id="path2552_17_">
+					<path fill="#010101" d="M128.4,97.7c-0.2,4.2-0.3,7.6,0.5,10.7c0.9,3.4,5.3,8.3,7.1,14c3.5,10.8,2.6,24.9,0.1,35.9
+						c-1,3.9-5.5,9.5-10,11.3l3.3,0.8c1.8-0.1,6.5-4.4,8.3-9.4c2.9-7.8,3.5-17.2,2.3-27c-0.1-1-1.7-9.4-3.2-13
+						c-2.1-5.3-5.5-9-6.7-12.3c-0.9-2.4-1.3-9-0.7-10.4L128.4,97.7z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path fill="#010101" d="M59.9,54.5c-3.4-3.1-7.7-5.6-12.1-8.1c-2-1.1-8.1-5.9-6-12.7l-15.5-6.3l-1,0.8c5.2,9.3,2.5,14.2-0.1,15.9
+			C20,47.6,12.5,52.1,8.7,56c-7.2,7.4-9.3,14.4-8.6,23.7c0.7,11.9,9.4,21.8,20.9,25.7c5.1,1.7,9.8,1.9,15,1.9c8.4,0,17-2.2,23.3-7.5
+			c6.7-5.5,10.6-13.9,10.6-22.5C69.9,68.6,66.3,60.3,59.9,54.5z M57.6,97.9c-5.7,4.8-16.2,8-21.6,7.8c-6.1-0.3-12.1-1.3-17.4-3.9
+			C9.3,97.3,3.1,87.6,2.7,79.7C1.9,63.6,9.6,58.9,16.8,53c4-3.3,9.6-4.9,12.8-10.8c0.6-1.3,1-4.1,0.2-7.1c-0.3-1-1.8-4.6-2.4-5.4
+			L39,34.9c-1.4,5.3,2.9,10.9,6.4,12.8c3.5,2,9.1,5.7,12.5,8.8c5.9,5.3,9.1,12.8,9.1,20.8C67.1,85.1,63.7,92.8,57.6,97.9z"/>
+	</g>
+</g>
+</svg>
