diff --git a/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift b/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift
index a3d0f291ca63fc55e1cbf7b648f53dd659741809..ba32961536b3f22931673c5bc45ca97a50869884 100644
--- a/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift
+++ b/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift
@@ -94,5 +94,20 @@ extension SettingsViewModel2 {
         
         navigationController.tabBarController?.tabBar.semanticContentAttribute = semanticContentAttribute
         navigationController.navigationBar.semanticContentAttribute = semanticContentAttribute
+        
+        handleBackIcon()
+    }
+    
+    private func handleBackIcon() {
+        
+        let navigationController = coordinator.navigationController
+        
+        let chevronLeft = UIImage(systemName: "chevron.left")
+        let chevronRight = UIImage(systemName: "chevron.right")
+        
+        let backImage = SupportedLanguage.currentLanguage.layoutDirection == .leftToRight ? chevronLeft : chevronRight
+        
+        navigationController.navigationBar.backIndicatorImage = backImage
+        navigationController.navigationBar.backIndicatorTransitionMaskImage = backImage
     }
 }
diff --git a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
index 23fab39643f54d2697a929e79a93fd3c6813fec9..39b93ae164ed6b12d4743ebea974cb10bd77814c 100644
--- a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
+++ b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
@@ -121,6 +121,8 @@ final class DocumentsTableViewController: UIViewController, UITableViewDelegate,
         scanSession?.removeAll()
         self.tabBarController?.tabBar.isHidden = false
         fetchViewModels()
+        
+        handleBackIcon()
     }
     
     deinit {
@@ -623,3 +625,19 @@ extension DocumentsTableViewController: FoldersViewControllerDelegate {
         }
     }
 }
+
+extension DocumentsTableViewController {
+    
+    private func handleBackIcon() {
+        
+        let navigationController = navigationController!
+        
+        let chevronLeft = UIImage(systemName: "chevron.left")
+        let chevronRight = UIImage(systemName: "chevron.right")
+        
+        let backImage = SupportedLanguage.currentLanguage.layoutDirection == .leftToRight ? chevronLeft : chevronRight
+        
+        navigationController.navigationBar.backIndicatorImage = backImage
+        navigationController.navigationBar.backIndicatorTransitionMaskImage = backImage
+    }
+}