diff --git a/client_add_modal.php b/client_add_modal.php
index 2e1348b9..18681970 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-user"></i> New Client</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-plus"></i> New Client</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -48,7 +48,7 @@
                 <label>Industry</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
                   </div>
                   <input type="text" class="form-control" name="type" placeholder="Company Type">
                 </div>
@@ -302,8 +302,8 @@
           </div>    
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_client" class="btn btn-primary" onclick="promptPrimaryContact()">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_client" class="btn btn-primary" onclick="promptPrimaryContact()"><strong><i class="fas fa-check"></i> Create</strong></button>
         </div>
       </form>
     </div>
diff --git a/client_edit_modal.php b/client_edit_modal.php
index bffd584f..7f9feefd 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-user"></i> <?php echo $client_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-user-edit"></i> <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -43,7 +43,7 @@
                 <label>Industry</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                    <span class="input-group-text"><i class="fa fa-fw fa-briefcase"></i></span>
                   </div>
                   <input type="text" class="form-control" name="type" placeholder="Industry" value="<?php echo $client_type; ?>">
                 </div>
@@ -165,8 +165,8 @@
           </div>    
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_client" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_client" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/invoice_add_modal.php b/invoice_add_modal.php
index 34013b4b..d1b75797 100644
--- a/invoice_add_modal.php
+++ b/invoice_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Invoice</h5>
+        <h5 class="modal-title"><i class="fa fa-file mr-2"></i>New Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -54,7 +54,7 @@
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -89,8 +89,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_invoice" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create</strong></button>
         </div>
       </form>
     </div>
diff --git a/invoice_copy_modal.php b/invoice_copy_modal.php
index 0388b139..42910e63 100644
--- a/invoice_copy_modal.php
+++ b/invoice_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying <?php echo "$invoice_prefix$invoice_number"; ?></h5>
+        <h5 class="modal-title"><i class="fas fa-copy mr-2"></i>Copying <?php echo "$invoice_prefix$invoice_number"; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -24,8 +24,8 @@
           
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice_copy" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_invoice_copy" class="btn btn-primary"><strong><i class="fas fa-check"></i> Copy</strong></button>
         </div>
       </form>
     </div>
diff --git a/invoice_edit_modal.php b/invoice_edit_modal.php
index 54618dca..e0915795 100644
--- a/invoice_edit_modal.php
+++ b/invoice_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> <?php echo "$invoice_prefix$invoice_number"; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-file mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -36,7 +36,7 @@
             <label>Income Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -71,8 +71,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_invoice" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_invoice" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/invoice_note_modal.php b/invoice_note_modal.php
index 7dc0eaf1..b9bae132 100644
--- a/invoice_note_modal.php
+++ b/invoice_note_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Invoice Notes</h5>
+        <h5 class="modal-title text-white"><i class="fas fa-edit mr-2"></i>Invoice Notes</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -15,8 +15,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="invoice_note" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="invoice_note" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php
index a38df07d..41a590ba 100644
--- a/invoice_payment_add_modal.php
+++ b/invoice_payment_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-credit-card"></i> <?php echo "$invoice_prefix$invoice_number"; ?>: Add Payment</h5>
+        <h5 class="modal-title"><i class="fa fa-credit-card mr-2"></i><?php echo "$invoice_prefix$invoice_number"; ?>: Make Payment</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -132,8 +132,8 @@
         </div>
         
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_payment" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_payment" class="btn btn-primary"><strong><i class="fas fa-check"></i> Pay</strong></button>
         </div>
       </form>
     </div>
diff --git a/invoice_recurring_add_modal.php b/invoice_recurring_add_modal.php
index 3983ece7..785941d8 100644
--- a/invoice_recurring_add_modal.php
+++ b/invoice_recurring_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Make <?php echo "$invoice_prefix$invoice_number"; ?> Recurring</h5>
+        <h5 class="modal-title"><i class="fa fa-copy mr-2"></i>Make <?php echo "$invoice_prefix$invoice_number"; ?> Recurring</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -28,8 +28,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_invoice_recurring" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_invoice_recurring" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create Invoice</strong></button>
         </div>
       </form>
     </div>
diff --git a/item_edit_modal.php b/item_edit_modal.php
index 9d59c967..417c16ac 100644
--- a/item_edit_modal.php
+++ b/item_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-edit"></i> Edit Line Item: <?php echo $item_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-edit mr-2"></i>Edit Line Item: <?php echo $item_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -95,8 +95,8 @@
           
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_item" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_item" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/post.php b/post.php
index fa9407e3..5ba412a8 100644
--- a/post.php
+++ b/post.php
@@ -3095,11 +3095,12 @@ if(isset($_POST['edit_recurring'])){
 
     $recurring_id = intval($_POST['recurring_id']);
     $frequency = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['frequency'])));
+    $next_date = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['next_date'])));
     $category = intval($_POST['category']);
     $scope = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['scope'])));
     $status = intval($_POST['status']);
 
-    mysqli_query($mysqli,"UPDATE recurring SET recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_category_id = $category, recurring_status = $status WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE recurring SET recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_next_date = '$next_date', recurring_category_id = $category, recurring_status = $status WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
 
     mysqli_query($mysqli,"INSERT INTO history SET history_status = '$status', history_description = 'Recurring modified', history_recurring_id = $recurring_id, company_id = $session_company_id");
 
@@ -3112,24 +3113,6 @@ if(isset($_POST['edit_recurring'])){
 
 }
 
-if(isset($_POST['edit_recurring_next_date'])){
-
-    $recurring_id = intval($_POST['recurring_id']);
-    $next_date = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['next_date'])));
-
-    mysqli_query($mysqli,"UPDATE recurring SET recurring_next_date = '$next_date' WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
-
-    mysqli_query($mysqli,"INSERT INTO history SET history_status = '$status', history_description = 'Recurring next date modified', history_recurring_id = $recurring_id, company_id = $session_company_id");
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modify', log_description = '$recurring_id next date modified', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");
-
-    $_SESSION['alert_message'] = "Recurring Invoice next date modified";
-    
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
 if(isset($_GET['delete_recurring'])){
     $recurring_id = intval($_GET['delete_recurring']);
 
diff --git a/product_add_modal.php b/product_add_modal.php
index a6f13a9d..f8a3fb4e 100644
--- a/product_add_modal.php
+++ b/product_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> New Product</h5>
+        <h5 class="modal-title"><i class="fas fa-box mr-2"></i>New Product</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -18,7 +18,7 @@
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -80,8 +80,8 @@
         </div>
         
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_product" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_product" class="btn btn-primary"><storng><i class="fas fa-check"></i> Create</storng></button>
         </div>
       
       </form>
diff --git a/quote_add_modal.php b/quote_add_modal.php
index 98ddd764..2d9e9052 100644
--- a/quote_add_modal.php
+++ b/quote_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Quote</h5>
+        <h5 class="modal-title"><i class="fa fa-file"></i> New Quote</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -55,7 +55,7 @@
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -90,8 +90,8 @@
         
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_quote" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_quote" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create</strong></button>
         </div>
       </form>
     </div>
diff --git a/quote_copy_modal.php b/quote_copy_modal.php
index 020dc1e4..183c352a 100644
--- a/quote_copy_modal.php
+++ b/quote_copy_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying <?php echo "$quote_prefix$quote_number"; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-copy"></i> Copying <?php echo "$quote_prefix$quote_number"; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -23,8 +23,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_quote_copy" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_quote_copy" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create Copy</strong></button>
         </div>
       </form>
     </div>
diff --git a/quote_edit_modal.php b/quote_edit_modal.php
index 7951d7f2..a2fc837c 100644
--- a/quote_edit_modal.php
+++ b/quote_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-file"></i> <?php echo "$quote_prefix$quote_number"; ?></h5>
+        <h5 class="modal-title text-white"><i class="fas fa-file"></i> <?php echo "$quote_prefix$quote_number"; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -26,7 +26,7 @@
             <label>Income Category</label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -61,8 +61,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_quote" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_quote" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/quote_note_modal.php b/quote_note_modal.php
index 8f83fc61..82d8c03b 100644
--- a/quote_note_modal.php
+++ b/quote_note_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Quote Notes</h5>
+        <h5 class="modal-title text-white"><i class="fas fa-edit mr-2"></i>Quote Notes</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -15,8 +15,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="quote_note" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="quote_note" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/quote_to_invoice_modal.php b/quote_to_invoice_modal.php
index 700a9487..f8567ebd 100644
--- a/quote_to_invoice_modal.php
+++ b/quote_to_invoice_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i>Quote <?php echo "$quote_prefix$quote_number"; ?> <i class="fa fa-fw fa-arrow-right"></i> Invoice</h5>
+        <h5 class="modal-title"><i class="fas fa-file"></i>Quote <?php echo "$quote_prefix$quote_number"; ?> <i class="fas fa-arrow-right"></i> Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -26,7 +26,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_quote_to_invoice" class="btn btn-primary">Save</button>
+          <button type="submit" name="add_quote_to_invoice" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create Invoice</strong></button>
         </div>
       </form>
     </div>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 6d6e9e8b..21e52e9e 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -102,7 +102,6 @@ if(isset($_GET['recurring_id'])){
           </button>
           <div class="dropdown-menu">
             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">Edit</a>
-            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editNextDateRecurringModal<?php echo $recurring_id; ?>">Set Next Date</a>
             <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="post.php?force_recurring=<?php echo $recurring_id; ?>">Force Send</a>
             <div class="dropdown-divider"></div>
@@ -354,7 +353,6 @@ if(isset($_GET['recurring_id'])){
 <?php 
   
   include("recurring_invoice_edit_modal.php");
-  include("recurring_invoice_edit_next_date_modal.php");
   include("recurring_invoice_note_modal.php");
   include("category_quick_add_modal.php");
 
diff --git a/recurring_invoice_add_modal.php b/recurring_invoice_add_modal.php
index 4d293b1c..a5953ef2 100644
--- a/recurring_invoice_add_modal.php
+++ b/recurring_invoice_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt"></i> New Recurring Invoice</h5>
+        <h5 class="modal-title"><i class="fa fa-sync-alt"></i> New Recurring Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -69,7 +69,7 @@
             <label>Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -104,8 +104,8 @@
 
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_recurring" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_recurring" class="btn btn-primary"><strong><i class="fas fa-check"></i> Create</strong></button>
         </div>
       </form>
     </div>
diff --git a/recurring_invoice_edit_modal.php b/recurring_invoice_edit_modal.php
index 853bcbbe..24f65f79 100644
--- a/recurring_invoice_edit_modal.php
+++ b/recurring_invoice_edit_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt"></i> <?php echo "$recurring_prefix$recurring_number"; ?></h5>
+        <h5 class="modal-title"><i class="fas fa-sync-alt"></i> <?php echo "$recurring_prefix$recurring_number"; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -27,13 +27,21 @@
             </div>
           </div>
 
-          
+          <div class="form-group">
+            <label>Next Date <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="next_date" max="2999-12-31" value="<?php echo $recurring_next_date; ?>" required>
+            </div>
+          </div>
           
           <div class="form-group">
             <label>Income Category <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
               </div>
               <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
@@ -82,7 +90,7 @@
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_recurring" class="btn btn-primary">Save</button>
+          <button type="submit" name="edit_recurring" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>
diff --git a/recurring_invoice_edit_next_date_modal.php b/recurring_invoice_edit_next_date_modal.php
deleted file mode 100644
index 2c7758cc..00000000
--- a/recurring_invoice_edit_next_date_modal.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="modal" id="editNextDateRecurringModal<?php echo $recurring_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt"></i> <?php echo "$recurring_prefix$recurring_number"; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="recurring_id" value="<?php echo $recurring_id; ?>">
-
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>Next Date <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-              </div>
-              <input type="date" class="form-control" name="next_date" max="2999-12-31" value="<?php echo $recurring_next_date; ?>" required>
-            </div>
-          </div>
-
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_recurring_next_date" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/recurring_invoice_note_modal.php b/recurring_invoice_note_modal.php
index 6c4551e2..b04900dc 100644
--- a/recurring_invoice_note_modal.php
+++ b/recurring_invoice_note_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Quote Notes</h5>
+        <h5 class="modal-title text-white"><i class="fa fa-edit mr-2"></i>Quote Notes</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -15,8 +15,8 @@
           </div>
         </div>
         <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="recurring_note" class="btn btn-primary">Save</button>
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="recurring_note" class="btn btn-primary"><strong><i class="fas fa-check"></i> Save</strong></button>
         </div>
       </form>
     </div>