diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
index 7882bab054..dc1c5fbd8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
@@ -273,11 +273,11 @@ fun CellWithPaddingAndMargin(
 ) {
     Box(
         modifier = Modifier
+            .padding(horizontal = margin)
             .background(color = LocalColors.current.backgroundSecondary,
                 shape = MaterialTheme.shapes.small)
             .wrapContentHeight()
-            .fillMaxWidth()
-            .padding(horizontal = margin),
+            .fillMaxWidth(),
     ) {
         Box(Modifier.padding(padding)) { content() }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt
index 643f7a7e25..54478e69b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt
@@ -35,7 +35,7 @@ interface ButtonType {
         @Composable
         override fun buttonColors() = ButtonDefaults.buttonColors(
             contentColor = contentColor,
-            containerColor = Color.Unspecified,
+            containerColor = Color.Transparent,
             disabledContentColor = LocalColors.current.disabled,
             disabledContainerColor = Color.Transparent
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
index 8c72f82f09..c58f7dc97f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/QR.kt
@@ -77,7 +77,6 @@ fun MaybeScanQrCode(
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(LocalColors.current.background)
     ) {
         LocalSoftwareKeyboardController.current?.hide()
 
@@ -106,7 +105,6 @@ fun MaybeScanQrCode(
         } else {
             Column(
                 modifier = Modifier
-                    .background(color = LocalColors.current.background)
                     .fillMaxSize()
                     .padding(LocalDimensions.current.xlargeSpacing),
                 horizontalAlignment = Alignment.CenterHorizontally