diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt
index 2f634ab0ad..72704a011a 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt
@@ -10,7 +10,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
@@ -128,15 +128,16 @@ fun SetSimplexDomainView(
   ModalView(close = { onClose(close) }, cardScreen = true) {
     ColumnWithScrollBar {
       AppBarTitle(title)
-      SectionView {
-        if (editing.value) {
-          TextEditor(
-            name,
-            Modifier,
-            placeholder = placeholder,
-            isValid = { isValidName(it) }
-          )
-        } else {
+      if (editing.value) {
+        SectionView(
+          "",
+          icon = painterResource(MR.images.ic_error),
+          iconTint = if (isValid) Color.Transparent else MaterialTheme.colors.error,
+        ) {
+          PlainTextEditor(name, placeholder = placeholder)
+        }
+      } else {
+        SectionView {
           SectionItemViewSpaceBetween(click = {
             clipboard.setText(AnnotatedString(name.value))
             showToast(generalGetString(MR.strings.copied))
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
index 556c7270cc..8241422d0a 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt
@@ -495,8 +495,8 @@ fun SocksProxySettings(
         UseOnionHosts(onionHosts, rememberUpdatedState(networkUseSocksProxy && proxyAuthRandomUnsaved.value)) {
           onionHosts.value = it
         }
-        SectionTextFooter(annotatedStringResource(MR.strings.disable_onion_hosts_when_not_supported))
       }
+      SectionTextFooter(annotatedStringResource(MR.strings.disable_onion_hosts_when_not_supported))
 
       SectionDividerSpaced()
 
@@ -526,8 +526,8 @@ fun SocksProxySettings(
             )
           }
         }
-        SectionTextFooter(proxyAuthFooter(usernameUnsaved.value.text, passwordUnsaved.value.text, proxyAuthModeUnsaved.value, sessionMode))
       }
+      SectionTextFooter(proxyAuthFooter(usernameUnsaved.value.text, passwordUnsaved.value.text, proxyAuthModeUnsaved.value, sessionMode))
 
       SectionDividerSpaced()