diff --git a/public/css/akaunting-color.css b/public/css/akaunting-color.css
index d3774ba8c..6d2fd188d 100644
--- a/public/css/akaunting-color.css
+++ b/public/css/akaunting-color.css
@@ -1936,10 +1936,6 @@ button.bg-green:focus {
     width: 30px;
     height: 30px;
 }
-
-.border-radius-0 {
-    border-radius: 0 !important;
-}
 /*--Left Menu Icon Finish--*/
 
 /*--Unselected Text Color--*/
diff --git a/public/css/custom.css b/public/css/custom.css
index 0e5273bdb..2e52c47f5 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -77,7 +77,6 @@ button:focus
     border-radius: calc(0.375rem - 1px) calc(0.375rem - 1px) 0 0;
 }
 
-
 .wizard-steps
 {
     width: 3.375rem;
@@ -119,21 +118,20 @@ button:focus
 /*--------Wizard Steps Finish--------*/
 
 
-/*--------Border Radius 0--------*/
-.border-radius-0
+/*--------Border Radius None--------*/
+.border-radius-none
 {
     border-radius: 0 !important;
 }
-/*--------Border Radius 0 Finished--------*/
+/*--------Border Radius None Finished--------*/
 
 
-/*--------Border Radius 5--------*/
-.border-radius-5
+/*--------Border Radius Default--------*/
+.border-radius-default
 {
-    border-radius: 5px !important;
+    border-radius: 0.25rem !important
 }
-/*--------Border Radius 5 Finished--------*/
-
+/*--------Border Radius Default Finished--------*/
 
 .dropup .dropdown-toggle::after
 {
@@ -311,6 +309,13 @@ button:focus
 }
 /*--------Border Top Finish--------*/
 
+/*--------Border--------*/
+.border-1
+{
+    border: 1px solid #e5e5e5 !important;
+}
+/*--------Border Finish--------*/
+
 
 /*--------Border Bottom--------*/
 .border-bottom-1
diff --git a/resources/views/modals/settings/invoice_template.blade.php b/resources/views/modals/settings/invoice_template.blade.php
index aad1aae08..52f76206d 100644
--- a/resources/views/modals/settings/invoice_template.blade.php
+++ b/resources/views/modals/settings/invoice_template.blade.php
@@ -12,7 +12,7 @@
     ]) !!}
         <div class="row">
             <div class="col-md-4 text-center px-0">
-                <div class="bg-print border-radius-5 print-edge choose" @click="invoice_form.template='default'">
+                <div class="bg-print border-radius-default print-edge choose" @click="invoice_form.template='default'">
                     <img src="{{ asset('public/img/invoice_templates/default.png') }}" class="mb-1 mt-3" height="200" alt="Default"/>
                     <label>
                         <input type="radio" name="template" value="default" v-model="invoice_form.template">
@@ -22,7 +22,7 @@
             </div>
 
             <div class="col-md-4 text-center px-0">
-                <div class="bg-print border-radius-5 print-edge choose" @click="invoice_form.template='classic'">
+                <div class="bg-print border-radius-default print-edge choose" @click="invoice_form.template='classic'">
                     <img src="{{ asset('public/img/invoice_templates/classic.png') }}" class="mb-1 mt-3" height="200" alt="Classic"/>
                     <label>
                         <input type="radio" name="template" value="classic" v-model="invoice_form.template">
@@ -32,7 +32,7 @@
             </div>
 
             <div class="col-md-4 text-center px-0">
-                <div class="bg-print border-radius-5 print-edge choose" @click="invoice_form.template='modern'">
+                <div class="bg-print border-radius-default print-edge choose" @click="invoice_form.template='modern'">
                     <img src="{{ asset('public/img/invoice_templates/modern.png') }}" class="mb-1 mt-3" height="200" alt="Modern"/>
                     <label>
                         <input type="radio" name="template" value="modern" v-model="invoice_form.template">
diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php
index f912dcca6..61447caff 100644
--- a/resources/views/partials/admin/menu.blade.php
+++ b/resources/views/partials/admin/menu.blade.php
@@ -6,7 +6,7 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="avatar avatar-xs background-unset">
-                            <img class="border-radius-0 border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}">
+                            <img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}">
                         </span>
                         <span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
                         <i class="fas fa-sort-down pl-2"></i>
diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php
index 7c508a217..026fa24eb 100644
--- a/resources/views/partials/modules/item.blade.php
+++ b/resources/views/partials/modules/item.blade.php
@@ -19,7 +19,7 @@
         <a href="{{ route('apps.app.show', [$module->slug]) }}">
             @foreach ($module->files as $file)
                 @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
-                    <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-0">
+                    <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="card-img-top border-radius-none">
                 @endif
             @endforeach
         </a>
diff --git a/resources/views/partials/portal/menu.blade.php b/resources/views/partials/portal/menu.blade.php
index 2c114a673..551f4c873 100644
--- a/resources/views/partials/portal/menu.blade.php
+++ b/resources/views/partials/portal/menu.blade.php
@@ -6,7 +6,7 @@
                 <li class="nav-item">
                     <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="avatar avatar-xs background-unset">
-                            <img class="border-radius-0 border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}">
+                            <img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.png') }}">
                         </span>
                         <span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
                     </a>
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index fe6e9b879..9702ba666 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -120,7 +120,7 @@
 
             @foreach ($invoice->totals as $total)
                 @if ($total->code == 'total')
-                    <p class="bg-light border-radius-5 float-right text-center w-50">
+                    <p class="bg-light border-radius-default float-right text-center w-50">
                         <b>{{ trans($total->name) }}:</b>
                         @money($total->amount - $invoice->paid, $invoice->currency_code, true)
                     </p>
diff --git a/resources/views/settings/email/edit.blade.php b/resources/views/settings/email/edit.blade.php
index 6961cbdc8..195aadcb3 100644
--- a/resources/views/settings/email/edit.blade.php
+++ b/resources/views/settings/email/edit.blade.php
@@ -29,10 +29,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_new_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_new_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_new_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_new_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_new_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -54,10 +56,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_remind_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_remind_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_remind_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -79,10 +83,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -104,10 +110,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_recur_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_recur_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_recur_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -129,10 +137,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $invoice_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -154,10 +164,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_payment_customer_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_payment_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_payment_customer_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_customer_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -179,10 +191,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_invoice_payment_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_invoice_payment_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_invoice_payment_admin_body', trans('settings.email.templates.body'), null, $setting['template_invoice_payment_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $payment_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -204,10 +218,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_bill_remind_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_bill_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_bill_remind_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_remind_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -229,10 +245,12 @@
                             <div class="row">
                                 {{ Form::textGroup('template_bill_recur_admin_subject', trans('settings.email.templates.subject'), 'font', ['required' => 'required'], null, 'col-md-12') }}
 
-                                {{ Form::textEditorGroup('template_bill_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12') }}
+                                {{ Form::textEditorGroup('template_bill_recur_admin_body', trans('settings.email.templates.body'), null, $setting['template_bill_recur_admin_body'], ['required' => 'required', 'rows' => '5', 'data-toggle' => 'quill'], 'col-md-12 mb-0') }}
 
                                 <div class="col-md-12">
-                                    <small class="text-gray">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
+                                    <div class="bg-secondary border-radius-default border-1 p-2">
+                                        <small class="text-default">{!! trans('settings.email.templates.tags', ['tag_list' => $bill_tags]) !!}</small>
+                                    </div>
                                 </div>
                             </div>
                         </div>