diff --git a/apps/chanora_flutter/lib/main.dart b/apps/chanora_flutter/lib/main.dart
index aa44e44..5a71737 100644
--- a/apps/chanora_flutter/lib/main.dart
+++ b/apps/chanora_flutter/lib/main.dart
@@ -2147,36 +2147,15 @@ class _SnapshotView extends StatelessWidget {
               ),
               title: Text(ch.name),
               subtitle: Text('id=${ch.id}  parent=${ch.parent}'),
-              trailing: ch.id == currentVoiceChannelId
-                  ? null
-                  : Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        if (ch.hasPassword)
-                          IconButton(
-                            icon: const Icon(Icons.lock_outline),
-                            tooltip: l10n.channelPasswordTitle,
-                            onPressed: hasJoinPending
-                                ? null
-                                : () => onJoinChannelWithPassword(ch),
-                          ),
-                        if (!ch.hasPassword)
-                          IconButton(
-                            icon: Icon(
-                              ch.id == pendingVoiceChannelId
-                                  ? Icons.hourglass_top
-                                  : Icons.login,
-                            ),
-                            tooltip: ch.id == pendingVoiceChannelId
-                                ? l10n.statusConnecting
-                                : l10n.joinChannelAction,
-                            onPressed:
-                                hasJoinPending || ch.id == pendingVoiceChannelId
-                                ? null
-                                : () => onJoinChannel(ch),
-                          ),
-                      ],
-                    ),
+              trailing: ch.hasPassword && ch.id != currentVoiceChannelId
+                  ? Tooltip(
+                      message: l10n.channelPasswordTitle,
+                      child: Icon(
+                        Icons.lock_outline,
+                        color: theme.colorScheme.onSurfaceVariant,
+                      ),
+                    )
+                  : null,
               selected: ch.id == currentVoiceChannelId,
               onTap:
                   hasJoinPending ||