diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt
index f4031833e8..e81ef0a2d5 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt
@@ -86,7 +86,7 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
     sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
   ) {
     Box(
-      modifier = Modifier.fillMaxSize()
+      modifier = Modifier.fillMaxSize().background(MaterialTheme.colors.surface)
     ) {
       ColumnWithScrollBar {
         AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING_HALF)
@@ -243,6 +243,7 @@ private fun CreateFirstProfileMobile(chatModel: ChatModel, close: () -> Unit) {
     val refocusTrigger = remember { mutableStateOf(0) }
     ModalView(
       close = { onboardingBackAction(chatModel, close) },
+      background = MaterialTheme.colors.surface,
       endButtons = { MigrateButton(refocusTrigger) }
     ) {
       val displayName = rememberSaveable { mutableStateOf("") }
@@ -321,6 +322,7 @@ private fun CreateFirstProfileDesktop(chatModel: ChatModel, close: () -> Unit) {
   CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) {
     ModalView(
       close = { onboardingBackAction(chatModel, close) },
+      background = MaterialTheme.colors.surface,
       endButtons = { MigrateButton(refocusTrigger) }
     ) {
       ColumnWithScrollBar(horizontalAlignment = Alignment.CenterHorizontally) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
index fc781d3123..f94a1dabad 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
@@ -5,6 +5,7 @@ import SectionDividerSpaced
 import SectionItemView
 import SectionView
 import SectionViewWithButton
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -192,6 +193,7 @@ fun GroupLinkLayout(
     )
   }
 
+  Box(Modifier.fillMaxSize().background(MaterialTheme.colors.surface)) {
   ColumnWithScrollBar {
     AppBarTitle(stringResource(if (isChannel) MR.strings.channel_link else MR.strings.group_link))
     Text(
@@ -298,6 +300,7 @@ fun GroupLinkLayout(
     }
     SectionBottomSpacer()
   }
+  }
 }
 
 @Composable
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt
index 6e91ad92d6..8c4e4a5339 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupProfileView.kt
@@ -100,7 +100,7 @@ fun GroupProfileLayout(
       sheetState = bottomSheetModalState,
       sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
     ) {
-      ModalView(close = closeWithAlert) {
+      ModalView(close = closeWithAlert, background = MaterialTheme.colors.surface) {
         ColumnWithScrollBar {
           Column(
             Modifier.fillMaxWidth()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt
index 9a9892647a..b4f493faef 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/WelcomeMessageView.kt
@@ -66,6 +66,7 @@ fun GroupWelcomeView(m: ChatModel, rhId: Long?, groupInfo: GroupInfo, close: ()
         else -> showUnsavedChangesAlert({ save(close) }, close)
       }
     },
+    background = MaterialTheme.colors.surface,
   ) {
     GroupWelcomeLayout(
       welcomeText,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
index 8b5ddb49c9..0f54c7cd19 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/TagListView.kt
@@ -73,6 +73,7 @@ fun TagListView(rhId: Long?, chat: Chat? = null, close: () -> Unit, reorderMode:
     }
   val topPaddingToContent = topPaddingToContent(false)
 
+  Box(Modifier.fillMaxSize().background(MaterialTheme.colors.surface)) {
   LazyColumnWithScrollBar(
     modifier = if (reorderMode) Modifier.dragContainer(dragDropState) else Modifier,
     state = listState,
@@ -169,6 +170,7 @@ fun TagListView(rhId: Long?, chat: Chat? = null, close: () -> Unit, reorderMode:
       }
     }
   }
+  }
 }
 
 @Composable
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt
index 5f5b032efa..b456334184 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddChannelView.kt
@@ -257,7 +257,7 @@ private fun ProfileStepView(
     sheetState = bottomSheetModalState,
     sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
   ) {
-    ModalView(close = close) {
+    ModalView(close = close, background = MaterialTheme.colors.surface) {
       ColumnWithScrollBar {
         AppBarTitle(generalGetString(MR.strings.create_channel_title), bottomPadding = DEFAULT_PADDING_HALF)
         Row(
@@ -405,6 +405,7 @@ private fun ProgressStepView(
 
   ModalView(
     close = { showCancelAlert() },
+    background = MaterialTheme.colors.surface,
     showClose = false,
   ) {
     ColumnWithScrollBar {
@@ -569,7 +570,7 @@ private fun LinkStepView(
       }
     }
   }
-  ModalView(close = close, showClose = false) {
+  ModalView(close = close, background = MaterialTheme.colors.surface, showClose = false) {
     GroupLinkView(
       chatModel = chatModel,
       rhId = null,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
index d57d5a251d..b0d56e0cd2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
@@ -100,7 +100,7 @@ fun AddGroupLayout(
       sheetState = bottomSheetModalState,
       sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
     ) {
-      ModalView(close = close) {
+      ModalView(close = close, background = MaterialTheme.colors.surface) {
         ColumnWithScrollBar {
           AppBarTitle(stringResource(MR.strings.create_secret_group_title), hostDevice(rhId), bottomPadding = DEFAULT_PADDING_HALF)
           Row(
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/HiddenProfileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/HiddenProfileView.kt
index 4a3806ab89..bbe00fc8b2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/HiddenProfileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/HiddenProfileView.kt
@@ -6,6 +6,7 @@ import SectionItemViewWithoutMinPadding
 import SectionSpacer
 import SectionTextFooter
 import SectionView
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -56,6 +57,7 @@ private fun HiddenProfileLayout(
   user: User,
   saveProfilePassword: (String) -> Unit
 ) {
+  Box(Modifier.fillMaxSize().background(MaterialTheme.colors.surface)) {
   ColumnWithScrollBar {
     AppBarTitle(stringResource(MR.strings.hide_profile))
     SectionView(contentPadding = PaddingValues(start = 8.dp, end = DEFAULT_PADDING)) {
@@ -82,4 +84,5 @@ private fun HiddenProfileLayout(
     SectionTextFooter(stringResource(MR.strings.to_reveal_profile_enter_password))
     SectionBottomSpacer()
   }
+  }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfileView.kt
index 45cdee6108..0a8c55ffd0 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfileView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfileView.kt
@@ -98,7 +98,7 @@ fun UserProfileLayout(
           showUnsavedChangesAlert({ saveProfile(displayName.value, fullName.value, shortDescr.value, profileImage.value) }, close)
         }
       }
-      ModalView(close = closeWithAlert) {
+      ModalView(close = closeWithAlert, background = MaterialTheme.colors.surface) {
         ColumnWithScrollBar(
           Modifier
             .padding(horizontal = DEFAULT_PADDING),
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
index d7ddb6b950..44914f18c6 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/UserProfilesView.kt
@@ -8,6 +8,7 @@ import SectionItemViewWithoutMinPadding
 import SectionSpacer
 import SectionTextFooter
 import SectionView
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -163,6 +164,7 @@ private fun UserProfilesLayout(
   unmuteUser: (User) -> Unit,
   showHiddenProfile: (User) -> Unit,
 ) {
+  Box(Modifier.fillMaxSize().background(MaterialTheme.colors.surface)) {
   ColumnWithScrollBar {
     if (profileHidden.value) {
       SectionView {
@@ -203,6 +205,7 @@ private fun UserProfilesLayout(
     }
     SectionBottomSpacer()
   }
+  }
 }
 
 @Composable
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ChatRelayView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ChatRelayView.kt
index 4e3fa3ce7d..32faf21bef 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ChatRelayView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/ChatRelayView.kt
@@ -377,7 +377,7 @@ fun ModalData.NewChatRelayView(
 
   ModalView(close = {
     addChatRelay(relayToEdit.value, userServers, serverErrors, serverWarnings, rhId, close)
-  }) {
+  }, background = MaterialTheme.colors.surface) {
     NewChatRelayLayout(relayToEdit)
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NewServerView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NewServerView.kt
index a3a843d034..e634a73c46 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NewServerView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NewServerView.kt
@@ -33,7 +33,7 @@ fun ModalData.NewServerView(
       rhId,
       close = close
     )
-  }) {
+  }, background = MaterialTheme.colors.surface) {
     Box {
       NewServerLayout(
         newServer,