diff --git a/Meshtastic/Views/Messages/ChannelList.swift b/Meshtastic/Views/Messages/ChannelList.swift
index f21a9292..5b3af8f6 100644
--- a/Meshtastic/Views/Messages/ChannelList.swift
+++ b/Meshtastic/Views/Messages/ChannelList.swift
@@ -114,6 +114,9 @@ struct ChannelList: View {
 					ForEach(channels) { (channel: ChannelEntity) in
 						if !restrictedChannels.contains(channel.name?.lowercased() ?? "") {
 							makeChannelRow(myInfo: myInfo, channel: channel)
+								.alignmentGuide(.listRowSeparatorLeading) {
+									$0[.leading]
+								}
 								.frame(height: 62)
 								.contextMenu {
 									if channel.allPrivateMessages.count > 0 {
diff --git a/Meshtastic/Views/Messages/Messages.swift b/Meshtastic/Views/Messages/Messages.swift
index 6f6c5dca..82df1ad9 100644
--- a/Meshtastic/Views/Messages/Messages.swift
+++ b/Meshtastic/Views/Messages/Messages.swift
@@ -27,39 +27,49 @@ struct Messages: View {
 		NavigationSplitView(columnVisibility: $columnVisibility) {
 			List(selection: $router.navigationState.messages) {
 				NavigationLink(value: MessagesNavigationState.channels()) {
+					Spacer()
 					Label {
 						Text("Channels")
 							.badge(unreadChannelMessages)
 							.font(.title2)
 							.padding()
 					} icon: {
-						Image(systemName: "person.3")
+						Image(systemName: "person.2")
 							.symbolRenderingMode(.hierarchical)
 							.foregroundColor(.accentColor)
 							.font(.title2)
 							.padding()
 					}
 				}
+				.alignmentGuide(.listRowSeparatorLeading) {
+					$0[.leading]
+				}
 				NavigationLink(value: MessagesNavigationState.directMessages()) {
+					Spacer()
 					Label {
 						Text("Direct Messages")
 							.badge(unreadDirectMessages)
 							.font(.title2)
 							.padding()
 					} icon: {
-						Image(systemName: "person.circle")
+						Image(systemName: "person")
 							.symbolRenderingMode(.hierarchical)
 							.foregroundColor(.accentColor)
 							.font(.title2)
 							.padding()
 					}
 				}
-
+				.alignmentGuide(.listRowSeparatorLeading) {
+					$0[.leading]
+				}
+				Spacer()
 				TipView(MessagesTip(), arrowEdge: .top)
 					.tipViewStyle(PersistentTip())
-					.tipBackground(colorScheme == .dark ? Color(.systemBackground) : Color(.secondarySystemBackground))
+					.listRowSeparator(.hidden)
+				Spacer()
 					.listRowSeparator(.hidden)
 			}
+			.listStyle(.plain)
 			.navigationTitle("Messages")
 			.navigationBarTitleDisplayMode(.large)
 			.navigationBarItems(leading: MeshtasticLogo())
diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
index b7119f72..c41a2391 100644
--- a/Meshtastic/Views/Messages/UserList.swift
+++ b/Meshtastic/Views/Messages/UserList.swift
@@ -112,6 +112,9 @@ struct UserList: View {
 						}
 					}
 					.frame(height: 62)
+					.alignmentGuide(.listRowSeparatorLeading) {
+						$0[.leading]
+					}
 					.contextMenu {
 						Button {
 							if node != nil && !(user.userNode?.favorite ?? false) {