diff --git a/ApplicationLibrary/Views/Abstract/NavigationButtonsView.swift b/ApplicationLibrary/Views/Abstract/NavigationButtonsView.swift
index ff4c998..b27f17b 100644
--- a/ApplicationLibrary/Views/Abstract/NavigationButtonsView.swift
+++ b/ApplicationLibrary/Views/Abstract/NavigationButtonsView.swift
@@ -35,7 +35,7 @@ public struct NavigationButtonsView: View {
 
     #if os(tvOS)
         private var tvOSBody: some View {
-            HStack {
+            Group {
                 if showConnectionsButton {
                     Button {
                         onConnectionsTap()
diff --git a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
index 33df537..d4c3d2a 100644
--- a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
+++ b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
@@ -243,7 +243,7 @@ import SwiftUI
 
         @ToolbarContentBuilder private var toolbar: some ToolbarContent {
             #if os(tvOS)
-                ToolbarItem(placement: .topBarLeading) {
+            ToolbarItemGroup(placement: .topBarLeading) {
                     navigationButtons
                 }
             #endif
@@ -312,7 +312,7 @@ import SwiftUI
                 Button {
                     showCardManagement = true
                 } label: {
-                    Image(systemName: "line.3.horizontal.circle")
+                    Image(systemName: "square.grid.2x2")
                 }
             #endif
         }
diff --git a/ApplicationLibrary/Views/Dashboard/Cards/CardManagementSheet.swift b/ApplicationLibrary/Views/Dashboard/Cards/CardManagementSheet.swift
index 02d21cf..443d57f 100644
--- a/ApplicationLibrary/Views/Dashboard/Cards/CardManagementSheet.swift
+++ b/ApplicationLibrary/Views/Dashboard/Cards/CardManagementSheet.swift
@@ -143,7 +143,7 @@ import SwiftUI
             }
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) {
-                    TVToolbarButton(title: "Reset") {
+                    TVToolbarButton(title:  String(localized: "Reset")) {
                         Task {
                             await configuration.resetToDefault()
                         }
diff --git a/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift b/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift
index a9fc8aa..33a0f72 100644
--- a/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift
+++ b/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift
@@ -139,7 +139,7 @@ struct ProfilePickerSheet: View {
             .environment(\.editMode, $editMode)
             .toolbar {
                 ToolbarItem(placement: .confirmationAction) {
-                    TVToolbarButton(title: editMode.isEditing ? "Done" : "Edit") {
+                    TVToolbarButton(title: editMode.isEditing ?  String(localized: "Done"):  String(localized: "Edit")) {
                         withAnimation {
                             if editMode.isEditing {
                                 movingProfileID = nil