diff --git a/post.php b/post.php
index 9d600ecb..d7bdea27 100644
--- a/post.php
+++ b/post.php
@@ -298,35 +298,21 @@ if(isset($_POST['edit_mail_settings'])){
 
 }
 
-if(isset($_POST['edit_invoice_settings'])){
+if(isset($_POST['edit_invoice_quote_settings'])){
 
     $config_invoice_prefix = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_prefix']));
     $config_invoice_next_number = intval($_POST['config_invoice_next_number']);
     $config_invoice_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_footer']));
-
-    mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_invoice_next_number = $config_invoice_next_number, config_invoice_footer = '$config_invoice_footer' WHERE company_id = $session_company_id");
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Invoice', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
-
-    $_SESSION['alert_message'] = "Invoice Settings updated";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if(isset($_POST['edit_quote_settings'])){
-
     $config_quote_prefix = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_quote_prefix']));
     $config_quote_next_number = intval($_POST['config_quote_next_number']);
     $config_quote_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_quote_footer']));
 
-    mysqli_query($mysqli,"UPDATE settings SET config_quote_prefix = '$config_quote_prefix', config_quote_next_number = $config_quote_next_number, config_quote_footer = '$config_quote_footer' WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_invoice_next_number = $config_invoice_next_number, config_invoice_footer = '$config_invoice_footer', config_quote_prefix = '$config_quote_prefix', config_quote_next_number = $config_quote_next_number, config_quote_footer = '$config_quote_footer' WHERE company_id = $session_company_id");
 
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Quote', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Invoice', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
 
-    $_SESSION['alert_message'] = "Quote Settings updated";
+    $_SESSION['alert_message'] = "Invoice / Quote Settings updated";
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
diff --git a/settings-invoice.php b/settings-invoice-quotes.php
similarity index 52%
rename from settings-invoice.php
rename to settings-invoice-quotes.php
index 91711abe..0bb3537e 100644
--- a/settings-invoice.php
+++ b/settings-invoice-quotes.php
@@ -4,11 +4,13 @@
 
 <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 Settings</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-file mr-2"></i>Invoice/Quotes Settings</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" autocomplete="off">
       
+      <legend>Invoices</legend>
+
       <div class="form-group">
         <label>Invoice Prefix</label>
         <div class="input-group">
@@ -33,9 +35,36 @@
         <label>Invoice Footer</label>
         <textarea class="form-control" rows="4" name="config_invoice_footer"><?php echo $config_invoice_footer; ?></textarea>
       </div>
+
+      <legend>Quotes</legend>
+
+      <div class="form-group">
+        <label>Quote Prefix</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+          </div>
+          <input type="text" class="form-control" name="config_quote_prefix" placeholder="Quote Prefix" value="<?php echo $config_quote_prefix; ?>" required>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Next Number</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+          </div>
+          <input type="number" min="0" class="form-control" name="config_quote_next_number" placeholder="Next Quote Number" value="<?php echo $config_quote_next_number; ?>" required>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Quote Footer</label>
+        <textarea class="form-control" rows="4" name="config_quote_footer"><?php echo $config_quote_footer; ?></textarea>
+      </div>
     
       <hr>
-      <button type="submit" name="edit_invoice_settings" class="btn btn-primary">Save</button>        
+      <button type="submit" name="edit_invoice_quote_settings" class="btn btn-primary">Save</button>        
     
     </form>
   </div>
diff --git a/settings-nav.php b/settings-nav.php
index 67cae493..4bb9ec6d 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -33,18 +33,10 @@
   </li>
 
   <li class="nav-item">
-    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-invoice.php") { echo "active"; } ?>" 
-      href="settings-invoice.php">
+    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-invoice-quotes.php") { echo "active"; } ?>" 
+      href="settings-invoice-quotes.php">
       <i class="fa fa-fw fa-2x fa-file"></i><br>
-      Invoice
-    </a> 
-  </li>
-
-  <li class="nav-item">
-    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-quote.php") { echo "active"; } ?>" 
-      href="settings-quote.php">
-      <i class="fa fa-fw fa-2x fa-file"></i><br>
-      Quote
+      Invoices / Quotes
     </a> 
   </li>
 
diff --git a/settings-quote.php b/settings-quote.php
deleted file mode 100644
index a868385f..00000000
--- a/settings-quote.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php include("header.php"); ?>
-
-<?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>Quote Settings</h6>
-  </div>
-  <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
-      
-      <div class="form-group">
-        <label>Quote Prefix</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_quote_prefix" placeholder="Quote Prefix" value="<?php echo $config_quote_prefix; ?>" required>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Next Number</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-          </div>
-          <input type="number" min="0" class="form-control" name="config_quote_next_number" placeholder="Next Quote Number" value="<?php echo $config_quote_next_number; ?>" required>
-        </div>
-      </div>
-
-      <div class="form-group mb-5">
-        <label>Quote Footer</label>
-        <textarea class="form-control" rows="4" name="config_quote_footer"><?php echo $config_quote_footer; ?></textarea>
-      </div>
-      
-      <hr>
-      <button type="submit" name="edit_quote_settings" class="btn btn-primary">Save</button>        
-    
-    </form>
-  </div>
-</div>
-
-<?php include("footer.php");
\ No newline at end of file