diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt
index 759dafd19..8cd721a80 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/NewTransferFab.kt
@@ -20,31 +20,24 @@ package com.infomaniak.swisstransfer.ui.components
 import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.FloatingActionButtonElevation
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.infomaniak.swisstransfer.ui.screen.newtransfer.importfiles.UploadSourceChoiceBottomSheet
+import com.infomaniak.swisstransfer.ui.NewTransferActivity
+import com.infomaniak.swisstransfer.ui.utils.launchActivity
 
 @Composable
 fun NewTransferFab(
     modifier: Modifier = Modifier,
     newTransferFabType: NewTransferFabType
 ) {
-    var showUploadSourceChoiceBottomSheet by rememberSaveable { mutableStateOf(false) }
-
+    val context = LocalContext.current
     SwissTransferFab(
         modifier = modifier,
         fabType = newTransferFabType.fabType,
         elevation = newTransferFabType.elevation(),
-        onClick = { showUploadSourceChoiceBottomSheet = true },
-    )
-    UploadSourceChoiceBottomSheet(
-        isBottomSheetVisible = { showUploadSourceChoiceBottomSheet },
-        onDismissRequest = { showUploadSourceChoiceBottomSheet = false },
+        onClick = { context.launchActivity(NewTransferActivity::class) },
     )
 }
 
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt
index 8aa187a0b..992f7ae97 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/UploadSourceChoiceBottomSheet.kt
@@ -23,12 +23,10 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import com.infomaniak.swisstransfer.R
-import com.infomaniak.swisstransfer.ui.NewTransferActivity
 import com.infomaniak.swisstransfer.ui.components.BottomSheetItem
 import com.infomaniak.swisstransfer.ui.components.SwissTransferBottomSheet
-import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
+import com.infomaniak.swisstransfer.ui.images.AppImages
 import com.infomaniak.swisstransfer.ui.images.icons.Camera
 import com.infomaniak.swisstransfer.ui.images.icons.Folder
 import com.infomaniak.swisstransfer.ui.images.icons.PolaroidLandscape
@@ -36,40 +34,26 @@ import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
 import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
 import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
-import com.infomaniak.swisstransfer.ui.utils.launchActivity
 
 @Composable
 fun UploadSourceChoiceBottomSheet(
     isBottomSheetVisible: () -> Boolean,
     onDismissRequest: () -> Unit,
 ) {
-    val context = LocalContext.current
-
     if (isBottomSheetVisible()) {
         SwissTransferBottomSheet(
             onDismissRequest = onDismissRequest,
             titleRes = R.string.transferUploadSourceChoiceTitle,
             content = {
                 Column {
-                    BottomSheetItem(AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) {
-
-                        // TODO: Remove this, it's only here to be able to navigate to the
-                        //  NewTransferActivity, since we don't have the FilePicker for now.
-                        context.launchActivity(NewTransferActivity::class)
-
-                        /* TODO */
-                        onDismissRequest()
-                    }
+                    BottomSheetItem(AppImages.AppIcons.Camera, R.string.transferUploadSourceChoiceCamera) { /* TODO */ }
                     HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
-                    BottomSheetItem(AppIcons.PolaroidLandscape, R.string.transferUploadSourceChoiceGallery) {
-                        /* TODO */
-                        onDismissRequest()
-                    }
+                    BottomSheetItem(
+                        AppImages.AppIcons.PolaroidLandscape,
+                        R.string.transferUploadSourceChoiceGallery
+                    ) { /* TODO */ }
                     HorizontalDivider(Modifier.padding(horizontal = Margin.Medium))
-                    BottomSheetItem(AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) {
-                        /* TODO */
-                        onDismissRequest()
-                    }
+                    BottomSheetItem(AppImages.AppIcons.Folder, R.string.transferUploadSourceChoiceFiles) { /* TODO */ }
                 }
             },
         )