diff --git a/ShhShell/Views/Hosts/ConnectionView.swift b/ShhShell/Views/Hosts/ConnectionView.swift
index f043780..0e133f3 100644
--- a/ShhShell/Views/Hosts/ConnectionView.swift
+++ b/ShhShell/Views/Hosts/ConnectionView.swift
@@ -111,11 +111,6 @@ Hostkey fingerprint is \(handler.getHostkey() ?? "nil")
 """)
 				}
 			}
-			.popover(isPresented: $showIconPicker, attachmentAnchor: .point(.topTrailing), arrowEdge: .top) {
-				HostIconPicker(host: $handler.host)
-					.frame(minWidth: 300, minHeight: 200)
-					.modifier(presentationCompactPopover())
-			}
 			.toolbar {
 				ToolbarItem {
 					Button() {
@@ -124,6 +119,11 @@ Hostkey fingerprint is \(handler.getHostkey() ?? "nil")
 						HostSymbolPreview(symbol: handler.host.symbol, label: handler.host.label, small: true)
 							.id(handler.host)
 					}
+					.popover(isPresented: $showIconPicker) {
+						HostIconPicker(host: $handler.host)
+							.frame(minWidth: 300, minHeight: 200)
+							.modifier(presentationCompactPopover())
+					}
 				}
 				
 				ToolbarItem() {
diff --git a/ShhShell/Views/Terminal/ShellTabView.swift b/ShhShell/Views/Terminal/ShellTabView.swift
index 99d567c..11537b4 100644
--- a/ShhShell/Views/Terminal/ShellTabView.swift
+++ b/ShhShell/Views/Terminal/ShellTabView.swift
@@ -91,8 +91,6 @@ struct ShellTabView: View {
 							}
 							.frame(minWidth: 300, minHeight: 400)
 							.modifier(presentationCompactPopover())
-//							.presentationDragIndicator(.visible)
-//							.presentationDetents([.fraction(0.4), .large])
 						}
 					}
 					.padding(.horizontal, 10)