diff --git a/MiniScanner/Extensions/UIImage+Images.swift b/MiniScanner/Extensions/UIImage+Images.swift
index db086548c4463e0724fb6c04075df1a89cdf3e86..255f457f4bdfb87b82262e4220bcdde269fa9a3c 100644
--- a/MiniScanner/Extensions/UIImage+Images.swift
+++ b/MiniScanner/Extensions/UIImage+Images.swift
@@ -16,4 +16,16 @@ extension UIImage {
 // MARK: - Common system images and icons
 extension UIImage {
     
+    static let chevronLeft = UIImage(systemName: "chevron.left")
+    static let chevronRight = UIImage(systemName: "chevron.right")
+    
+    static let trash = UIImage(systemName: "trash")
+    static let trashFill = UIImage(systemName: "trash.fill")
+    
+    static let squareAndPencil = UIImage(systemName: "square.and.pencil")
+    
+    static let eye = UIImage(systemName: "eye")
+    
+    static let camera = UIImage(systemName: "camera")
+    static let photo = UIImage(systemName: "photo")
 }
diff --git a/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift b/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift
index ba32961536b3f22931673c5bc45ca97a50869884..bc62fb3c0767c948475031e988a08c18f9bf1774 100644
--- a/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift
+++ b/MiniScanner/Features/Settings/Presentation/SettingsViewModel.swift
@@ -102,10 +102,7 @@ extension SettingsViewModel2 {
         
         let navigationController = coordinator.navigationController
         
-        let chevronLeft = UIImage(systemName: "chevron.left")
-        let chevronRight = UIImage(systemName: "chevron.right")
-        
-        let backImage = SupportedLanguage.currentLanguage.layoutDirection == .leftToRight ? chevronLeft : chevronRight
+        let backImage: UIImage? = SupportedLanguage.currentLanguage.layoutDirection == .leftToRight ? .chevronLeft : .chevronRight
         
         navigationController.navigationBar.backIndicatorImage = backImage
         navigationController.navigationBar.backIndicatorTransitionMaskImage = backImage
diff --git a/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift b/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
index c8364cc7727673415e7edb03b2fd1d054a66b303..7b3b977e077f7046adea1713f9630a3c6f7bd011 100644
--- a/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
+++ b/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
@@ -104,11 +104,11 @@ final class DocumentPreviewViewController: UIViewController {
         })
         
         alertController.addAction(cameraAction)
-        cameraAction.setValue(UIImage(systemName: "camera"), forKey: "image")
+        cameraAction.setValue(UIImage.camera, forKey: "image")
         cameraAction.setValue(CATextLayerAlignmentMode.left, forKey: "titleTextAlignment")
         
         alertController.addAction(galleryAction)
-        galleryAction.setValue(UIImage(systemName: "photo"), forKey: "image")
+        galleryAction.setValue(UIImage.photo, forKey: "image")
         galleryAction.setValue(CATextLayerAlignmentMode.left, forKey: "titleTextAlignment")
         
         alertController.addAction(UIAlertAction(title: .cancel.localized, style: .cancel, handler: nil))
diff --git a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
index df7b6840d50dfddc510a07fdede94aae95354de9..bf853e92c201b0ad8baa91030d74e4f657d39a90 100644
--- a/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
+++ b/MiniScanner/Modules/Documents/DocumentsTableViewController.swift
@@ -260,7 +260,7 @@ final class DocumentsTableViewController: UIViewController, UITableViewDelegate,
             completionHandler(true)
         }
         trash.backgroundColor = .systemRed
-        trash.image = UIImage(systemName: "trash")?.tint(with: .white)
+        trash.image = .trash?.tint(with: .white)
         
         // Rename action
         let rename = UIContextualAction(style: .normal,
@@ -269,7 +269,7 @@ final class DocumentsTableViewController: UIViewController, UITableViewDelegate,
             completionHandler(true)
         }
         rename.backgroundColor = UIColor.black.withAlphaComponent(0.5)
-        rename.image = UIImage(systemName: "square.and.pencil")?.tint(with: .white)
+        rename.image = .squareAndPencil?.tint(with: .white)
         
         let move = UIContextualAction(style: .normal,
                                       title: .move.localized) { [weak self] (_, _, completionHandler) in
@@ -635,10 +635,7 @@ extension DocumentsTableViewController {
         
         let navigationController = navigationController!
         
-        let chevronLeft = UIImage(systemName: "chevron.left")
-        let chevronRight = UIImage(systemName: "chevron.right")
-        
-        let backImage = SupportedLanguage.currentLanguage.layoutDirection == .leftToRight ? chevronLeft : chevronRight
+        let backImage: UIImage? = SupportedLanguage.currentLanguage.layoutDirection == .leftToRight ? .chevronLeft : .chevronRight
         
         navigationController.navigationBar.backIndicatorImage = backImage
         navigationController.navigationBar.backIndicatorTransitionMaskImage = backImage
diff --git a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
index 0f4213677d8d40c8dbe898332eb89fa02c7c9df0..27a03d10548120f1fed817b8a87ce1ae3a527d90 100644
--- a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift	
+++ b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift	
@@ -99,7 +99,7 @@ open class FSPagerViewCell: UICollectionViewCell {
         
         trashButton = UIButton(frame: CGRect(x: xPosition, y: Int(yPosition), width: 50, height: 50)) // Adjust frame as needed
         self.contentView.addSubview(trashButton) // Add the button to the cell's contentView
-        trashButton.setImage(UIImage(systemName: "trash.fill"), for: .normal)
+        trashButton.setImage(.trashFill, for: .normal)
         trashButton.addTarget(self, action: #selector(topLeftButtonTapped), for: .touchUpInside) // Set the button action
         trashButton.tintColor = .red
         
@@ -109,7 +109,7 @@ open class FSPagerViewCell: UICollectionViewCell {
         
         previewButton = UIButton(frame: CGRect(x: Int(previewXPosition), y: Int(previewYPosition), width: 50, height: 50)) // Adjust frame as needed
         self.contentView.addSubview(previewButton) // Add the button to the cell's contentView
-        previewButton.setImage(UIImage(systemName: "eye"), for: .normal)
+        previewButton.setImage(.eye, for: .normal)
         previewButton.addTarget(self, action: #selector(imagePreview), for: .touchUpInside) // Set the button action
         previewButton.tintColor = .red
         imageView.contentMode = .scaleAspectFit