diff --git a/user/ajax/ajax_file_rename.php b/user/ajax/ajax_file_rename.php
index c70fd3eb..573d9a53 100644
--- a/user/ajax/ajax_file_rename.php
+++ b/user/ajax/ajax_file_rename.php
@@ -1,15 +1,39 @@
 <?php
-
 require_once '../../includes/modal_header.php';
 
 $file_id = intval($_GET['id']);
 
 $sql = mysqli_query($mysqli, "SELECT * FROM files WHERE file_id = $file_id LIMIT 1");
-                     
+
 $row = mysqli_fetch_array($sql);
 $client_id = intval($row['file_client_id']);
 $file_name = nullable_htmlentities($row['file_name']);
 $file_description = nullable_htmlentities($row['file_description']);
+$file_ext = nullable_htmlentities($row['file_description']);
+
+if ($file_ext == 'pdf') {
+    $file_icon = "file-pdf";
+} elseif ($file_ext == 'gz' || $file_ext == 'tar' || $file_ext == 'zip' || $file_ext == '7z' || $file_ext == 'rar') {
+    $file_icon = "file-archive";
+} elseif ($file_ext == 'txt' || $file_ext == 'md') {
+    $file_icon = "file-alt";
+} elseif ($file_ext == 'msg') {
+    $file_icon = "envelope";
+} elseif ($file_ext == 'doc' || $file_ext == 'docx' || $file_ext == 'odt') {
+    $file_icon = "file-word";
+} elseif ($file_ext == 'xls' || $file_ext == 'xlsx' || $file_ext == 'ods') {
+    $file_icon = "file-excel";
+} elseif ($file_ext == 'pptx' || $file_ext == 'odp') {
+    $file_icon = "file-powerpoint";
+} elseif ($file_ext == 'mp3' || $file_ext == 'wav' || $file_ext == 'ogg') {
+    $file_icon = "file-audio";
+} elseif ($file_ext == 'mov' || $file_ext == 'mp4' || $file_ext == 'av1') {
+    $file_icon = "file-video";
+} elseif ($file_ext == 'jpg' || $file_ext == 'jpeg' || $file_ext == 'png' || $file_ext == 'gif' || $file_ext == 'webp' || $file_ext == 'bmp' || $file_ext == 'tif') {
+    $file_icon = "file-image";
+} else {
+    $file_icon = "file";
+}
 
 // Generate the HTML form content using output buffering.
 ob_start();
diff --git a/user/client_files.php b/user/client_files.php
index a55a0f76..e1e1a81a 100644
--- a/user/client_files.php
+++ b/user/client_files.php
@@ -304,7 +304,7 @@ while ($folder_id > 0) {
                 <hr>
 
                 <?php
-                
+
                 if($view == 1){
 
                 ?>
@@ -333,11 +333,11 @@ while ($folder_id > 0) {
                         ?>
 
                         <div class="col-xl-2 col-lg-2 col-md-6 col-sm-6 mb-3 text-center">
-                        
+
                             <a href="#" onclick="openModal(<?php echo count($files)-1; ?>)"><!-- passing the index -->
                                 <img class="img-thumbnail" src="<?php echo "../uploads/clients/$client_id/$file_reference_name"; ?>" alt="<?php echo $file_reference_name ?>">
                             </a>
-                            
+
                             <div>
 
                                 <div class="dropdown float-right">
@@ -475,7 +475,7 @@ while ($folder_id > 0) {
                                 $file_uploaded_by = nullable_htmlentities($row['user_name']);
                                 $file_created_at = nullable_htmlentities($row['file_created_at']);
                                 $file_folder_id = intval($row['file_folder_id']);
-                                
+
                                 // Check if shared
                                 $sql_shared = mysqli_query(
                                     $mysqli,
@@ -531,7 +531,7 @@ while ($folder_id > 0) {
                                     <td><?php echo $file_size_KB; ?> KB</td>
                                     <td>
                                         <?php echo $file_created_at; ?>
-                                        <div class="text-secondary mt-1"><?php echo $file_uploaded_by; ?></div>        
+                                        <div class="text-secondary mt-1"><?php echo $file_uploaded_by; ?></div>
                                     </td>
                                     <td>
                                         <?php if ($file_shared) { ?>