diff --git a/settings-alerts.php b/settings-alerts.php
index 3390da26..5ffc662e 100644
--- a/settings-alerts.php
+++ b/settings-alerts.php
@@ -2,12 +2,12 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-bell mr-2"></i>Alerts</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-bell"></i> Alerts</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
 
       <div class="custom-control custom-switch mb-2">
         <input type="checkbox" class="custom-control-input" name="config_enable_cron" <?php if($config_enable_cron == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
@@ -49,7 +49,7 @@
         <label>Overdue Reminders</label>
         <div class="input-group">
           <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+            <span class="input-group-text"><i class="fa fa-fw fa-bell"></i></span>
           </div>
           <input type="text" class="form-control" name="config_invoice_overdue_reminders" placeholder="Send After Due Days" value="<?php echo $config_invoice_overdue_reminders; ?>">
         </div>
@@ -57,7 +57,8 @@
 
       <?php } ?>
 
-      <hr class="mt-5">
+      <hr>
+
       <button type="submit" name="edit_alert_settings" class="btn btn-primary">Save</button>
         
     </form>
diff --git a/settings-backup.php b/settings-backup.php
index 2ff487b6..be66aa29 100644
--- a/settings-backup.php
+++ b/settings-backup.php
@@ -2,13 +2,13 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-database mr-2"></i>Backup</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-database"></i> Backup</h3>
   </div>
-  <div class="card-body p-5">
+  <div class="card-body">
     <center>
-      <a class="btn btn-primary btn-lg" href="post.php?download_database"><i class="fa fa-download"></i> Download Database</a>
+      <a class="btn btn-primary btn-lg p-3" href="post.php?download_database"><i class="fa fa-fw fa-4x fa-download"></i><br><br>Download Database</a>
     </center>
   </div>
 </div>
diff --git a/settings-company.php b/settings-company.php
index 6ecbf31a..ec8981c6 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -2,12 +2,12 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-building mr-2"></i>Company Settings</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-building"></i> Company Settings</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
       <div class="form-group">
         <label>Company Name</label>
         <div class="input-group">
diff --git a/settings-defaults.php b/settings-defaults.php
index 27128591..d2f59a18 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -2,12 +2,13 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-cog mr-2"></i>Defaults Settings</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-cog"></i> Defaults Settings</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
+      
       <div class="form-group">
         <label>Transfer From Account</label>
         <div class="input-group">
@@ -195,7 +196,7 @@
         </div>
       </div>
 
-      <div class="form-group mb-5">
+      <div class="form-group">
         <label>Records per Page</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -210,6 +211,7 @@
       </div>
 
       <hr>
+      
       <button type="submit" name="edit_default_settings" class="btn btn-primary">Save</button>
         
     </form>
diff --git a/settings-general.php b/settings-general.php
index 47aa954b..24d8ba85 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -2,12 +2,12 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-cog mr-2"></i>General Settings</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-cog"></i> General Settings</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
 
       <div class="form-group">
         <label>API Key</label>
diff --git a/settings-invoice-quotes.php b/settings-invoice-quotes.php
index 0bb3537e..bb7df3ed 100644
--- a/settings-invoice-quotes.php
+++ b/settings-invoice-quotes.php
@@ -2,14 +2,14 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-file mr-2"></i>Invoice/Quotes Settings</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-file"></i> Invoice/Quote Settings</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
       
-      <legend>Invoices</legend>
+      <legend>Invoice</legend>
 
       <div class="form-group">
         <label>Invoice Prefix</label>
@@ -36,7 +36,7 @@
         <textarea class="form-control" rows="4" name="config_invoice_footer"><?php echo $config_invoice_footer; ?></textarea>
       </div>
 
-      <legend>Quotes</legend>
+      <legend>Quote</legend>
 
       <div class="form-group">
         <label>Quote Prefix</label>
@@ -64,6 +64,7 @@
       </div>
     
       <hr>
+
       <button type="submit" name="edit_invoice_quote_settings" class="btn btn-primary">Save</button>        
     
     </form>
diff --git a/settings-mail.php b/settings-mail.php
index 3455b730..a2abd75a 100644
--- a/settings-mail.php
+++ b/settings-mail.php
@@ -2,12 +2,13 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-envelope mr-2"></i>Mail Settings</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-envelope"></i> Mail Settings</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
+      
       <div class="form-group">
         <label>SMTP Host</label>
         <div class="input-group">
@@ -58,7 +59,7 @@
         </div>
       </div>
 
-      <div class="form-group mb-5">
+      <div class="form-group">
         <label>Name</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -69,6 +70,7 @@
       </div>
 
       <hr>
+      
       <button type="submit" name="edit_mail_settings" class="btn btn-primary">Save</button>
         
     </form>
diff --git a/settings-online-payment.php b/settings-online-payment.php
index 029d3489..d105a16f 100644
--- a/settings-online-payment.php
+++ b/settings-online-payment.php
@@ -2,12 +2,12 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-credit-card mr-2"></i>Online Payment</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Online Payment</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
 
       <div class="custom-control custom-switch mb-2">
         <input type="checkbox" class="custom-control-input" name="config_stripe_enable" <?php if($config_stripe_enable == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
diff --git a/settings-ticket.php b/settings-ticket.php
index 40294922..4783a1b9 100644
--- a/settings-ticket.php
+++ b/settings-ticket.php
@@ -2,12 +2,12 @@
 
 <?php include("settings-nav.php"); ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-tag mr-2"></i>Ticket Settings</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-tag"></i> Ticket Settings</h3>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form action="post.php" method="post" autocomplete="off">
       
       <div class="form-group">
         <label>Ticket Prefix</label>
@@ -30,6 +30,7 @@
       </div>
     
       <hr>
+      
       <button type="submit" name="edit_ticket_settings" class="btn btn-primary">Save</button>        
     
     </form>