diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index dd9e56a8..5e55478c 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -14,6 +14,7 @@ Changelog
 - Enh #239: Removing Topics from Edit File modal
 - Fix #244: Fix invalid translation category
 - Enh #246: Mobile View Decluttering
+- Enh #247: Mobile View Fixes
 
 0.16.6 - March 14, 2024
 -------------------------
diff --git a/resources/css/cfiles.css b/resources/css/cfiles.css
index 841ccfc5..3e920ed2 100644
--- a/resources/css/cfiles.css
+++ b/resources/css/cfiles.css
@@ -162,7 +162,7 @@
   width: 0;
 }
 
-@media (min-width: 418px) {
+@media (min-width: 767px) {
   #bs-table.table tr .context-icon {
     display: none;
   }
diff --git a/widgets/views/fileListMenu.php b/widgets/views/fileListMenu.php
index 6f73e9d9..3972fe71 100644
--- a/widgets/views/fileListMenu.php
+++ b/widgets/views/fileListMenu.php
@@ -6,6 +6,7 @@
 use humhub\modules\file\widgets\UploadInput;
 use humhub\widgets\Button;
 use humhub\widgets\ModalButton;
+use yii\helpers\ArrayHelper;
 
 /* @var $folder \humhub\modules\cfiles\models\Folder */
 /* @var $contentContainer \humhub\modules\content\components\ContentContainerActiveRecord */
@@ -55,18 +56,26 @@
 
             <!-- Upload Dropdown -->
             <?php if ($canUpload): ?>
-                <?php  $uploadButton = UploadButton::widget([
-                            'id' => 'cfilesUploadFiles',
-                            'progress' => '#cfiles_progress',
-                            'url' => $uploadUrl,
-                            'preview' => '#cfiles-folderView',
-                            'tooltip' => false,
-                            'cssButtonClass' => 'btn-success',
-                            'label' => '<span class="hidden-xs">' . Yii::t('CfilesModule.base', 'Add file(s)') . '</span>',
-                            'dropZone' => '#cfiles-container',
-                            'pasteZone' => 'body',
-                 ])  ?>
-                <?= FileHandlerButtonDropdown::widget(['primaryButton' => $uploadButton, 'handlers' => $fileHandlers, 'cssButtonClass' => 'btn-success', 'pullRight' => true]); ?>
+                <?php
+
+                $buttonOptions = [
+                    'id' => 'cfilesUploadFiles',
+                    'progress' => '#cfiles_progress',
+                    'url' => $uploadUrl,
+                    'preview' => '#cfiles-folderView',
+                    'tooltip' => false,
+                    'cssButtonClass' => 'btn-success hidden-xs',
+                    'label' => Yii::t('CfilesModule.base', 'Add file(s)'),
+                    'dropZone' => '#cfiles-container',
+                    'pasteZone' => 'body',
+                ];
+
+                $uploadButton = UploadButton::widget($buttonOptions) .
+                    UploadButton::widget(ArrayHelper::merge($buttonOptions, ['cssButtonClass' => 'btn-success visible-xs','label' => false]));
+
+
+                ?>
+                <?= FileHandlerButtonDropdown::widget(['primaryButton' => $uploadButton , 'handlers' => $fileHandlers, 'cssButtonClass' => 'btn-success', 'pullRight' => true]); ?>
 
                 <?= UploadInput::widget([
                     'id' => 'cfilesUploadZipFile',
diff --git a/widgets/views/fileSystemItem.php b/widgets/views/fileSystemItem.php
index 2aed3f89..777b95da 100644
--- a/widgets/views/fileSystemItem.php
+++ b/widgets/views/fileSystemItem.php
@@ -107,7 +107,6 @@
         </td>
     <?php endif; ?>
 
-    <?php if ($row->isRenderColumn(FileSystemItemRow::COLUMN_ACTIONS)): ?>
         <td class="file-actions">
             <?= Button::defaultType()
                 ->icon('list')
@@ -116,6 +115,5 @@
                 ->xs()
                 ->loader(false); ?>
         </td>
-    <?php endif; ?>
 
 <?= Html::endTag('tr') ?>