From dfa20ea4c6124912db5a45fca4176140dee6a47f Mon Sep 17 00:00:00 2001
From: Balazs Perlaki-Horvath <ba.perlaki@gmail.com>
Date: Sat, 27 Jul 2024 15:17:33 +0200
Subject: [PATCH] Fix Accessibility of icons when large text is set

---
 App/CompactViewController.swift       | 42 +++++++++++++--------------
 Views/Buttons/NavigationButtons.swift | 11 ++-----
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/App/CompactViewController.swift b/App/CompactViewController.swift
index 83856046c..30c6c1c91 100644
--- a/App/CompactViewController.swift
+++ b/App/CompactViewController.swift
@@ -130,31 +130,31 @@ private struct CompactView: View {
                 .id(tabID)
                 .toolbar {
                     ToolbarItemGroup(placement: .bottomBar) {
-                        HStack {
-                            NavigationButtons()
-                            Spacer()
-                            OutlineButton()
-                            Spacer()
-                            BookmarkButton()
-                            Spacer()
-                            ExportButton()
-                            Spacer()
-                            TabsManagerButton()
-                            if FeatureFlags.hasLibrary {
-                                Spacer()
-                                Button {
-                                    presentedSheet = .library
-                                } label: {
-                                    Label("common.tab.menu.library".localized, systemImage: "folder")
-                                }
-                            }
-                            Spacer()
+                        Spacer()
+                        NavigationButtons()
+                        Spacer()
+                        OutlineButton()
+                        Spacer()
+                        BookmarkButton()
+                        Spacer()
+                        ExportButton()
+                        Spacer()
+                        TabsManagerButton()
+                        Spacer()
+                        if FeatureFlags.hasLibrary {
                             Button {
-                                presentedSheet = .settings
+                                presentedSheet = .library
                             } label: {
-                                Label("common.tab.menu.settings".localized, systemImage: "gear")
+                                Label("common.tab.menu.library".localized, systemImage: "folder")
                             }
+                            Spacer()
+                        }
+                        Button {
+                            presentedSheet = .settings
+                        } label: {
+                            Label("common.tab.menu.settings".localized, systemImage: "gear")
                         }
+                        Spacer()
                     }
                 }
                 .environmentObject(BrowserViewModel.getCached(tabID: tabID))
diff --git a/Views/Buttons/NavigationButtons.swift b/Views/Buttons/NavigationButtons.swift
index 3ad552113..37d8fc19c 100644
--- a/Views/Buttons/NavigationButtons.swift
+++ b/Views/Buttons/NavigationButtons.swift
@@ -21,14 +21,9 @@ struct NavigationButtons: View {
     @EnvironmentObject private var browser: BrowserViewModel
 
     var body: some View {
-        if horizontalSizeClass == .regular {
-            goBackButton
-            goForwardButton
-        } else {
-            goBackButton
-            Spacer()
-            goForwardButton
-        }
+        goBackButton
+        Spacer()
+        goForwardButton
     }
 
     var goBackButton: some View {