diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt
index d0f3ccf556..32006db9be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt
@@ -6,11 +6,8 @@
 package org.thoughtcrime.securesms.banner
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
@@ -45,7 +42,7 @@ class BannerManager(allFlows: Iterable<Flow<Banner>>) {
         val state = combinedFlow.collectAsStateWithLifecycle(initialValue = emptyList())
 
         state.value.firstOrNull()?.let {
-          Box(modifier = Modifier.padding(8.dp)) {
+          Box {
             it.DisplayBanner()
           }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt b/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt
index ade6a86122..e12bfb86fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/banner/ui/compose/DefaultBanner.kt
@@ -53,6 +53,7 @@ fun DefaultBanner(
 ) {
   Box(
     modifier = Modifier
+      .padding(horizontal = 12.dp, vertical = 8.dp)
       .background(
         color = when (importance) {
           Importance.NORMAL -> MaterialTheme.colorScheme.surface
@@ -74,8 +75,8 @@ fun DefaultBanner(
         Row(modifier = Modifier.fillMaxWidth()) {
           Column(
             modifier = Modifier
-              .padding(12.dp)
               .weight(1f)
+              .padding(start = 16.dp, top = 16.dp)
           ) {
             if (title.isNotNullOrBlank()) {
               Text(
@@ -123,24 +124,27 @@ fun DefaultBanner(
             }
           }
 
-          if (onDismissListener != null) {
-            IconButton(
-              onClick = {
-                onHideListener?.invoke()
-                onDismissListener()
-              },
-              modifier = Modifier.size(48.dp)
-            ) {
-              Icon(
-                painter = painterResource(id = R.drawable.symbol_x_24),
-                contentDescription = stringResource(id = R.string.InviteActivity_cancel)
-              )
+          Box(modifier = Modifier.size(48.dp)) {
+            if (onDismissListener != null) {
+              IconButton(
+                onClick = {
+                  onHideListener?.invoke()
+                  onDismissListener()
+                },
+                modifier = Modifier.size(48.dp)
+              ) {
+                Icon(
+                  painter = painterResource(id = R.drawable.symbol_x_24),
+                  contentDescription = stringResource(id = R.string.InviteActivity_cancel)
+                )
+              }
             }
           }
         }
         Row(
           horizontalArrangement = Arrangement.End,
           modifier = Modifier.fillMaxWidth()
+            .padding(end = 8.dp)
         ) {
           for (action in actions) {
             TextButton(onClick = action.onClick) {