diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 813fa1d5..0e78fcd5 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.17.3 - Unreleased
+---------------------------
+- Enh #268: Expand the folder/file link area
+
 0.17.2 - November 24, 2025
 ---------------------------
 - Enh #264: Update download and upload actions
diff --git a/module.json b/module.json
index d8056bb6..eae4f997 100644
--- a/module.json
+++ b/module.json
@@ -9,7 +9,7 @@
         "organisation",
         "sharing"
     ],
-    "version": "0.17.2",
+    "version": "0.17.3",
     "humhub": {
         "minVersion": "1.18"
     },
diff --git a/resources/css/cfiles.css b/resources/css/cfiles.css
index 9d90ac2f..804037d8 100644
--- a/resources/css/cfiles.css
+++ b/resources/css/cfiles.css
@@ -67,7 +67,6 @@
 .downloadzipped-button {
   cursor: pointer;
 }
-.table-responsive td .title,
 .table-responsive td .timestamp,
 .table-responsive td .creator,
 .table-responsive td .size {
@@ -107,7 +106,9 @@
   width: 0;
 }
 
-@media (min-width: 418px) {
+@media (hover: hover) {
+  /* Hide the context icon only on devices with hover effect, */
+  /* Ignore touchable devices because iPhone 17 Pro Max has a double tap issue */
   #bs-table.table tr .context-icon {
     display: none;
   }
@@ -157,11 +158,14 @@
   content: "\25b2";
 }
 
-
-.table-responsive td .title {
-  position: absolute;
-  width: 100%;
-  top: -10px;
+#fileList .table-responsive td.title {
+  padding: 0 5px;
+}
+#fileList .table-responsive td.title > a {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  padding: 5px 0;
 }
 @media (min-width: 420px) {
   .table-responsive td:nth-child(2) {
diff --git a/widgets/views/fileSystemItem.php b/widgets/views/fileSystemItem.php
index 4785f8cb..a651614d 100644
--- a/widgets/views/fileSystemItem.php
+++ b/widgets/views/fileSystemItem.php
@@ -8,8 +8,10 @@
 use humhub\modules\content\widgets\ContentObjectLinks;
 use humhub\modules\file\libs\FileHelper;
 use humhub\modules\stream\assets\StreamAsset;
+use humhub\modules\ui\icon\widgets\Icon;
 use humhub\modules\user\widgets\Image;
 use humhub\widgets\bootstrap\Button;
+use humhub\widgets\bootstrap\Link;
 use humhub\widgets\TimeAgo;
 
 /* @var $folder Folder */
@@ -29,22 +31,25 @@
     <?php endif; ?>
 
     <?php if ($row->isRenderColumn(FileSystemItemRow::COLUMN_TITLE)) : ?>
-        <td class="text-start">
-            <div style="position: relative">
-                <div class="title">
-                    <i class="fa <?= $row->getIconClass(); ?>"></i>&nbsp;
-                    <?php if ($row->getType() === "image") : ?>
-                        <?= Button::asLink($row->getTitle(), $row->getUrl())
-                            ->options(['data-ui-gallery' => 'FilesModule-Gallery-' . $row->getParentFolderId()])
-                            ->tooltip($row->getDescription()) ?>
-                    <?php elseif ($row->getBaseFile() !== null) : ?>
-                        <?= FileHelper::createLink($row->getBaseFile(), [], ['class' => 'tt', 'title' => Html::encode($row->getDescription())]) ?>
-                    <?php else: ?>
-                        <?= Button::asLink($row->getTitle(), $row->getLinkUrl())
-                            ->tooltip($row->getDescription()) ?>
-                    <?php endif; ?>
-                </div>
-            </div>
+        <td class="title">
+            <?php if ($row->getType() === 'image') : ?>
+                <?= Link::to($row->getTitle(), $row->getUrl())
+                    ->icon($row->getIconClass())
+                    ->options(['data-ui-gallery' => 'FilesModule-Gallery-' . $row->getParentFolderId()])
+                    ->tooltip($row->getDescription()) ?>
+            <?php elseif ($row->getBaseFile() !== null) : ?>
+                <?= FileHelper::createLink($row->getBaseFile(), [], [
+                    'label' => Icon::get($row->getIconClass()) . ' ' . Html::encode($row->getBaseFile()->fileName),
+                    'class' => 'link',
+                    'data-bs-toggle' => 'tooltip',
+                    'data-bs-title' => Html::encode($row->getDescription()),
+                ]) ?>
+            <?php else: ?>
+                <?= Link::to($row->getTitle(), $row->getLinkUrl())
+                    ->icon($row->getIconClass())
+                    ->tooltip($row->getDescription()) ?>
+            <?php endif; ?>
+
             <?= FileListContextMenu::widget([
                 'folder' => $folder,
                 'row' => $row,