diff --git a/email-templates/base.html b/email-templates/base.html
index 467434e..0f47897 100644
--- a/email-templates/base.html
+++ b/email-templates/base.html
@@ -42,7 +42,20 @@
             .gutter {
                 padding: 30px;
             }
-
+            .button {
+                background: #7f2aff;
+                color: #fff !important;
+                display: inline-block;
+                border-radius: 3px;
+                padding: 10px 30px;
+                text-align: center;
+                text-decoration: none;
+                font-weight: bold;
+            }
+            .button:hover {
+                background: #222;
+                color: #fff;
+            }
             img {
                 max-width: 100%;
             }
@@ -67,7 +80,9 @@
     <div class="gutter">&nbsp;</div>
     <div class="wrap">
         <div class="header">
-            <a href="{{ index . "RootURL" }}"><img src="{{ index . "RootURL" }}/public/static/logo.svg" alt="listmonk" /></a>
+            {{ if ne LogoURL "" }}
+                <a href="{{ RootURL }}"><img src="{{ LogoURL }}" alt="listmonk" /></a>
+            {{ end }}
         </div>
 {{ end }}
 
diff --git a/email-templates/import-status.html b/email-templates/import-status.html
index 1c4ff91..3fa6e08 100644
--- a/email-templates/import-status.html
+++ b/email-templates/import-status.html
@@ -4,7 +4,7 @@
 <table width="100%">
     <tr>
         <td width="30%"><strong>File</strong></td>
-        <td><a href="{{ .RootURL }}/subscribers/import">{{ .Name }}</a></td>
+        <td><a href="{{ RootURL }}/subscribers/import">{{ .Name }}</a></td>
     </tr>
     <tr>
         <td width="30%"><strong>Status</strong></td>
diff --git a/public/templates/subscription.html b/public/templates/subscription.html
index dce37ef..62ef061 100644
--- a/public/templates/subscription.html
+++ b/public/templates/subscription.html
@@ -4,19 +4,19 @@
     <h2>Unsubscribe</h2>
     <p>Do you wish to unsubscribe from this mailing list?</p>
     <form method="post">
-        <p>
+        <div>
             <input type="hidden" name="unsubscribe" value="true" />
-        </p>
 
-        {{ if .Data.AllowBlacklist }}
-        <p>
-            <input id="privacy-blacklist" type="checkbox" name="blacklist" value="true" /> <label for="privacy-blacklist">Also unsubscribe from all future e-mails.</label>
-        </p>
+            {{ if .Data.AllowBlacklist }}
+                <p>
+                    <input id="privacy-blacklist" type="checkbox" name="blacklist" value="true" /> <label for="privacy-blacklist">Also unsubscribe from all future e-mails.</label>
+                </p>
+            {{ end }}
 
-        {{ end }}
-        <p>
-            <button type="submit" class="button" id="btn-unsub">Unsubscribe</button>
-        </p>
+            <p>
+                <button type="submit" class="button" id="btn-unsub">Unsubscribe</button>
+            </p>
+        </div>
     </form>
 </section>