diff --git a/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift b/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
index 1394d8d416d9d631f3651b6b26d754ea94c38164..6184bfc8dd5f10496275c006aa69b0103dcb79f3 100644
--- a/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
+++ b/MiniScanner/Modules/DocumentPreview/DocumentPreviewViewController.swift
@@ -118,6 +118,8 @@ final class DocumentPreviewViewController: UIViewController, ScanSessionSharable
         
         currentPageLabel.layer.cornerRadius = 5
         
+        currentPageLabel.clipsToBounds = true
+        
         clearSelectionButton.setTitle(.clear.localized, for: .normal)
         
         extraButton.showsMenuAsPrimaryAction = true
diff --git a/MiniScanner/Modules/DocumentPreview/ScanSessionPreview/ScanSessionPreviewViewController.swift b/MiniScanner/Modules/DocumentPreview/ScanSessionPreview/ScanSessionPreviewViewController.swift
index 6661f7753dc19cdda7da67cb019320771d4eebfe..1315b0c50f80c1e57827a3389df4035ba1ec87c9 100644
--- a/MiniScanner/Modules/DocumentPreview/ScanSessionPreview/ScanSessionPreviewViewController.swift
+++ b/MiniScanner/Modules/DocumentPreview/ScanSessionPreview/ScanSessionPreviewViewController.swift
@@ -65,6 +65,8 @@ extension ScanSessionPreviewViewController {
         
         currentPageLabel.layer.cornerRadius = 5
         
+        currentPageLabel.clipsToBounds = true
+        
         updateCurrentPageLabel()
         
         setupPagerView()
@@ -74,7 +76,7 @@ extension ScanSessionPreviewViewController {
         
         currentPageLabel.set(color: .gray600)
         
-        currentPageLabel.customLayerBackground(.gray100)
+        currentPageLabel.customBackground(.gray100)
         
         view.customBackground(.base)
         
diff --git a/MiniScanner/Modules/EditViewController/EditViewController.swift b/MiniScanner/Modules/EditViewController/EditViewController.swift
index c6f0ac8ae47da47cfbb3e2b3a005a3b874e6a912..9dfb6041e4f5e1252399805fff905d3b9fc57bbe 100644
--- a/MiniScanner/Modules/EditViewController/EditViewController.swift
+++ b/MiniScanner/Modules/EditViewController/EditViewController.swift
@@ -189,6 +189,8 @@ public class EditViewController: UIViewController, ScanSessionSharable, ScanSess
         
         pageIndex.layer.cornerRadius = 5
         
+        pageIndex.clipsToBounds = true
+        
         hideCropButtons()
     }
     
@@ -199,7 +201,7 @@ public class EditViewController: UIViewController, ScanSessionSharable, ScanSess
         nextPageButton.customTitleColor(.gray600)
         previousPageButton.customTitleColor(.gray600)
         
-        pageIndex.customLayerBackground(.gray100)
+        pageIndex.customBackground(.gray100)
         pageIndex.set(color: .gray600)
         
         rotateLeftLabel.set(color: .gray600)