Polish various bits of backups UI.

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsEducationScreen.kt

@@ -121,7 +121,7 @@ fun MessageBackupsEducationScreen(
         }
       }
 
-      Buttons.LargePrimary(
+      Buttons.LargeTonal(
         onClick = onEnableBackups,
         modifier = Modifier.fillMaxWidth()
       ) {

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt

@@ -177,6 +177,8 @@ fun MessageBackupsTypeSelectionScreen(
             }
 
             stringResource(R.string.MessageBackupsTypeSelectionScreen__subscribe_for_x_month, price)
+          } else if (selectedBackupTier == MessageBackupTier.FREE) {
+            stringResource(R.string.MessageBackupsTypeSelectionScreen__choose_free_plan)
           } else {
             stringResource(R.string.MessageBackupsTypeSelectionScreen__subscribe)
           }
@@ -205,7 +207,7 @@ private fun MessageBackupsTypeSelectionScreenPreview() {
   Previews.Preview {
     MessageBackupsTypeSelectionScreen(
       stage = MessageBackupsStage.TYPE_SELECTION,
-      selectedBackupTier = MessageBackupTier.FREE,
+      selectedBackupTier = selectedBackupsType,
       availableBackupTypes = testBackupTypes(),
       onMessageBackupsTierSelected = { selectedBackupsType = it },
       onNavigationClick = {},
@@ -225,7 +227,7 @@ private fun MessageBackupsTypeSelectionScreenWithCurrentTierPreview() {
   Previews.Preview {
     MessageBackupsTypeSelectionScreen(
       stage = MessageBackupsStage.TYPE_SELECTION,
-      selectedBackupTier = MessageBackupTier.FREE,
+      selectedBackupTier = selectedBackupsType,
       availableBackupTypes = testBackupTypes(),
       onMessageBackupsTierSelected = { selectedBackupsType = it },
       onNavigationClick = {},

app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.unit.dp
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.SignalPreview
 import org.signal.core.ui.compose.horizontalGutters
+import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 
 /**
@@ -69,7 +70,7 @@ fun BetaHeader(modifier: Modifier = Modifier) {
     verticalAlignment = Alignment.CenterVertically,
     modifier = modifier
       .background(
-        color = MaterialTheme.colorScheme.surfaceVariant,
+        color = SignalTheme.colors.colorSurface2,
         shape = RoundedCornerShape(12.dp)
       )
       .padding(16.dp)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt

@@ -264,7 +264,10 @@ private fun NeverEnabledBackupsRow(
     },
     text = {
       Column {
-        TextWithBetaLabel(text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups))
+        TextWithBetaLabel(
+          text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups),
+          textStyle = MaterialTheme.typography.bodyLarge
+        )
 
         Text(
           text = stringResource(R.string.BackupsSettingsFragment_automatic_backups_with_signals),
@@ -307,7 +310,11 @@ private fun InactiveBackupsRow(
   Rows.TextRow(
     text = {
       Column {
-        TextWithBetaLabel(text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups))
+        TextWithBetaLabel(
+          text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups),
+          textStyle = MaterialTheme.typography.bodyLarge
+        )
+
         Text(
           text = stringResource(R.string.preferences_off),
           style = MaterialTheme.typography.bodyMedium,
@@ -347,7 +354,11 @@ private fun NotFoundBackupRow(
     },
     text = {
       Column {
-        TextWithBetaLabel(text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups))
+        TextWithBetaLabel(
+          text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups),
+          textStyle = MaterialTheme.typography.bodyLarge
+        )
+
         Text(
           text = stringResource(R.string.BackupsSettingsFragment_subscription_not_found_on_this_device),
           style = MaterialTheme.typography.bodyMedium,
@@ -379,7 +390,11 @@ private fun PendingBackupRow(
     },
     text = {
       Column {
-        TextWithBetaLabel(text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups))
+        TextWithBetaLabel(
+          text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups),
+          textStyle = MaterialTheme.typography.bodyLarge
+        )
+
         Text(
           text = stringResource(R.string.RemoteBackupsSettingsFragment__payment_pending),
           color = MaterialTheme.colorScheme.onSurfaceVariant,
@@ -427,7 +442,10 @@ private fun ActiveBackupsRow(
     },
     text = {
       Column {
-        TextWithBetaLabel(text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups))
+        TextWithBetaLabel(
+          text = stringResource(R.string.RemoteBackupsSettingsFragment__signal_backups),
+          textStyle = MaterialTheme.typography.bodyLarge
+        )
 
         when (val type = backupState.messageBackupsType) {
           is MessageBackupsType.Paid -> {

app/src/main/res/drawable-night/image_signal_backups.xml

@@ -6,28 +6,28 @@
     <path
         android:fillColor="#FF9CA4EF"
         android:fillType="evenOdd"
-        android:pathData="M67 60.42c0.92 0.8 1.02 2.2 0.22 3.13-4.69 5.43-11.04 9.51-18.53 11.38-7.48 1.86-15 1.23-21.7-1.37-1.14-0.44-1.7-1.73-1.26-2.87 0.44-1.15 1.73-1.71 2.87-1.27 5.86 2.28 12.45 2.83 19.02 1.2 6.57-1.64 12.13-5.22 16.24-9.97 0.8-0.93 2.2-1.04 3.13-0.23Z"/>
+        android:pathData="M66.5 60.57c0.9 0.8 1 2.16 0.23 3.07l-0.02 0.03c-4.58 5.37-10.8 9.42-18.1 11.27-7.32 1.84-14.68 1.22-21.21-1.35-1.12-0.44-1.68-1.7-1.25-2.83l0.02-0.04c0.43-1.12 1.69-1.68 2.8-1.24 5.73 2.26 12.17 2.8 18.58 1.19 6.42-1.62 11.86-5.17 15.87-9.88 0.78-0.92 2.17-1 3.07-0.22Z"/>
     <path
         android:fillColor="#FFD2D8FE"
         android:fillType="evenOdd"
-        android:pathData="M40 67.55c-5.15 0-9.98-1.41-14.1-3.88V59.1c0-2.95-2.39-5.33-5.33-5.33-1.38 0-2.64 0.52-3.59 1.38-2.86-4.35-4.53-9.55-4.53-15.15 0-15.21 12.33-27.55 27.55-27.55 15.21 0 27.55 12.34 27.55 27.55 0 15.22-12.34 27.55-27.55 27.55Z"/>
+        android:pathData="M40 67c-5.05 0-9.78-1.39-13.82-3.8v-4.48c0-2.89-2.34-5.23-5.22-5.23-1.36 0-2.59 0.51-3.52 1.36C14.64 50.59 13 45.48 13 40c0-14.91 12.09-27 27-27s27 12.09 27 27-12.09 27-27 27Z"/>
     <path
         android:fillColor="#FF666EE5"
-        android:pathData="M36.53 25.76l-0.6 21.43v0.13c0 1.44 1.1 2.6 2.44 2.6h0.16l14.37-0.64c0.98-0.04 1.76-0.91 1.76-1.96 0-1.06-0.78-1.92-1.76-1.97l-12.16-0.54-0.53-19.05c-0.03-1.06-0.85-1.9-1.84-1.9-1 0-1.8 0.84-1.84 1.9Z"/>
+        android:pathData="M35.76 41V25.09c0-1.25 1.01-2.25 2.25-2.25 1.25 0 2.25 1 2.25 2.25V41c0 0.84 0.29 1.65 0.8 2.31l7.97 10.18c0.77 0.98 0.6 2.4-0.38 3.16-0.92 0.72-2.22 0.61-3.01-0.21l-0.15-0.17-7.97-10.19c-1.14-1.45-1.76-3.24-1.76-5.08Z"/>
     <path
         android:fillColor="#FF666EE5"
         android:fillType="evenOdd"
-        android:pathData="M63.55 12.78c5.43 4.69 9.51 11.04 11.38 18.53 1.86 7.48 1.23 15-1.37 21.7-0.44 1.14-1.73 1.7-2.87 1.26-1.15-0.44-1.71-1.73-1.27-2.87 2.28-5.86 2.83-12.45 1.2-19.02-1.64-6.57-5.22-12.13-9.97-16.24-0.93-0.8-1.04-2.2-0.23-3.13 0.8-0.93 2.2-1.03 3.13-0.23Z"/>
+        android:pathData="M63.67 13.3c5.37 4.57 9.42 10.78 11.27 18.1 1.84 7.31 1.22 14.67-1.35 21.2-0.44 1.12-1.7 1.68-2.83 1.25l-0.04-0.02c-1.12-0.43-1.68-1.69-1.24-2.8 2.26-5.73 2.8-12.17 1.19-18.58-1.62-6.42-5.17-11.86-9.88-15.87-0.92-0.78-1-2.17-0.22-3.07 0.8-0.9 2.16-1.01 3.07-0.24l0.03 0.02Z"/>
     <path
         android:fillColor="#FF9CA4EF"
         android:fillType="evenOdd"
-        android:pathData="M54.27 9.31c-0.44 1.15-1.73 1.71-2.87 1.27-5.86-2.28-12.45-2.83-19.02-1.2-6.57 1.64-12.13 5.22-16.24 9.97-0.8 0.93-2.2 1.04-3.13 0.23-0.93-0.8-1.03-2.2-0.23-3.13 4.69-5.43 11.04-9.51 18.53-11.38 7.48-1.86 15-1.23 21.7 1.37 1.14 0.44 1.7 1.73 1.26 2.87Z"/>
+        android:pathData="M53.83 9.28c-0.43 1.12-1.69 1.68-2.8 1.24-5.73-2.26-12.17-2.8-18.58-1.19-6.42 1.62-11.86 5.17-15.87 9.88-0.78 0.92-2.17 1-3.07 0.22-0.9-0.8-1.01-2.16-0.24-3.07l0.02-0.03c4.59-5.37 10.8-9.42 18.1-11.27 7.32-1.84 14.68-1.22 21.21 1.35 1.12 0.44 1.68 1.7 1.25 2.83l-0.02 0.04Z"/>
     <path
         android:fillColor="#FF666EE5"
         android:fillType="evenOdd"
-        android:pathData="M20.45 56.96c0.98 0 1.78 0.8 1.78 1.78v8.14c0 0.98-0.8 1.78-1.78 1.78h-8.96c-0.98 0-1.78-0.8-1.78-1.78s0.8-1.77 1.78-1.77h7.18v-6.37c0-0.98 0.8-1.78 1.78-1.78Z"/>
+        android:pathData="M20.24 56.5c0.97 0 1.76 0.8 1.76 1.77v8.08c0 0.97-0.79 1.76-1.76 1.76H11.4c-0.96 0-1.75-0.79-1.75-1.76 0-0.98 0.79-1.76 1.75-1.76h7.1v-6.32c0-0.98 0.79-1.77 1.75-1.77Z"/>
     <path
         android:fillColor="#FF666EE5"
         android:fillType="evenOdd"
-        android:pathData="M9.31 25.73c1.15 0.44 1.71 1.73 1.27 2.87-2.28 5.86-2.83 12.45-1.2 19.02 1.64 6.57 5.22 12.13 9.97 16.24l1.69 1.45-2.9 3.36-1.69-1.45C11.02 62.53 6.94 56.18 5.07 48.7c-1.86-7.48-1.23-15 1.37-21.7 0.44-1.14 1.73-1.7 2.87-1.26Z"/>
+        android:pathData="M9.25 25.53c1.13 0.44 1.69 1.71 1.25 2.85-2.25 5.8-2.8 12.35-1.18 18.86 1.61 6.51 5.15 12.03 9.84 16.1l1.66 1.45-2.86 3.33-1.66-1.44c-5.36-4.65-9.4-10.95-11.24-18.37-1.84-7.43-1.22-14.9 1.35-21.53 0.44-1.13 1.7-1.7 2.84-1.25Z"/>
 </vector>

app/src/main/res/drawable-night/image_signal_backups_subscribed.xml

@@ -1,36 +1,33 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-    <group>
-        <path
-            android:fillColor="#FF9CA4EF"
-            android:fillType="evenOdd"
-            android:pathData="M55.55 50.29c0.8 0.7 0.9 1.92 0.2 2.72l-0.01 0.03c-4.07 4.78-9.6 8.37-16.1 10.01-6.5 1.65-13.03 1.1-18.84-1.2-1-0.39-1.5-1.5-1.1-2.5V59.3c0.39-0.99 1.5-1.48 2.5-1.1 5.08 2.01 10.81 2.5 16.51 1.06 5.7-1.44 10.54-4.6 14.1-8.78 0.7-0.81 1.94-0.9 2.74-0.2Z"/>
-        <path
-            android:fillColor="#FFD2D8FE"
-            android:fillType="evenOdd"
-            android:pathData="M32 56c-4.49 0-8.69-1.23-12.28-3.38v-3.98c0-2.57-2.08-4.65-4.65-4.65-1.2 0-2.3 0.46-3.12 1.2C9.45 41.42 8 36.88 8 32 8 18.75 18.75 8 32 8s24 10.75 24 24-10.75 24-24 24Z"/>
-        <path
-            android:fillColor="#FF666EE5"
-            android:fillType="evenOdd"
-            android:pathData="M38.65 22.56c0.52-0.82 1.6-1.05 2.42-0.53 0.81 0.52 1.05 1.6 0.53 2.41L31.2 40.7c-0.3 0.48-0.83 0.78-1.4 0.8-0.56 0.03-1.1-0.21-1.45-0.66l-5.85-7.48c-0.6-0.76-0.46-1.86 0.3-2.45 0.76-0.6 1.86-0.46 2.45 0.3l4.33 5.53 9.07-14.17Z"/>
-        <path
-            android:fillColor="#FF666EE5"
-            android:fillType="evenOdd"
-            android:pathData="M53.04 8.26c4.78 4.07 8.37 9.6 10.01 16.1 1.65 6.5 1.1 13.03-1.2 18.84-0.39 1-1.5 1.5-2.5 1.1H59.3c-0.99-0.39-1.48-1.5-1.1-2.5 2.01-5.08 2.5-10.81 1.06-16.51-1.44-5.7-4.6-10.54-8.78-14.1-0.81-0.7-0.9-1.94-0.2-2.74 0.7-0.8 1.93-0.9 2.73-0.2l0.03 0.01Z"/>
-        <path
-            android:fillColor="#FF9CA4EF"
-            android:fillType="evenOdd"
-            android:pathData="M44.3 4.7c-0.39 0.99-1.5 1.48-2.5 1.1C36.72 3.78 31 3.3 25.3 4.73c-5.7 1.44-10.54 4.6-14.1 8.78-0.7 0.81-1.94 0.9-2.74 0.2-0.8-0.7-0.9-1.93-0.2-2.73l0.01-0.03c4.07-4.78 9.6-8.37 16.1-10.01 6.5-1.65 13.03-1.1 18.84 1.2 1 0.39 1.5 1.5 1.1 2.5V4.7Z"/>
-        <path
-            android:fillColor="#FF666EE5"
-            android:fillType="evenOdd"
-            android:pathData="M14.44 46.67c0.86 0 1.56 0.7 1.56 1.57v7.18C16 56.3 15.3 57 14.44 57H6.57c-0.86 0-1.56-0.7-1.56-1.57 0-0.86 0.7-1.57 1.56-1.57h6.3v-5.61c0-0.87 0.7-1.57 1.57-1.57Z"/>
-        <path
-            android:fillColor="#FF666EE5"
-            android:fillType="evenOdd"
-            android:pathData="M4.66 19.13c1 0.4 1.5 1.53 1.12 2.54-2 5.16-2.49 10.98-1.05 16.77 1.43 5.79 4.57 10.7 8.75 14.31l1.48 1.28L12.4 57l-1.48-1.28c-4.77-4.13-8.35-9.74-9.99-16.34-1.63-6.6-1.08-13.23 1.2-19.13 0.39-1 1.52-1.5 2.52-1.12Z"/>
-    </group>
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="80"
+    android:viewportHeight="80">
+    <path
+        android:fillColor="#FF9CA4EF"
+        android:fillType="evenOdd"
+        android:pathData="M66.5 60.57c0.9 0.8 1 2.16 0.23 3.07l-0.02 0.03c-4.58 5.37-10.8 9.42-18.1 11.27-7.32 1.84-14.68 1.22-21.21-1.35-1.12-0.44-1.68-1.7-1.25-2.83l0.02-0.04c0.43-1.12 1.69-1.68 2.8-1.24 5.73 2.26 12.17 2.8 18.58 1.19 6.42-1.62 11.86-5.17 15.87-9.88 0.78-0.92 2.17-1 3.07-0.22Z"/>
+    <path
+        android:fillColor="#FFD2D8FE"
+        android:fillType="evenOdd"
+        android:pathData="M40 67c-5.05 0-9.78-1.39-13.82-3.8v-4.48c0-2.89-2.34-5.23-5.22-5.23-1.36 0-2.59 0.51-3.52 1.36C14.64 50.59 13 45.48 13 40c0-14.91 12.09-27 27-27s27 12.09 27 27-12.09 27-27 27Z"/>
+    <path
+        android:fillColor="#FF5C66FD"
+        android:pathData="M48.07 28.8c0.6-0.93 1.83-1.2 2.76-0.61 0.93 0.6 1.2 1.83 0.6 2.76l-12.47 19.5c-0.35 0.55-0.95 0.9-1.6 0.92-0.64 0.03-1.27-0.25-1.66-0.76l-7.03-8.97c-0.68-0.87-0.52-2.13 0.35-2.81 0.87-0.68 2.12-0.53 2.8 0.34l5.29 6.75L48.07 28.8Z"/>
+    <path
+        android:fillColor="#FF666EE5"
+        android:fillType="evenOdd"
+        android:pathData="M63.67 13.3c5.37 4.57 9.42 10.78 11.27 18.1 1.84 7.31 1.22 14.67-1.35 21.2-0.44 1.12-1.7 1.68-2.83 1.25l-0.04-0.02c-1.12-0.43-1.68-1.69-1.24-2.8 2.26-5.73 2.8-12.17 1.19-18.58-1.62-6.42-5.17-11.86-9.88-15.87-0.92-0.78-1-2.17-0.22-3.07 0.8-0.9 2.16-1.01 3.07-0.24l0.03 0.02Z"/>
+    <path
+        android:fillColor="#FF9CA4EF"
+        android:fillType="evenOdd"
+        android:pathData="M53.83 9.28c-0.43 1.12-1.69 1.68-2.8 1.24-5.73-2.26-12.17-2.8-18.58-1.19-6.42 1.62-11.86 5.17-15.87 9.88-0.78 0.92-2.17 1-3.07 0.22-0.9-0.8-1.01-2.16-0.24-3.07l0.02-0.03c4.59-5.37 10.8-9.42 18.1-11.27 7.32-1.84 14.68-1.22 21.21 1.35 1.12 0.44 1.68 1.7 1.25 2.83l-0.02 0.04Z"/>
+    <path
+        android:fillColor="#FF666EE5"
+        android:fillType="evenOdd"
+        android:pathData="M20.24 56.5c0.97 0 1.76 0.8 1.76 1.77v8.08c0 0.97-0.79 1.76-1.76 1.76H11.4c-0.96 0-1.75-0.79-1.75-1.76 0-0.98 0.79-1.76 1.75-1.76h7.1v-6.32c0-0.98 0.79-1.77 1.75-1.77Z"/>
+    <path
+        android:fillColor="#FF666EE5"
+        android:fillType="evenOdd"
+        android:pathData="M9.25 25.53c1.13 0.44 1.69 1.71 1.25 2.85-2.25 5.8-2.8 12.35-1.18 18.86 1.61 6.51 5.15 12.03 9.84 16.1l1.66 1.45-2.86 3.33-1.66-1.44c-5.36-4.65-9.4-10.95-11.24-18.37-1.84-7.43-1.22-14.9 1.35-21.53 0.44-1.13 1.7-1.7 2.84-1.25Z"/>
 </vector>

app/src/main/res/drawable/image_signal_backups.xml

@@ -6,28 +6,28 @@
     <path
         android:fillColor="#FFA0A7FE"
         android:fillType="evenOdd"
-        android:pathData="M67 60.42c0.92 0.8 1.02 2.2 0.22 3.13-4.69 5.43-11.04 9.51-18.53 11.38-7.48 1.86-15 1.23-21.7-1.37-1.14-0.44-1.7-1.73-1.26-2.87 0.44-1.15 1.73-1.71 2.87-1.27 5.86 2.28 12.45 2.83 19.02 1.2 6.57-1.64 12.13-5.22 16.24-9.97 0.8-0.93 2.2-1.04 3.13-0.23Z"/>
+        android:pathData="M66.5 60.57c0.9 0.8 1 2.16 0.23 3.07l-0.02 0.03c-4.58 5.37-10.8 9.42-18.1 11.27-7.32 1.84-14.68 1.22-21.21-1.35-1.12-0.44-1.68-1.7-1.25-2.83l0.02-0.04c0.43-1.12 1.69-1.68 2.8-1.24 5.73 2.26 12.17 2.8 18.58 1.19 6.42-1.62 11.86-5.17 15.87-9.88 0.78-0.92 2.17-1 3.07-0.22Z"/>
     <path
         android:fillColor="#FFD2D8FE"
         android:fillType="evenOdd"
-        android:pathData="M40 67.55c-5.15 0-9.98-1.41-14.1-3.88V59.1c0-2.95-2.39-5.33-5.33-5.33-1.38 0-2.64 0.52-3.59 1.38-2.86-4.35-4.53-9.55-4.53-15.15 0-15.21 12.33-27.55 27.55-27.55 15.21 0 27.55 12.34 27.55 27.55 0 15.22-12.34 27.55-27.55 27.55Z"/>
+        android:pathData="M40 67c-5.05 0-9.78-1.39-13.82-3.8v-4.48c0-2.89-2.34-5.23-5.22-5.23-1.36 0-2.59 0.51-3.52 1.36C14.64 50.59 13 45.48 13 40c0-14.91 12.09-27 27-27s27 12.09 27 27-12.09 27-27 27Z"/>
     <path
-        android:fillColor="#FF3C46FE"
-        android:pathData="M36.53 25.76l-0.6 21.43v0.13c0 1.44 1.1 2.6 2.44 2.6h0.16l14.37-0.64c0.98-0.04 1.76-0.91 1.76-1.96 0-1.06-0.78-1.92-1.76-1.97l-12.16-0.54-0.53-19.05c-0.03-1.06-0.85-1.9-1.84-1.9-1 0-1.8 0.84-1.84 1.9Z"/>
+        android:fillColor="#FF5C66FD"
+        android:pathData="M35.76 41V25.09c0-1.25 1.01-2.25 2.25-2.25 1.25 0 2.25 1 2.25 2.25V41c0 0.84 0.29 1.65 0.8 2.31l7.97 10.18c0.77 0.98 0.6 2.4-0.38 3.16-0.92 0.72-2.22 0.61-3.01-0.21l-0.15-0.17-7.97-10.19c-1.14-1.45-1.76-3.24-1.76-5.08Z"/>
     <path
         android:fillColor="#FF3B45FD"
         android:fillType="evenOdd"
-        android:pathData="M63.55 12.78c5.43 4.69 9.51 11.04 11.38 18.53 1.86 7.48 1.23 15-1.37 21.7-0.44 1.14-1.73 1.7-2.87 1.26-1.15-0.44-1.71-1.73-1.27-2.87 2.28-5.86 2.83-12.45 1.2-19.02-1.64-6.57-5.22-12.13-9.97-16.24-0.93-0.8-1.04-2.2-0.23-3.13 0.8-0.93 2.2-1.03 3.13-0.23Z"/>
+        android:pathData="M63.67 13.3c5.37 4.57 9.42 10.78 11.27 18.1 1.84 7.31 1.22 14.67-1.35 21.2-0.44 1.12-1.7 1.68-2.83 1.25l-0.04-0.02c-1.12-0.43-1.68-1.69-1.24-2.8 2.26-5.73 2.8-12.17 1.19-18.58-1.62-6.42-5.17-11.86-9.88-15.87-0.92-0.78-1-2.17-0.22-3.07 0.8-0.9 2.16-1.01 3.07-0.24l0.03 0.02Z"/>
     <path
         android:fillColor="#FFA0A7FE"
         android:fillType="evenOdd"
-        android:pathData="M54.27 9.31c-0.44 1.15-1.73 1.71-2.87 1.27-5.86-2.28-12.45-2.83-19.02-1.2-6.57 1.64-12.13 5.22-16.24 9.97-0.8 0.93-2.2 1.04-3.13 0.23-0.93-0.8-1.03-2.2-0.23-3.13 4.69-5.43 11.04-9.51 18.53-11.38 7.48-1.86 15-1.23 21.7 1.37 1.14 0.44 1.7 1.73 1.26 2.87Z"/>
+        android:pathData="M53.83 9.28c-0.43 1.12-1.69 1.68-2.8 1.24-5.73-2.26-12.17-2.8-18.58-1.19-6.42 1.62-11.86 5.17-15.87 9.88-0.78 0.92-2.17 1-3.07 0.22-0.9-0.8-1.01-2.16-0.24-3.07l0.02-0.03c4.59-5.37 10.8-9.42 18.1-11.27 7.32-1.84 14.68-1.22 21.21 1.35 1.12 0.44 1.68 1.7 1.25 2.83l-0.02 0.04Z"/>
     <path
         android:fillColor="#FF3B45FD"
         android:fillType="evenOdd"
-        android:pathData="M20.45 56.96c0.98 0 1.78 0.8 1.78 1.78v8.14c0 0.98-0.8 1.78-1.78 1.78h-8.96c-0.98 0-1.78-0.8-1.78-1.78s0.8-1.77 1.78-1.77h7.18v-6.37c0-0.98 0.8-1.78 1.78-1.78Z"/>
+        android:pathData="M20.24 56.5c0.97 0 1.76 0.8 1.76 1.77v8.08c0 0.97-0.79 1.76-1.76 1.76H11.4c-0.96 0-1.75-0.79-1.75-1.76 0-0.98 0.79-1.76 1.75-1.76h7.1v-6.32c0-0.98 0.79-1.77 1.75-1.77Z"/>
     <path
         android:fillColor="#FF3B45FD"
         android:fillType="evenOdd"
-        android:pathData="M9.31 25.73c1.15 0.44 1.71 1.73 1.27 2.87-2.28 5.86-2.83 12.45-1.2 19.02 1.64 6.57 5.22 12.13 9.97 16.24l1.69 1.45-2.9 3.36-1.69-1.45C11.02 62.53 6.94 56.18 5.07 48.7c-1.86-7.48-1.23-15 1.37-21.7 0.44-1.14 1.73-1.7 2.87-1.26Z"/>
+        android:pathData="M9.25 25.53c1.13 0.44 1.69 1.71 1.25 2.85-2.25 5.8-2.8 12.35-1.18 18.86 1.61 6.51 5.15 12.03 9.84 16.1l1.66 1.45-2.86 3.33-1.66-1.44c-5.36-4.65-9.4-10.95-11.24-18.37-1.84-7.43-1.22-14.9 1.35-21.53 0.44-1.13 1.7-1.7 2.84-1.25Z"/>
 </vector>

app/src/main/res/drawable/image_signal_backups_subscribed.xml

@@ -1,36 +1,33 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-    <group>
-        <path
-            android:fillColor="#FFA0A7FE"
-            android:fillType="evenOdd"
-            android:pathData="M55.55 50.29c0.8 0.7 0.9 1.92 0.2 2.72l-0.01 0.03c-4.07 4.78-9.6 8.37-16.1 10.01-6.5 1.65-13.03 1.1-18.84-1.2-1-0.39-1.5-1.5-1.1-2.5V59.3c0.39-0.99 1.5-1.48 2.5-1.1 5.08 2.01 10.81 2.5 16.51 1.06 5.7-1.44 10.54-4.6 14.1-8.78 0.7-0.81 1.94-0.9 2.74-0.2Z"/>
-        <path
-            android:fillColor="#FFD2D8FE"
-            android:fillType="evenOdd"
-            android:pathData="M32 56c-4.49 0-8.69-1.23-12.28-3.38v-3.98c0-2.57-2.08-4.65-4.65-4.65-1.2 0-2.3 0.46-3.12 1.2C9.45 41.42 8 36.88 8 32 8 18.75 18.75 8 32 8s24 10.75 24 24-10.75 24-24 24Z"/>
-        <path
-            android:fillColor="#FF3C46FE"
-            android:fillType="evenOdd"
-            android:pathData="M38.65 22.56c0.52-0.82 1.6-1.05 2.42-0.53 0.81 0.52 1.05 1.6 0.53 2.41L31.2 40.7c-0.3 0.48-0.83 0.78-1.4 0.8-0.56 0.03-1.1-0.21-1.45-0.66l-5.85-7.48c-0.6-0.76-0.46-1.86 0.3-2.45 0.76-0.6 1.86-0.46 2.45 0.3l4.33 5.53 9.07-14.17Z"/>
-        <path
-            android:fillColor="#FF3B45FD"
-            android:fillType="evenOdd"
-            android:pathData="M53.04 8.26c4.78 4.07 8.37 9.6 10.01 16.1 1.65 6.5 1.1 13.03-1.2 18.84-0.39 1-1.5 1.5-2.5 1.1H59.3c-0.99-0.39-1.48-1.5-1.1-2.5 2.01-5.08 2.5-10.81 1.06-16.51-1.44-5.7-4.6-10.54-8.78-14.1-0.81-0.7-0.9-1.94-0.2-2.74 0.7-0.8 1.93-0.9 2.73-0.2l0.03 0.01Z"/>
-        <path
-            android:fillColor="#FFA0A7FE"
-            android:fillType="evenOdd"
-            android:pathData="M44.3 4.7c-0.39 0.99-1.5 1.48-2.5 1.1C36.72 3.78 31 3.3 25.3 4.73c-5.7 1.44-10.54 4.6-14.1 8.78-0.7 0.81-1.94 0.9-2.74 0.2-0.8-0.7-0.9-1.93-0.2-2.73l0.01-0.03c4.07-4.78 9.6-8.37 16.1-10.01 6.5-1.65 13.03-1.1 18.84 1.2 1 0.39 1.5 1.5 1.1 2.5V4.7Z"/>
-        <path
-            android:fillColor="#FF3B45FD"
-            android:fillType="evenOdd"
-            android:pathData="M14.44 46.67c0.86 0 1.56 0.7 1.56 1.57v7.18C16 56.3 15.3 57 14.44 57H6.57c-0.86 0-1.56-0.7-1.56-1.57 0-0.86 0.7-1.57 1.56-1.57h6.3v-5.61c0-0.87 0.7-1.57 1.57-1.57Z"/>
-        <path
-            android:fillColor="#FF3B45FD"
-            android:fillType="evenOdd"
-            android:pathData="M4.66 19.13c1 0.4 1.5 1.53 1.12 2.54-2 5.16-2.49 10.98-1.05 16.77 1.43 5.79 4.57 10.7 8.75 14.31l1.48 1.28L12.4 57l-1.48-1.28c-4.77-4.13-8.35-9.74-9.99-16.34-1.63-6.6-1.08-13.23 1.2-19.13 0.39-1 1.52-1.5 2.52-1.12Z"/>
-    </group>
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportWidth="80"
+    android:viewportHeight="80">
+    <path
+        android:fillColor="#FFA0A7FE"
+        android:fillType="evenOdd"
+        android:pathData="M66.5 60.57c0.9 0.8 1 2.16 0.23 3.07l-0.02 0.03c-4.58 5.37-10.8 9.42-18.1 11.27-7.32 1.84-14.68 1.22-21.21-1.35-1.12-0.44-1.68-1.7-1.25-2.83l0.02-0.04c0.43-1.12 1.69-1.68 2.8-1.24 5.73 2.26 12.17 2.8 18.58 1.19 6.42-1.62 11.86-5.17 15.87-9.88 0.78-0.92 2.17-1 3.07-0.22Z"/>
+    <path
+        android:fillColor="#FFD2D8FE"
+        android:fillType="evenOdd"
+        android:pathData="M40 67c-5.05 0-9.78-1.39-13.82-3.8v-4.48c0-2.89-2.34-5.23-5.22-5.23-1.36 0-2.59 0.51-3.52 1.36C14.64 50.59 13 45.48 13 40c0-14.91 12.09-27 27-27s27 12.09 27 27-12.09 27-27 27Z"/>
+    <path
+        android:fillColor="#FF5C66FD"
+        android:pathData="M48.07 28.8c0.6-0.93 1.83-1.2 2.76-0.61 0.93 0.6 1.2 1.83 0.6 2.76l-12.47 19.5c-0.35 0.55-0.95 0.9-1.6 0.92-0.64 0.03-1.27-0.25-1.66-0.76l-7.03-8.97c-0.68-0.87-0.52-2.13 0.35-2.81 0.87-0.68 2.12-0.53 2.8 0.34l5.29 6.75L48.07 28.8Z"/>
+    <path
+        android:fillColor="#FF3B45FD"
+        android:fillType="evenOdd"
+        android:pathData="M63.67 13.3c5.37 4.57 9.42 10.78 11.27 18.1 1.84 7.31 1.22 14.67-1.35 21.2-0.44 1.12-1.7 1.68-2.83 1.25l-0.04-0.02c-1.12-0.43-1.68-1.69-1.24-2.8 2.26-5.73 2.8-12.17 1.19-18.58-1.62-6.42-5.17-11.86-9.88-15.87-0.92-0.78-1-2.17-0.22-3.07 0.8-0.9 2.16-1.01 3.07-0.24l0.03 0.02Z"/>
+    <path
+        android:fillColor="#FFA0A7FE"
+        android:fillType="evenOdd"
+        android:pathData="M53.83 9.28c-0.43 1.12-1.69 1.68-2.8 1.24-5.73-2.26-12.17-2.8-18.58-1.19-6.42 1.62-11.86 5.17-15.87 9.88-0.78 0.92-2.17 1-3.07 0.22-0.9-0.8-1.01-2.16-0.24-3.07l0.02-0.03c4.59-5.37 10.8-9.42 18.1-11.27 7.32-1.84 14.68-1.22 21.21 1.35 1.12 0.44 1.68 1.7 1.25 2.83l-0.02 0.04Z"/>
+    <path
+        android:fillColor="#FF3B45FD"
+        android:fillType="evenOdd"
+        android:pathData="M20.24 56.5c0.97 0 1.76 0.8 1.76 1.77v8.08c0 0.97-0.79 1.76-1.76 1.76H11.4c-0.96 0-1.75-0.79-1.75-1.76 0-0.98 0.79-1.76 1.75-1.76h7.1v-6.32c0-0.98 0.79-1.77 1.75-1.77Z"/>
+    <path
+        android:fillColor="#FF3B45FD"
+        android:fillType="evenOdd"
+        android:pathData="M9.25 25.53c1.13 0.44 1.69 1.71 1.25 2.85-2.25 5.8-2.8 12.35-1.18 18.86 1.61 6.51 5.15 12.03 9.84 16.1l1.66 1.45-2.86 3.33-1.66-1.44c-5.36-4.65-9.4-10.95-11.24-18.37-1.84-7.43-1.22-14.9 1.35-21.53 0.44-1.13 1.7-1.7 2.84-1.25Z"/>
 </vector>

app/src/main/res/values/strings.xml

@@ -8458,8 +8458,10 @@
     <string name="MessageBackupsTypeSelectionScreen__all_backups_are_end_to_end_encrypted">All backups are end-to-end encrypted. Signal is a non-profit—paying for backups helps support our mission.</string>
     <!-- Screen subhead highlighted read-more button -->
     <string name="MessageBackupsTypeSelectionScreen__learn_more">Learn more</string>
-    <!-- Primary action button label when selecting the free backup tier without a current selection -->
+    <!-- Primary action button label without a current selection -->
     <string name="MessageBackupsTypeSelectionScreen__subscribe">Subscribe</string>
+    <!-- Primary action button label when selecting the free backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__choose_free_plan">Choose free plan</string>
     <!-- Primary action button label when selecting the paid backup tier without a current selection -->
     <string name="MessageBackupsTypeSelectionScreen__subscribe_for_x_month">Subscribe for %1$s/month</string>
     <!-- Primary action button label when selecting a backup tier with a current selection -->