diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
index cc0acd75b6..20cbe19cf3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
@@ -8,7 +8,6 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.Spanned;
@@ -27,7 +26,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.Lifecycle;
 import androidx.navigation.Navigation;
 
 import com.dd.CircularProgressButton;
@@ -57,7 +55,6 @@ import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
 import java.io.IOException;
 import java.util.Locale;
-import java.util.Objects;
 
 public final class RestoreBackupFragment extends BaseRegistrationFragment {
 
@@ -341,8 +338,8 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment {
   @RequiresApi(29)
   private void displayConfirmationDialog(@NonNull Context context) {
     new AlertDialog.Builder(context)
-                   .setTitle(R.string.RestoreBackupFragment__re_enable_backups)
-                   .setMessage(R.string.RestoreBackupFragment__to_continue_using)
+                   .setTitle(R.string.RestoreBackupFragment__restore_complete)
+                   .setMessage(R.string.RestoreBackupFragment__to_continue_using_backups_please_choose_a_folder)
                    .setPositiveButton(R.string.RestoreBackupFragment__choose_folder, (dialog, which) -> {
                      Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
 
@@ -352,7 +349,7 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment {
 
                      startActivityForResult(intent, OPEN_DOCUMENT_TREE_RESULT_CODE);
                    })
-                   .setNegativeButton(R.string.RestoreBackupFragment__keep_disabled, (dialog, which) -> {
+                   .setNegativeButton(R.string.RestoreBackupFragment__not_now, (dialog, which) -> {
                      BackupPassphrase.set(context, null);
                      dialog.dismiss();
 
diff --git a/app/src/main/res/drawable/primary_action_button_background_36dp.xml b/app/src/main/res/drawable/primary_action_button_background_36dp.xml
new file mode 100644
index 0000000000..c060875686
--- /dev/null
+++ b/app/src/main/res/drawable/primary_action_button_background_36dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"
+    android:drawable="@drawable/primary_action_button_background"
+    android:insetTop="6dp"
+    android:insetBottom="6dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_backups.xml b/app/src/main/res/layout/fragment_backups.xml
index 0d3a5937d4..fd4c9b4f9d 100644
--- a/app/src/main/res/layout/fragment_backups.xml
+++ b/app/src/main/res/layout/fragment_backups.xml
@@ -153,7 +153,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="20dp"
-            android:background="@drawable/primary_action_button_background"
+            android:background="@drawable/primary_action_button_background_36dp"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/BackupsPreferenceFragment__turn_on"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3610213be6..b3a72d0707 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -387,21 +387,21 @@
     <string name="CreateProfileActivity_set_avatar_description">Set avatar</string>
 
     <!-- ChooseBackupFragment -->
-    <string name="ChooseBackupFragment__restore_from_backup">Restore from Backup?</string>
+    <string name="ChooseBackupFragment__restore_from_backup">Restore from backup?</string>
     <string name="ChooseBackupFragment__restore_your_messages_and_media">Restore your messages and media from a local backup. If you don\'t restore now, you won\'t be able to restore later.</string>
     <string name="ChooseBackupFragment__icon_content_description">Restore from backup icon</string>
     <string name="ChooseBackupFragment__choose_backup">Choose backup</string>
     <string name="ChooseBackupFragment__learn_more">Learn more</string>
 
     <!-- RestoreBackupFragment -->
-    <string name="RestoreBackupFragment__re_enable_backups">Re-enable Backups?</string>
-    <string name="RestoreBackupFragment__to_continue_using">To continue using backups, please choose where they should be saved."</string>
+    <string name="RestoreBackupFragment__restore_complete">Restore complete</string>
+    <string name="RestoreBackupFragment__to_continue_using_backups_please_choose_a_folder">To continue using backups, please choose a folder. New backups will be saved to this location.</string>
     <string name="RestoreBackupFragment__choose_folder">Choose folder</string>
-    <string name="RestoreBackupFragment__keep_disabled">Keep disabled</string>
+    <string name="RestoreBackupFragment__not_now">Not now</string>
 
     <!-- BackupsPreferenceFragment -->
     <string name="BackupsPreferenceFragment__chat_backups">Chat backups</string>
-    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Backups are encrypted with a passphrase and stored on your device</string>
+    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Backups are encrypted with a passphrase and stored on your device.</string>
     <string name="BackupsPreferenceFragment__create_backup">Create backup</string>
     <string name="BackupsPreferenceFragment__last_backup">Last backup: %1$s</string>
     <string name="BackupsPreferenceFragment__backup_folder">Backup folder</string>
@@ -409,7 +409,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Test your backup passphrase and verify that it matches</string>
     <string name="BackupsPreferenceFragment__turn_on">Turn on</string>
     <string name="BackupsPreferenceFragment__turn_off">Turn off</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">To restore a backup, install a new copy of Signal. Open the app and tap "Restore backup", then locate a backup folder. %1$s</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">To restore a backup, install a new copy of Signal. Open the app and tap "Restore backup", then locate a backup file. %1$s</string>
     <string name="BackupsPreferenceFragment__learn_more">Learn more</string>
     <string name="BackupsPreferenceFragment__in_progress">In progress…</string>
     <string name="BackupsPreferenceFragment__d_so_far">%1$d so far…</string>