diff --git a/MiniScanner/Features/Common/Data/Repositories/SettingsRepository.swift b/MiniScanner/Features/Common/Data/Repositories/SettingsRepository.swift
index 97592234e609468058dddd11f2f0bc67a9f6cade..21dec49776d298eccfb55ccddbffeba0721aea85 100644
--- a/MiniScanner/Features/Common/Data/Repositories/SettingsRepository.swift
+++ b/MiniScanner/Features/Common/Data/Repositories/SettingsRepository.swift
@@ -85,12 +85,36 @@ extension SettingsRepository {
 
 extension SettingsRepository {
     
-    func handleColorScheme() {
+    private func handleColorScheme() {
         let colorScheme = getColorScheme()
         changeAppColorScheme(to: colorScheme)
     }
     
-    func handleUISettings() {
+    private func handleUISettings() {
+        handleNavigationBarAppearace()
         
+        handleToolBarAppearace()
+        
+        handleButtonAppearace()
+    }
+    
+    private func handleNavigationBarAppearace() {
+        let navigationBarAppearace = UINavigationBar.appearance()
+        
+        navigationBarAppearace.tintColor = .tintColor
+        navigationBarAppearace.barTintColor = .barTintColor
+    }
+    
+    private func handleToolBarAppearace() {
+        
+        let toolBarAppearace = UIToolbar.appearance()
+        
+        toolBarAppearace.tintColor = .tintColor
+        toolBarAppearace.barTintColor = .barTintColor
+    }
+    
+    private func handleButtonAppearace() {
+        let buttonAppearance = UIButton.appearance()
+        buttonAppearance.tintColor = .tintColor
     }
 }
diff --git a/MiniScanner/Supporting Files/AppDelegate.swift b/MiniScanner/Supporting Files/AppDelegate.swift
index 41a76942f4fcce19d34b92f65f84b0ca76af9b96..70aded35d889d6eb43c37cb05abcffd44a11106e 100644
--- a/MiniScanner/Supporting Files/AppDelegate.swift	
+++ b/MiniScanner/Supporting Files/AppDelegate.swift	
@@ -11,7 +11,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
       
       initializeDependencies()
       
-      ThemeManager.shared.setupTheme()
       if let savedFolders = UserDefaults.standard.object(forKey: "folders") as? Data {
           print("nooo!!")
       } else {