diff --git a/MiniScanner/Extensions/UIImage+Images.swift b/MiniScanner/Extensions/UIImage+Images.swift
index 4bae801d8ad46385c21f7ecf763f26fa832c0656..c5a50a639a893edbdcd7cddc6fc27fd4f7adc4c5 100644
--- a/MiniScanner/Extensions/UIImage+Images.swift
+++ b/MiniScanner/Extensions/UIImage+Images.swift
@@ -11,17 +11,17 @@ import UIKit
 // MARK: - App images and icons
 extension UIImage {
     
-    static let addDocIcon = UIImage(named: "add_doc_icon")
-    static let preview = UIImage(named: "preview")
+    static let addDocIcon = UIImage(resource: .addDocIcon)
+    static let preview = UIImage(resource: .preview)
     
-    static let tabbarIPad = UIImage(named: "tabbarIpad")
-    static let tabBar = UIImage(named: "tabBar")
+    static let tabbarIPad = UIImage(resource: .tabbarIpad)
+    static let tabBar = UIImage(resource: .tabBar)
     
-    static let settings = UIImage(named: "settings")
+    static let settings = UIImage(resource: .settings)
     
-    static let resize = UIImage(named: "resize")
+    static let resize = UIImage(resource: .resize)
     
-    static let close = UIImage(named: "close")
+    static let close = UIImage(resource: .close)
 }
 
 // MARK: - Common system images and icons
diff --git a/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift b/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift
index f52711d1e6262fe81058e5f86dfa897d85d92ab8..cc3844b88c3d76aac72727d17ef9dd8009bcf898 100644
--- a/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift
+++ b/MiniScanner/Modules/Documents/Customs/CustomViews/CustomTabBarView/CustomTabBarView.swift
@@ -67,7 +67,7 @@ class CustomTabBarView: UIView {
         badgeView.layer.cornerRadius = 10
         badgeView.backgroundColor = .red
         
-        tabbarImage.image = UIDevice.current.userInterfaceIdiom == .pad ? .tabbarIPad?.withRenderingMode(.alwaysTemplate) : .tabBar?.withRenderingMode(.alwaysTemplate)
+        tabbarImage.image = UIDevice.current.userInterfaceIdiom == .pad ? .tabbarIPad.withRenderingMode(.alwaysTemplate) : .tabBar.withRenderingMode(.alwaysTemplate)
         
         tabbarImage.tintColor = .mainBackground
         
diff --git a/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift b/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
index 61ef7c1fa3ff8f6b37444b6ee57dc8f90db3f0a4..8e7042c5ca32e393a77a13be6651c6c35479b353 100644
--- a/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
+++ b/MiniScanner/Modules/Documents/Customs/CustomViews/ShareSheet/ShareSheetViewController.swift
@@ -67,7 +67,7 @@ class ShareSheetViewController: UIViewController {
         pdfImage.layer.cornerRadius = 10
         pdfImage.clipsToBounds = true
         pdfImage.contentMode = .scaleAspectFill
-        previewButton.setImage(.preview?.tint(with: .mainText), for: .normal)
+        previewButton.setImage(.preview.tint(with: .mainText), for: .normal)
         shareStackView.isHidden = !isShareShown
         shareStack_height.constant = isShareShown ? 96 : 0
         
diff --git a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift
index b2b792cf153a0a03b35effe005b2367144cda1cd..9a590974e3c4210487d19a4b72dd204057fb7f9c 100644
--- a/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift	
+++ b/MiniScanner/Supporting Files/Frameworks/FSPager/FSPagerViewCell.swift	
@@ -263,11 +263,9 @@ open class FSPagerViewCell: UICollectionViewCell {
             print("position: \(position)")
             stickerView.center = position
             stickerView.delegate = self
-            if let exitIcon = UIImage.close,
-               let rotateIcon =  UIImage.resize {
-                stickerView.setImage(exitIcon, forHandler: StickerViewHandler.close)
-                stickerView.setImage(rotateIcon, forHandler: StickerViewHandler.rotate)
-            }
+            
+            stickerView.setImage(.close, forHandler: StickerViewHandler.close)
+            stickerView.setImage(.resize, forHandler: StickerViewHandler.rotate)
             
             stickerView.showEditing = false
             stickerView.transform = stickerView.transform.rotated(by: CGFloat(rotation))