diff --git a/assets/icons/settings2.svg b/assets/icons/settings2.svg
new file mode 100644
index 0000000..0726097
--- /dev/null
+++ b/assets/icons/settings2.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M13 19.25H5.95C4.82989 19.25 4.26984 19.25 3.84202 19.032C3.46569 18.8403 3.15973 18.5343 2.96799 18.158C2.75 17.7302 2.75 17.1701 2.75 16.05V7.95C2.75 6.82989 2.75 6.26984 2.96799 5.84202C3.15973 5.46569 3.46569 5.15973 3.84202 4.96799C4.26984 4.75 4.8299 4.75 5.95 4.75H18.05C19.1701 4.75 19.7302 4.75 20.158 4.96799C20.5343 5.15973 20.8403 5.46569 21.032 5.84202C21.25 6.26984 21.25 6.8299 21.25 7.95V11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M3 5.63635L10.9761 10.3898C11.6069 10.7657 12.3931 10.7657 13.0239 10.3898L21 5.63635" stroke="currentColor" stroke-width="1.5"/><path d="M21.8148 15.375L21.1669 15.7491M16.1856 18.625L16.8335 18.2509M21.8147 18.625L21.1669 18.251M16.1855 15.375L16.8335 15.7491M19.0002 20.25L19.0002 19.4375M19.0002 13.75V14.5625M21.1669 17C21.1669 16.6053 21.0613 16.2352 20.8769 15.9165C20.5022 15.269 19.8021 14.8333 19.0002 14.8333C18.1983 14.8333 17.4981 15.269 17.1235 15.9165C16.9391 16.2352 16.8335 16.6053 16.8335 17C16.8335 17.3947 16.9391 17.7648 17.1235 18.0835C17.4982 18.731 18.1983 19.1667 19.0002 19.1667C19.8021 19.1667 20.5022 18.731 20.8769 18.0835C21.0613 17.7648 21.1669 17.3947 21.1669 17Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/crates/chat_ui/src/lib.rs b/crates/chat_ui/src/lib.rs
index d998a3d..5de1a90 100644
--- a/crates/chat_ui/src/lib.rs
+++ b/crates/chat_ui/src/lib.rs
@@ -40,10 +40,13 @@ use crate::text::RenderedText;
 mod actions;
 mod text;
 
+const ANNOUNCEMENT: &str =
+    "This conversation is private. Only members can see each other's messages.";
 const NO_INBOX: &str = "has not set up messaging relays. \
-    They will not receive your messages.";
+    They will not receive messages you send.";
 const NO_ANNOUNCEMENT: &str = "has not set up an encryption key. \
-    You cannot send messages encrypted with an encryption key to them yet.";
+    You cannot send messages encrypted with an encryption key to them yet. \
+    Coop automatically uses your identity to encrypt messages.";
 
 pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity<ChatPanel> {
     cx.new(|cx| ChatPanel::new(room, window, cx))
@@ -169,9 +172,9 @@ impl ChatPanel {
         // Run the connect task in background
         self.tasks.push(connect);
 
-        // Spawn another task to verify after 2 seconds
+        // Spawn another task to verify after 3 seconds
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor().timer(Duration::from_secs(2)).await;
+            cx.background_executor().timer(Duration::from_secs(3)).await;
 
             // Verify the connection
             this.update_in(cx, |this, _window, cx| {
@@ -632,9 +635,6 @@ impl ChatPanel {
     }
 
     fn render_announcement(&self, ix: usize, cx: &Context<Self>) -> AnyElement {
-        const MSG: &str =
-            "This conversation is private. Only members can see each other's messages.";
-
         v_flex()
             .id(ix)
             .h_40()
@@ -653,19 +653,19 @@ impl ChatPanel {
                     .size_12()
                     .text_color(cx.theme().ghost_element_active),
             )
-            .child(SharedString::from(MSG))
+            .child(SharedString::from(ANNOUNCEMENT))
             .into_any_element()
     }
 
     fn render_warning(&self, ix: usize, content: SharedString, cx: &Context<Self>) -> AnyElement {
         div()
             .id(ix)
-            .relative()
             .w_full()
             .py_2()
             .px_3()
             .child(
                 h_flex()
+                    .w_full()
                     .gap_3()
                     .text_sm()
                     .child(
@@ -679,7 +679,7 @@ impl ChatPanel {
                             .child(Icon::new(IconName::Warning).small()),
                     )
                     .child(
-                        h_flex()
+                        div()
                             .flex_1()
                             .w_full()
                             .flex_initial()
@@ -687,15 +687,6 @@ impl ChatPanel {
                             .child(content),
                     ),
             )
-            .child(
-                div()
-                    .absolute()
-                    .left_0()
-                    .top_0()
-                    .w(px(2.))
-                    .h_full()
-                    .bg(cx.theme().warning_active),
-            )
             .into_any_element()
     }
 
@@ -1223,10 +1214,11 @@ impl ChatPanel {
                 (this.config().backup(), this.config().signer_kind().clone())
             })
             .ok()
-            .unwrap_or_default();
+            .unwrap_or((true, SignerKind::default()));
 
         Button::new("encryption")
-            .icon(IconName::Settings)
+            .icon(IconName::Settings2)
+            .tooltip("Configuration")
             .ghost()
             .large()
             .dropdown_menu(move |this, _window, _cx| {
diff --git a/crates/ui/src/icon.rs b/crates/ui/src/icon.rs
index c596bd0..9367aa0 100644
--- a/crates/ui/src/icon.rs
+++ b/crates/ui/src/icon.rs
@@ -53,6 +53,7 @@ pub enum IconName {
     Refresh,
     Search,
     Settings,
+    Settings2,
     Sun,
     Ship,
     Shield,
@@ -119,6 +120,7 @@ impl IconNamed for IconName {
             Self::Refresh => "icons/refresh.svg",
             Self::Search => "icons/search.svg",
             Self::Settings => "icons/settings.svg",
+            Self::Settings2 => "icons/settings2.svg",
             Self::Sun => "icons/sun.svg",
             Self::Ship => "icons/ship.svg",
             Self::Shield => "icons/shield.svg",