diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt b/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt
index 70797b2b5f..0fddfc40a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/compose/Beta.kt
@@ -1,11 +1,16 @@
 package org.thoughtcrime.securesms.components.compose
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -14,36 +19,43 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
 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.thoughtcrime.securesms.R
 
 /**
  * Adds a 'Beta' label next to [text] to indicate a feature is in development
  */
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun TextWithBetaLabel(
   text: String,
   textStyle: TextStyle = TextStyle.Default,
   modifier: Modifier = Modifier
 ) {
-  Row(
-    verticalAlignment = Alignment.CenterVertically,
+  FlowRow(
+    verticalArrangement = Arrangement.Center,
+    horizontalArrangement = Arrangement.Center,
     modifier = modifier
   ) {
     Text(
       text = text,
-      style = textStyle
+      style = textStyle,
+      modifier = Modifier.align(Alignment.CenterVertically)
     )
     Text(
       text = stringResource(R.string.Beta__beta_title).uppercase(),
       color = MaterialTheme.colorScheme.onPrimaryContainer,
       style = MaterialTheme.typography.labelSmall,
       modifier = Modifier
-        .padding(horizontal = 4.dp)
+        .padding(start = 6.dp)
+        .padding(vertical = 6.dp)
         .background(color = MaterialTheme.colorScheme.surfaceVariant, shape = RoundedCornerShape(28.dp))
         .padding(horizontal = 12.dp, vertical = 4.dp)
+        .align(Alignment.CenterVertically)
     )
   }
 }
@@ -83,6 +95,23 @@ fun BetaLabelPreview() {
   }
 }
 
+@Preview(locale = "de")
+@Composable
+fun LongTextBetaLabelPreview() {
+  Previews.Preview {
+    Scaffold {
+      TextWithBetaLabel(
+        text = stringResource(id = R.string.RemoteBackupsSettingsFragment__signal_backups),
+        textStyle = MaterialTheme.typography.headlineMedium,
+        modifier = Modifier
+          .fillMaxWidth()
+          .horizontalGutters()
+          .padding(it)
+      )
+    }
+  }
+}
+
 @SignalPreview
 @Composable
 fun BetaHeaderPreview() {