diff --git a/add_recurring_modal.php b/add_recurring_modal.php
index 7f3c6bd2..1b11936d 100644
--- a/add_recurring_modal.php
+++ b/add_recurring_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>New Recurring Invoice</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt mr-2"></i>New Recurring Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -99,7 +99,7 @@
               <input type="text" class="form-control" name="scope" placeholder="Quick description">
             </div>
           </div>
-          
+
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/client_recurring.php b/client_recurring.php
index 83c6c720..e07500bc 100644
--- a/client_recurring.php
+++ b/client_recurring.php
@@ -54,7 +54,7 @@ $total_pages = ceil($total_found_rows / 10);
 
 <div class="card">
   <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-copy"></i> Recurring Invoices</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-sync-alt"></i> Recurring Invoices</h6>
     <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringModal"><i class="fa fa-plus"></i></button>
   </div>
   <div class="card-body">
diff --git a/client_side_nav.php b/client_side_nav.php
index 31005a26..9847aae9 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -192,7 +192,7 @@
 
         <li class="nav-item">
           <a href="?client_id=<?php echo $client_id; ?>&tab=recurring" class="nav-link <?php if($_GET['tab'] == "recurring") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-copy"></i>
+            <i class="nav-icon fas fa-sync-alt"></i>
             <p>
               Recurring
               <?php 
diff --git a/edit_recurring_modal.php b/edit_recurring_modal.php
new file mode 100644
index 00000000..bbebdffe
--- /dev/null
+++ b/edit_recurring_modal.php
@@ -0,0 +1,85 @@
+<div class="modal" id="editRecurringModal<?php echo $recurring_id; ?>" tabindex="-1">
+  <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-sync-alt mr-2"></i><?php echo $recurring_id; ?></h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+          <span aria-hidden="true">&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>Frequency <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-clock"></i></span>
+              </div>
+              <select class="form-control select2" name="frequency" required>
+                <option value="">- Frequency -</option>
+                <option <?php if($recurring_frequency == 'week'){ echo "selected"; } ?> value="week">Weekly</option>
+                <option <?php if($recurring_frequency == 'month'){ echo "selected"; } ?> value="month">Monthly</option>
+                <option <?php if($recurring_frequency == 'year'){ echo "selected"; } ?> value="year">Yearly</option>
+              </select>
+            </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>
+              </div>
+              <select class="form-control select2" name="category" required>
+                <option value="">- Category -</option>
+                <?php 
+                
+                $sql_income_category = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id ORDER BY category_name ASC"); 
+                while($row = mysqli_fetch_array($sql_income_category)){
+                  $category_id_select= $row['category_id'];
+                  $category_name_select = $row['category_name'];
+                ?>
+                <option <?php if($category_id == $category_id_select){ ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>        
+
+          <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+              </div>
+              <input type="text" class="form-control" name="scope" placeholder="Quick description" value="<?php echo $recurring_scope; ?>">
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label>Status <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-clock"></i></span>
+              </div>
+              <select class="form-control select2" name="status" required>
+                <option <?php if($recurring_status == 1){ echo "selected"; } ?> value="1">Active</option>
+                <option <?php if($recurring_status == 0){ echo "selected"; } ?> value="0">InActive</option>
+              </select>
+            </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" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/post.php b/post.php
index 2cea5de1..3096b55d 100644
--- a/post.php
+++ b/post.php
@@ -2115,6 +2115,27 @@ if(isset($_POST['add_recurring'])){
 
 }
 
+if(isset($_POST['edit_recurring'])){
+
+    $recurring_id = intval($_POST['recurring_id']);
+    $frequency = strip_tags(mysqli_real_escape_string($mysqli,$_POST['frequency']));
+    $category = intval($_POST['category']);
+    $scope = 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', category_id = $category, recurring_status = $status, recurring_updated_at = NOW() WHERE recurring_id = $recurring_id AND company_id = $session_company_id");
+
+    mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_description = 'Recurring modified', history_created_at = NOW(), recurring_id = $recurring_id, company_id = $session_company_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Recurring', log_action = 'Modified', log_description = '$recurring_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Recurring Invoice modified";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_GET['delete_recurring'])){
     $recurring_id = intval($_GET['delete_recurring']);
 
diff --git a/recurring.php b/recurring.php
index 1151c0c7..ae52347d 100644
--- a/recurring.php
+++ b/recurring.php
@@ -55,7 +55,7 @@
 
 <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-copy mr-2"></i>Recurring Invoices</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-sync-alt mr-2"></i>Recurring Invoices</h6>
     <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus"></i></button>
   </div>
   <div class="card-body">
@@ -132,7 +132,7 @@
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
                 <div class="dropdown-menu">
-                  <a class="dropdown-item" href="recurring_invoice.php?recurring_id=<?php echo $recurring_id; ?>">Edit</a>
+                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?force_recurring=<?php echo $recurring_id; ?>">Force</a>
                   <?php if($recurring_status == 1){ ?>
@@ -148,6 +148,8 @@
           </tr>
           
           <?php
+          include("edit_recurring_modal.php");
+
           }
           ?>
 
diff --git a/side_nav.php b/side_nav.php
index c802c74f..ad6abab1 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -62,7 +62,7 @@
         </li>
         <li class="nav-item">
           <a href="recurring.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "recurring.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-tags"></i>
+            <i class="nav-icon fas fa-sync-alt"></i>
             <p>Recurring</p>
           </a>
         </li>