diff --git a/client_document_add_from_template_modal.php b/client_document_add_from_template_modal.php
new file mode 100644
index 00000000..983af75b
--- /dev/null
+++ b/client_document_add_from_template_modal.php
@@ -0,0 +1,83 @@
+<div class="modal" id="addDocumentFromTemplateModal" 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-file-alt"></i> New Document from Template</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="client_id" value="<?php echo $client_id; ?>">
+        <div class="modal-body bg-white">
+
+          <label>Template</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-puzzle-piece"></i></span>
+              </div>
+              <select class="form-control" name="document_template_id" required>
+                <option value="">- Select Template -</option>
+                <?php
+                $sql_document_templates = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_template = 1 AND company_id = $session_company_id AND document_archived_at IS NULL ORDER BY document_name ASC");
+                while($row = mysqli_fetch_array($sql_document_templates)){
+                  $document_template_id = $row['document_id'];
+                  $document_template_name = htmlentities($row['document_name']);
+
+                ?>
+                <option value="<?php echo $document_template_id ?>"><?php echo $document_template_name; ?></option>
+                <?php
+                } 
+                ?>
+                
+              </select>
+            </div>
+          </div>
+          
+          <label>Document name</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
+              </div>
+              <input type="text" class="form-control" name="name" placeholder="Name" required>
+            </div>
+          </div>
+
+          <label>Folder</label>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+              </div>
+              <select class="form-control" name="folder">
+                <option value="0">/</option>
+                <?php
+                $sql_folders = mysqli_query($mysqli,"SELECT * FROM folders WHERE folder_client_id = $client_id ORDER BY folder_name ASC");
+                while($row = mysqli_fetch_array($sql_folders)){
+                  $folder_id = $row['folder_id'];
+                  $folder_name = htmlentities($row['folder_name']);
+
+                ?>
+                <option <?php if($_GET['folder_id'] == $folder_id) echo "selected"; ?> value="<?php echo $folder_id ?>"><?php echo $folder_name; ?></option>
+                <?php
+                } 
+                ?>
+                
+              </select>
+            </div>
+          </div>
+        
+        </div>
+        
+        <div class="modal-footer bg-white">
+
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="add_document_from_template" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create & edit</button>
+
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client_document_add_modal.php b/client_document_add_modal.php
index 02e540ca..bbb04e00 100644
--- a/client_document_add_modal.php
+++ b/client_document_add_modal.php
@@ -30,7 +30,6 @@
               <select class="form-control" name="template">
                 <option value="0">Document</option>
                 <option value="1">Template</option>
-                <option value="3">Global Template</option>
               </select>
             </div>
           </div>
diff --git a/client_documents.php b/client_documents.php
index dbb952bb..398021b1 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -49,13 +49,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   <div class="card-header py-2">
     <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-alt"></i> Documents</h3>
     <div class="card-tools">
-      
-      <div class="dropdown">
-        <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"><i class="fas fa-fw fa-plus"></i> New</button>
+
+      <div class="btn-group">
+        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal">
+          <i class="fas fa-fw fa-plus"></i> New Document
+        </button>
+        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
         <div class="dropdown-menu">
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addFolderModal">Folder</a>
+          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addFolderModal"><i class="fa fa-fw fa-folder-plus"></i> Folder</a>
           <div class="dropdown-divider"></div>
-          <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">Document</a>
           <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentFromTemplateModal">From Template</a>
         </div>
       </div>
@@ -213,5 +215,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <?php include("share_modal.php"); ?>
 <?php include("client_document_add_modal.php"); ?>
+<?php include("client_document_add_from_template_modal.php"); ?>
 
 <?php include("footer.php"); ?>
\ No newline at end of file
diff --git a/post.php b/post.php
index aa52622f..89e43245 100644
--- a/post.php
+++ b/post.php
@@ -6778,6 +6778,46 @@ if(isset($_POST['add_document'])){
 
 }
 
+if(isset($_POST['add_document_from_template'])){
+
+    // ROLE Check
+    validateTechRole();
+
+    // HTML Purifier
+    require("plugins/htmlpurifier/HTMLPurifier.standalone.php");
+    $purifier_config = HTMLPurifier_Config::createDefault();
+    $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]);
+    $purifier = new HTMLPurifier($purifier_config);
+
+    // GET POST Data
+    $client_id = intval($_POST['client_id']);
+    $document_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
+    $document_template_id = intval($_POST['document_template_id']);
+    $folder = intval($_POST['folder']);
+    
+    //GET Document Info
+    $sql_document = mysqli_query($mysqli,"SELECT * FROM documents WHERE document_id = $document_template_id AND company_id = $session_company_id");
+
+    $row = mysqli_fetch_array($sql_document);
+
+    $document_template_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$row['document_name'])));
+    $content = trim(mysqli_real_escape_string($mysqli,$purifier->purify(html_entity_decode($row['document_content']))));
+    $content_raw = trim(mysqli_real_escape_string($mysqli, strip_tags($_POST['name'] . " " . str_replace("<", " <", $row['document_content']))));
+
+    // Document add query
+    $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$document_name', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_client_id = $client_id, company_id = $session_company_id");
+    
+    $document_id = $mysqli->insert_id;
+
+    // Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Create', log_description = 'Document $document_name created from template $document_template_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = '$client_id', company_id = $session_company_id, log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Document created from template";
+    
+     header("Location: client_document_details.php?client_id=$client_id&folder_id=$folder_id&document_id=$document_id");
+
+}
+
 if(isset($_POST['edit_document'])){
 
     validateTechRole();