diff --git a/DNSecure/Views/ContentView.swift b/DNSecure/Views/ContentView.swift
index 2c83307..cb1becd 100644
--- a/DNSecure/Views/ContentView.swift
+++ b/DNSecure/Views/ContentView.swift
@@ -267,7 +267,7 @@ extension ContentView: View {
     }
 
     @ToolbarContentBuilder private var toolbarContent: some ToolbarContent {
-        ToolbarItem(placement: .navigationBarLeading) {
+        ToolbarItem(placement: .topBarLeading) {
             Menu {
                 Button("DNS-over-TLS", action: self.addNewDoTServer)
                 Button("DNS-over-HTTPS", action: self.addNewDoHServer)
@@ -275,7 +275,7 @@ extension ContentView: View {
                 Image(systemName: "plus")
             }
         }
-        ToolbarItem(placement: .navigationBarTrailing) {
+        ToolbarItem(placement: .topBarTrailing) {
             EditButton()
         }
         ToolbarItem(placement: .status) {
@@ -283,7 +283,7 @@ extension ContentView: View {
                 HStack {
                     Circle()
                         .frame(width: 10, height: 10)
-                        .foregroundColor(self.isEnabled ? .green : .secondary)
+                        .foregroundStyle(self.isEnabled ? .green : .secondary)
                     Text(self.isEnabled ? "Active" : "Inactive")
                     #if targetEnvironment(macCatalyst)
                         Text("-")
@@ -307,7 +307,7 @@ extension ContentView: View {
             VStack(alignment: .leading) {
                 Text(self.servers[i].name)
                 Text(self.servers[i].configuration.description)
-                    .foregroundColor(.secondary)
+                    .foregroundStyle(.secondary)
             }
             if self.usedID == self.servers[i].id.uuidString {
                 Spacer()
diff --git a/DNSecure/Views/LazyTextField.swift b/DNSecure/Views/LazyTextField.swift
index 28cc261..9621fd1 100644
--- a/DNSecure/Views/LazyTextField.swift
+++ b/DNSecure/Views/LazyTextField.swift
@@ -30,7 +30,7 @@ extension LazyTextField: View {
                     self.text.removeAll()
                 } label: {
                     Image(systemName: "xmark.circle.fill")
-                        .foregroundColor(.primary)
+                        .foregroundStyle(Color.primary)
                         .opacity(0.2)
                 }
                 .buttonStyle(.borderless)