diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/atoms/SaveFolderSelection.kt b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/atoms/SaveFolderSelection.kt
index 02b79e7..0c20b04 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/atoms/SaveFolderSelection.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/atoms/SaveFolderSelection.kt
@@ -3,13 +3,13 @@ package app.myzel394.alibi.ui.components.WelcomeScreen.atoms
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Folder
 import androidx.compose.material.icons.filled.Lock
@@ -34,6 +34,7 @@ import app.myzel394.alibi.ui.RECORDER_MEDIA_SELECTED_VALUE
 import app.myzel394.alibi.ui.SUPPORTS_SAVING_VIDEOS_IN_CUSTOM_FOLDERS
 import app.myzel394.alibi.ui.components.atoms.MessageBox
 import app.myzel394.alibi.ui.components.atoms.MessageType
+import app.myzel394.alibi.ui.components.atoms.VisualDensity
 
 const val CUSTOM_FOLDER = "custom"
 
@@ -65,7 +66,6 @@ fun SaveFolderSelection(
 
     Column(
         verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = Modifier.verticalScroll(rememberScrollState()),
     ) {
         Column(
             modifier = Modifier
@@ -134,7 +134,7 @@ fun SaveFolderSelection(
                         Text(label)
                     }
                     Icon(
-                        Icons.Default.Lock,
+                        Icons.Default.PermMedia,
                         contentDescription = null,
                         modifier = Modifier
                             .size(ButtonDefaults.IconSize)
@@ -170,7 +170,7 @@ fun SaveFolderSelection(
                             Text(label)
                         }
                         Icon(
-                            Icons.Default.Lock,
+                            Icons.Default.Folder,
                             contentDescription = null,
                             modifier = Modifier
                                 .size(ButtonDefaults.IconSize)
@@ -201,5 +201,15 @@ fun SaveFolderSelection(
                 type = MessageType.ERROR,
                 message = stringResource(R.string.ui_welcome_saveFolder_externalRequired)
             )
+        else
+            Box(
+                modifier = Modifier.widthIn(max = 400.dp)
+            ) {
+                MessageBox(
+                    type = MessageType.INFO,
+                    message = stringResource(R.string.ui_welcome_timeSettings_changeableHint),
+                    density = VisualDensity.DENSE,
+                )
+            }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
index 19d499c..6eab985 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
@@ -13,6 +13,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.InsertDriveFile
 import androidx.compose.material.icons.filled.ChevronLeft
@@ -44,10 +46,7 @@ import app.myzel394.alibi.ui.BIG_PRIMARY_BUTTON_SIZE
 import app.myzel394.alibi.ui.RECORDER_MEDIA_SELECTED_VALUE
 import app.myzel394.alibi.ui.SUPPORTS_SCOPED_STORAGE
 import app.myzel394.alibi.ui.components.WelcomeScreen.atoms.SaveFolderSelection
-import app.myzel394.alibi.ui.components.atoms.MessageBox
-import app.myzel394.alibi.ui.components.atoms.MessageType
 import app.myzel394.alibi.ui.components.atoms.PermissionRequester
-import app.myzel394.alibi.ui.components.atoms.VisualDensity
 import app.myzel394.alibi.ui.utils.rememberFolderSelectorDialog
 
 @Composable
@@ -79,7 +78,8 @@ fun SaveFolderPage(
 
     Column(
         modifier = Modifier
-            .fillMaxSize(),
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.SpaceBetween,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
@@ -106,7 +106,7 @@ fun SaveFolderPage(
                 stringResource(R.string.ui_welcome_saveFolder_message),
             )
         }
-        Spacer(modifier = Modifier.weight(2f))
+        Spacer(modifier = Modifier.weight(1f))
         Box(
             modifier = Modifier.widthIn(max = 400.dp)
         ) {
@@ -118,16 +118,6 @@ fun SaveFolderPage(
             )
         }
         Spacer(modifier = Modifier.weight(1f))
-        Box(
-            modifier = Modifier.widthIn(max = 400.dp)
-        ) {
-            MessageBox(
-                type = MessageType.INFO,
-                message = stringResource(R.string.ui_welcome_timeSettings_changeableHint),
-                density = VisualDensity.DENSE,
-            )
-        }
-        Spacer(modifier = Modifier.weight(2f))
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt
index 712f83c..454b90f 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/TimeSettingsPage.kt
@@ -11,6 +11,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccessTime
 import androidx.compose.material.icons.filled.ChevronRight
@@ -36,7 +38,9 @@ fun TimeSettingsPage(
     onContinue: () -> Unit,
 ) {
     Column(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.SpaceBetween,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
diff --git a/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt b/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt
index 3ab59bf..c8686e5 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt
@@ -44,11 +44,13 @@ fun WelcomeScreen(
         }
     }
 
-    Scaffold() { padding ->
+    Scaffold(
+    ) { padding ->
         Column(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(padding),
+
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             HorizontalPager(state = pagerState) { position ->