diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php
index 62b6bf2c0..ff21d5231 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -151,7 +151,7 @@ class MailManager
             $html = $this->renderTwig($template->layout->content_html, [
                 'content' => $html,
                 'css' => $template->layout->content_css,
-                'brandCss' => MailBrandSetting::compileCss()
+                'brandCss' => MailBrandSetting::renderCss()
             ] + (array) $data);
         }
 
diff --git a/modules/system/controllers/MailBrandSettings.php b/modules/system/controllers/MailBrandSettings.php
index 608c191c6..c210b2ed1 100644
--- a/modules/system/controllers/MailBrandSettings.php
+++ b/modules/system/controllers/MailBrandSettings.php
@@ -1,9 +1,11 @@
 <?php namespace System\Controllers;
 
+use Lang;
 use File;
 use Flash;
 use Config;
 use Backend;
+use Redirect;
 use BackendMenu;
 use ApplicationException;
 use System\Models\MailBrandSetting;
@@ -53,12 +55,27 @@ class MailBrandSettings extends Controller
 
         $setting = MailBrandSetting::instance();
 
-        if ($setting->exists) {
-            return $this->update($setting->id);
-        }
-        else {
-            return $this->create();
-        }
+        $setting->resetCache();
+
+        return $this->create();
+    }
+
+    public function index_onSave()
+    {
+        $setting = MailBrandSetting::instance();
+
+        return $this->create_onSave();
+    }
+
+    public function index_onResetDefault()
+    {
+        $setting = MailBrandSetting::instance();
+
+        $setting->resetDefault();
+
+        Flash::success(Lang::get('backend::lang.form.reset_success'));
+
+        return Redirect::refresh();
     }
 
     public function onUpdateSampleMessage()
diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php
index 787ce1acf..5e0f95ad9 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -45,11 +45,13 @@ class MailTemplates extends Controller
         SettingsManager::setContext('October.System', 'mail_templates');
     }
 
-    public function index()
+    public function index($tab = null)
     {
         MailTemplate::syncAll();
         $this->asExtension('ListController')->index();
         $this->bodyClass = 'compact-container';
+
+        $this->vars['activeTab'] = $tab ?: 'templates';
     }
 
     public function formBeforeSave($model)
diff --git a/modules/system/controllers/mailbrandsettings/index.htm b/modules/system/controllers/mailbrandsettings/index.htm
index 99e4331c3..2e9dbfb60 100644
--- a/modules/system/controllers/mailbrandsettings/index.htm
+++ b/modules/system/controllers/mailbrandsettings/index.htm
@@ -25,24 +25,16 @@
                         class="btn btn-primary">
                         <?= e(trans('backend::lang.form.save')) ?>
                     </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.save_and_close')) ?>
-                    </button>
                     <span class="btn-text">
                         <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                     </span>
                     <button
                         type="button"
-                        class="oc-icon-trash-o btn-icon danger pull-right"
-                        data-request="onDelete"
-                        data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
-                        data-request-confirm="<?= e(trans('backend::lang.user.delete_confirm')) ?>">
+                        class="btn btn-danger pull-right"
+                        data-request="onResetDefault"
+                        data-load-indicator="<?= e(trans('backend::lang.form.resetting')) ?>"
+                        data-request-confirm="<?= e(trans('backend::lang.form.action_confirm')) ?>">
+                        <?= e(trans('backend::lang.form.reset_default')) ?>
                     </button>
                 </div>
             </div>
diff --git a/modules/system/controllers/maillayouts/config_form.yaml b/modules/system/controllers/maillayouts/config_form.yaml
index 644f0bd89..a2f90b6f8 100644
--- a/modules/system/controllers/maillayouts/config_form.yaml
+++ b/modules/system/controllers/maillayouts/config_form.yaml
@@ -5,12 +5,12 @@
 name: system::lang.mail_templates.layout
 form: ~/modules/system/models/maillayout/fields.yaml
 modelClass: System\Models\MailLayout
-defaultRedirect: system/mailtemplates
+defaultRedirect: system/mailtemplates/index/layouts
 
 create:
     redirect: system/maillayouts/update/:id
-    redirectClose: system/mailtemplates
+    redirectClose: system/mailtemplates/index/layouts
 
 update:
     redirect: system/mailtemplates
-    redirectClose: system/mailtemplates
+    redirectClose: system/mailtemplates/index/layouts
diff --git a/modules/system/controllers/maillayouts/create.htm b/modules/system/controllers/maillayouts/create.htm
index 7eba080d2..3f997937b 100644
--- a/modules/system/controllers/maillayouts/create.htm
+++ b/modules/system/controllers/maillayouts/create.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
+        <li><a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
         <li><?= e(trans($this->pageTitle)) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -33,7 +33,7 @@
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
                 <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
                 </span>
             </div>
         </div>
@@ -43,6 +43,6 @@
 <?php else: ?>
 
     <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
+    <p><a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
 
 <?php endif ?>
diff --git a/modules/system/controllers/maillayouts/update.htm b/modules/system/controllers/maillayouts/update.htm
index 092b6a729..62bab8bed 100644
--- a/modules/system/controllers/maillayouts/update.htm
+++ b/modules/system/controllers/maillayouts/update.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
+        <li><a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
         <li><?= e(trans($this->pageTitle)) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -54,7 +54,7 @@
                     </button>
                 <?php endif ?>
                 <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                 </span>
             </div>
         </div>
@@ -64,6 +64,6 @@
 <?php else: ?>
 
     <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
+    <p><a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
 
 <?php endif ?>
diff --git a/modules/system/controllers/mailpartials/config_form.yaml b/modules/system/controllers/mailpartials/config_form.yaml
index ddff13239..92b624b2b 100644
--- a/modules/system/controllers/mailpartials/config_form.yaml
+++ b/modules/system/controllers/mailpartials/config_form.yaml
@@ -5,12 +5,12 @@
 name: system::lang.mail_templates.partial
 form: ~/modules/system/models/mailpartial/fields.yaml
 modelClass: System\Models\MailPartial
-defaultRedirect: system/mailtemplates
+defaultRedirect: system/mailtemplates/index/partials
 
 create:
     redirect: system/mailpartials/update/:id
-    redirectClose: system/mailtemplates
+    redirectClose: system/mailtemplates/index/partials
 
 update:
-    redirect: system/mailtemplates
-    redirectClose: system/mailtemplates
+    redirect: system/mailtemplates/index/partials
+    redirectClose: system/mailtemplates/index/partials
diff --git a/modules/system/controllers/mailpartials/create.htm b/modules/system/controllers/mailpartials/create.htm
index ddceee22e..dc1e3b39a 100644
--- a/modules/system/controllers/mailpartials/create.htm
+++ b/modules/system/controllers/mailpartials/create.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_partials_label')) ?></a></li>
+        <li><a href="<?= Backend::url('system/mailtemplates/index/partials') ?>"><?= e(trans('system::lang.mail_templates.menu_partials_label')) ?></a></li>
         <li><?= e(trans($this->pageTitle)) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -33,7 +33,7 @@
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
                 <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates/index/partials') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
                 </span>
             </div>
         </div>
@@ -43,6 +43,6 @@
 <?php else: ?>
 
     <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
+    <p><a href="<?= Backend::url('system/mailtemplates/index/partials') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
 
 <?php endif ?>
diff --git a/modules/system/controllers/mailpartials/update.htm b/modules/system/controllers/mailpartials/update.htm
index ef93ad422..b5e5ea706 100644
--- a/modules/system/controllers/mailpartials/update.htm
+++ b/modules/system/controllers/mailpartials/update.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_partials_label')) ?></a></li>
+        <li><a href="<?= Backend::url('system/mailtemplates/index/partials') ?>"><?= e(trans('system::lang.mail_templates.menu_partials_label')) ?></a></li>
         <li><?= e(trans($this->pageTitle)) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -54,7 +54,7 @@
                     </button>
                 <?php endif ?>
                 <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates/index/partials') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                 </span>
             </div>
         </div>
@@ -64,6 +64,6 @@
 <?php else: ?>
 
     <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
+    <p><a href="<?= Backend::url('system/mailtemplates/index/partials') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
 
 <?php endif ?>
diff --git a/modules/system/controllers/mailtemplates/index.htm b/modules/system/controllers/mailtemplates/index.htm
index 683d31f51..8d4b4ee21 100644
--- a/modules/system/controllers/mailtemplates/index.htm
+++ b/modules/system/controllers/mailtemplates/index.htm
@@ -1,17 +1,29 @@
 <div class="control-tabs content-tabs tabs-flush" data-control="tab">
     <ul class="nav nav-tabs">
-        <li class="active"><a href="#templates"><?= e(trans('system::lang.mail_templates.templates')) ?></a></li>
-        <li><a href="#layouts"><?= e(trans('system::lang.mail_templates.layouts')) ?></a></li>
-        <li><a href="#partials"><?= e(trans('system::lang.mail_templates.partials')) ?></a></li>
+        <li class="<?= $activeTab == 'templates' ? 'active' : '' ?>">
+            <a href="#templates" data-tab-url="<?= Backend::url('system/mailtemplates/index/templates') ?>">
+                <?= e(trans('system::lang.mail_templates.templates')) ?>
+            </a>
+        </li>
+        <li class="<?= $activeTab == 'layouts' ? 'active' : '' ?>">
+            <a href="#layouts" data-tab-url="<?= Backend::url('system/mailtemplates/index/layouts') ?>">
+                <?= e(trans('system::lang.mail_templates.layouts')) ?>
+            </a>
+        </li>
+        <li class="<?= $activeTab == 'partials' ? 'active' : '' ?>">
+            <a href="#partials" data-tab-url="<?= Backend::url('system/mailtemplates/index/partials') ?>">
+                <?= e(trans('system::lang.mail_templates.partials')) ?>
+            </a>
+        </li>
     </ul>
     <div class="tab-content">
-        <div class="tab-pane active">
+        <div class="tab-pane <?= $activeTab == 'templates' ? 'active' : '' ?>">
             <?= $this->listRender('templates') ?>
         </div>
-        <div class="tab-pane">
+        <div class="tab-pane <?= $activeTab == 'layouts' ? 'active' : '' ?>">
             <?= $this->listRender('layouts') ?>
         </div>
-        <div class="tab-pane">
+        <div class="tab-pane <?= $activeTab == 'partials' ? 'active' : '' ?>">
             <?= $this->listRender('partials') ?>
         </div>
     </div>
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index 3b40bd8d6..267592150 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -77,6 +77,11 @@ class MailBrandSetting extends Model
     }
 
     public function afterSave()
+    {
+        $this->resetCache();
+    }
+
+    public function resetCache()
     {
         Cache::forget(self::CACHE_KEY);
     }
diff --git a/modules/system/views/mail/partial-button.htm b/modules/system/views/mail/partial-button.htm
index cb78d61d7..46aab658c 100644
--- a/modules/system/views/mail/partial-button.htm
+++ b/modules/system/views/mail/partial-button.htm
@@ -11,7 +11,9 @@ name = "Button"
                         <table border="0" cellpadding="0" cellspacing="0">
                             <tr>
                                 <td>
-                                    <a href="{{ url }}" class="button button-{{ type ?: 'primary' }}" target="_blank">{{ body }}</a>
+                                    <a href="{{ url }}" class="button button-{{ type ?: 'primary' }}" target="_blank">
+                                        {{ body }}
+                                    </a>
                                 </td>
                             </tr>
                         </table>