diff --git a/focus-ios/Blockzilla/Utilities/FindInPageBar.swift b/focus-ios/Blockzilla/Utilities/FindInPageBar.swift
index b5f96149e7..c1987af6d2 100644
--- a/focus-ios/Blockzilla/Utilities/FindInPageBar.swift
+++ b/focus-ios/Blockzilla/Utilities/FindInPageBar.swift
@@ -77,18 +77,20 @@ class FindInPageBar: UIView {
         matchCountView.accessibilityIdentifier = "FindInPage.matchCount"
         addSubview(matchCountView)
 
-        previousButton.setImage(UIImage(named: "find_previous"), for: [])
+        previousButton.setImage(.findPrevious, for: [])
         previousButton.setTitleColor(.white, for: [])
         previousButton.accessibilityLabel = UIConstants.strings.findInPagePreviousLabel
         previousButton.addTarget(self, action: #selector(didFindPrevious), for: .touchUpInside)
         previousButton.accessibilityIdentifier = "FindInPage.find_previous"
+        previousButton.isEnabled = false
         addSubview(previousButton)
 
-        nextButton.setImage(UIImage(named: "find_next"), for: [])
+        nextButton.setImage(.findNext, for: [])
         nextButton.setTitleColor(.white, for: [])
         nextButton.accessibilityLabel = UIConstants.strings.findInPageNextLabel
         nextButton.addTarget(self, action: #selector(didFindNext), for: .touchUpInside)
         nextButton.accessibilityIdentifier = "FindInPage.find_next"
+        nextButton.isEnabled = false
         addSubview(nextButton)
 
         let closeButton = UIButton()
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/Contents.json b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/Contents.json
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/Contents.json
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/Contents.json
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_next.imageset/Contents.json b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_next.imageset/Contents.json
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_next.imageset/Contents.json
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_next.imageset/Contents.json
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_next.imageset/Find Next.pdf b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_next.imageset/Find Next.pdf
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_next.imageset/Find Next.pdf
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_next.imageset/Find Next.pdf
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_next.imageset/find_next.pdf b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_next.imageset/find_next.pdf
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_next.imageset/find_next.pdf
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_next.imageset/find_next.pdf
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_previous.imageset/Contents.json b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_previous.imageset/Contents.json
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_previous.imageset/Contents.json
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_previous.imageset/Contents.json
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_previous.imageset/Find Previous.pdf b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_previous.imageset/Find Previous.pdf
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_previous.imageset/Find Previous.pdf
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_previous.imageset/Find Previous.pdf
diff --git a/focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_previous.imageset/find_previous.pdf b/focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_previous.imageset/find_previous.pdf
similarity index 100%
rename from focus-ios/Blockzilla/Assets.xcassets/Find In Page/find_previous.imageset/find_previous.pdf
rename to focus-ios/BlockzillaPackage/Sources/DesignSystem/Assets.xcassets/FindInPage/find_previous.imageset/find_previous.pdf
diff --git a/focus-ios/BlockzillaPackage/Sources/DesignSystem/UIImage+AppImages.swift b/focus-ios/BlockzillaPackage/Sources/DesignSystem/UIImage+AppImages.swift
index 15aea7c41f..26447e93e1 100644
--- a/focus-ios/BlockzillaPackage/Sources/DesignSystem/UIImage+AppImages.swift
+++ b/focus-ios/BlockzillaPackage/Sources/DesignSystem/UIImage+AppImages.swift
@@ -46,4 +46,8 @@ public extension UIImage {
     static let delete = UIImage(named: "icon_delete")!
     static let hamburgerMenu = UIImage(named: "icon_hamburger_menu")!
     static let stopMenu = UIImage(named: "icon_stop_menu")!
+
+    // MARK: Find In Page
+    static let findPrevious = UIImage(named: "find_previous")!
+    static let findNext = UIImage(named: "find_next")!
 }