diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt
index 654020beb3..b9070b90be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/permissions/GrantPermissionsScreen.kt
@@ -46,12 +46,17 @@ fun GrantPermissionsScreen(
         horizontalArrangement = Arrangement.SpaceBetween,
         modifier = Modifier.fillMaxWidth()
       ) {
-        TextButton(onClick = onNotNowClicked) {
+        TextButton(
+          modifier = Modifier.weight(weight = 1f, fill = false),
+          onClick = onNotNowClicked
+        ) {
           Text(
             text = stringResource(id = R.string.GrantPermissionsFragment__not_now)
           )
         }
 
+        Spacer(modifier = Modifier.size(24.dp))
+
         Buttons.LargeTonal(
           onClick = onNextClicked
         ) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt
index 29ea34aec7..32b1d3253e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt
@@ -46,6 +46,7 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import kotlinx.coroutines.launch
@@ -93,6 +94,7 @@ fun EnterBackupKeyScreen(
       ) {
         TextButton(
           enabled = !inProgress,
+          modifier = Modifier.weight(weight = 1f, fill = false),
           onClick = {
             coroutineScope.launch {
               sheetState.show()
@@ -104,6 +106,8 @@ fun EnterBackupKeyScreen(
           )
         }
 
+        Spacer(modifier = Modifier.size(24.dp))
+
         AnimatedContent(
           targetState = inProgress,
           label = "next-progress"