diff --git a/client_file_link_asset_modal.php b/client_file_link_asset_modal.php
new file mode 100644
index 00000000..a002f16f
--- /dev/null
+++ b/client_file_link_asset_modal.php
@@ -0,0 +1,84 @@
+<div class="modal" id="linkAssetToFileModal<?php echo $file_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-desktop mr-2"></i>Link Asset to <strong><?php echo $file_name; ?></strong></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; ?>">
+                <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                            </div>
+                            <select class="form-control select2" name="asset_id">
+                                <option value="">- Select an Asset -</option>
+                                <?php
+                                // Check if there are any associated vendors
+                                if (!empty($linked_assets)) {
+                                    $excluded_asset_ids = implode(",", $linked_assets);
+                                    $exclude_condition = "AND asset_id NOT IN ($excluded_asset_ids)";
+                                } else {
+                                    $exclude_condition = "";  // No condition if there are no displayed vendors
+                                }
+
+                                $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets
+                                    WHERE asset_client_id = $client_id 
+                                    AND asset_archived_at IS NULL
+                                    $exclude_condition
+                                    ORDER BY asset_name ASC"
+                                );
+                                while ($row = mysqli_fetch_array($sql_assets_select)) {
+                                    $asset_id = intval($row['asset_id']);
+                                    $asset_name = nullable_htmlentities($row['asset_name']);
+
+                                    ?>
+                                    <option value="<?php echo $asset_id ?>"><?php echo $asset_name; ?></option>
+                                    <?php
+                                }
+                                ?>
+
+                            </select>
+                        </div>
+                    </div>
+                        <?php
+                            $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets, asset_files
+                                WHERE assets.asset_id = asset_files.asset_id
+                                AND asset_files.file_id = $file_id
+                                ORDER BY asset_name ASC"
+                            );
+
+                            $linked_assets = array();
+
+                            while ($row = mysqli_fetch_array($sql_assets)) {
+                                $asset_id = intval($row['asset_id']);
+                                $asset_name = nullable_htmlentities($row['asset_name']);
+
+                                $linked_assets[] = $asset_id;
+
+                        ?>
+                                <div class="ml-2">
+                                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" target="_blank"><?php echo $asset_name; ?></a>
+                                    <a class="confirm-link float-right" href="post.php?unlink_asset_from_file&asset_id=<?php echo $asset_id; ?>&file_id=<?php echo $file_id; ?>">
+                                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                                    </a>
+                                </div>
+                        <?php
+                            }
+                        ?>
+                        
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="link_asset_to_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/client_file_rename_modal.php b/client_file_rename_modal.php
index b34d004a..57c24568 100644
--- a/client_file_rename_modal.php
+++ b/client_file_rename_modal.php
@@ -20,6 +20,13 @@
                             </div>
                             <input type="text" class="form-control" name="file_name" placeholder="File Name" value="<?php echo $file_name; ?>" required>
                         </div>
+                        <label>Description <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-folder"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="file_description" placeholder="Description" value="<?php echo $file_description; ?>">
+                        </div>
                     </div>
 
                 </div>
diff --git a/client_files.php b/client_files.php
index f21eca9f..a1f7557a 100644
--- a/client_files.php
+++ b/client_files.php
@@ -331,6 +331,9 @@ $num_of_files = mysqli_num_rows($sql);
                                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#moveFileModal<?php echo $file_id; ?>">
                                                     <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
                                                 </a>
+                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkAssetToFileModal<?php echo $file_id; ?>">
+                                                    <i class="fas fa-fw fa-desktop mr-2"></i>Asset
+                                                </a>
                                                 <div class="dropdown-divider"></div>
                                                 <a class="dropdown-item text-danger confirm-link" href="post.php?archive_file=<?php echo $file_id; ?>">
                                                     <i class="fas fa-fw fa-archive mr-2"></i>Archive
@@ -348,6 +351,8 @@ $num_of_files = mysqli_num_rows($sql);
 
                                 require "client_file_move_modal.php";
 
+                                require "client_file_link_asset_modal.php";
+
                             }
                             ?>
                             </tbody>
diff --git a/post/file.php b/post/file.php
index dd6b28e8..e7733f21 100644
--- a/post/file.php
+++ b/post/file.php
@@ -60,12 +60,13 @@ if (isset($_POST['rename_file'])) {
     $file_id = intval($_POST['file_id']);
     $client_id = intval($_POST['client_id']);
     $file_name = sanitizeInput($_POST['file_name']);
+    $file_description = sanitizeInput($_POST['file_description']);
 
     // Folder edit query
-    mysqli_query($mysqli,"UPDATE files SET file_name = '$file_name' WHERE file_id = $file_id");
+    mysqli_query($mysqli,"UPDATE files SET file_name = '$file_name' ,file_description = '$file_description' WHERE file_id = $file_id");
 
     //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'File', log_action = 'Rename', log_description = '$session_name renamed file to $file_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $file_id");
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'File', log_action = 'Rename', log_description = '$session_name renamed file to $file_name $file_description', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $file_id");
 
     $_SESSION['alert_message'] = "File <strong>$file_name</strong> renamed";
 
@@ -182,3 +183,40 @@ if (isset($_POST['bulk_move_files'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
 }
+
+if (isset($_POST['link_asset_to_file'])) {
+
+    validateTechRole();
+
+    $client_id = intval($_POST['client_id']);
+    $file_id = intval($_POST['file_id']);
+    $asset_id = intval($_POST['asset_id']);
+
+    // Contact add query
+    mysqli_query($mysqli,"INSERT INTO asset_files SET asset_id = $asset_id, file_id = $file_id");
+
+    // Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'File', log_action = 'Link', log_description = 'Created File Asset link', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Asset linked with File";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if (isset($_GET['unlink_asset_from_file'])) {
+
+    validateTechRole();
+    $asset_id = intval($_GET['asset_id']);
+    $file_id = intval($_GET['file_id']);
+
+    mysqli_query($mysqli,"DELETE FROM asset_files WHERE asset_id = $asset_id AND file_id = $file_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'File', log_action = 'unLink', log_description = 'File Asset link removed', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Asset has been unlinked";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
\ No newline at end of file