diff --git a/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift b/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift
index 7a0c8bbda..d5d893611 100644
--- a/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift
+++ b/Client/Frontend/Browser/Onboarding/OnboardingAdsCountdownView.swift
@@ -110,14 +110,12 @@ extension OnboardingAdsCountdownViewController {
             addSubview(imageView)
             addSubview(mainStackView)
             mainStackView.snp.makeConstraints {
-                $0.leading.equalTo(self.safeArea.leading)
-                $0.trailing.equalTo(self.safeArea.trailing)
-                $0.bottom.equalTo(self.safeArea.bottom)
+                $0.leading.trailing.bottom.equalToSuperview()
             }
             
             descriptionView.addSubview(descriptionStackView)
             descriptionStackView.snp.makeConstraints {
-                $0.edges.equalToSuperview().inset(UX.descriptionContentInset)
+                $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset)
             }
             
             mainStackView.addArrangedSubview(descriptionView)
diff --git a/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift b/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift
index 13a263645..03fda8975 100644
--- a/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift
+++ b/Client/Frontend/Browser/Onboarding/OnboardingNavigationController.swift
@@ -241,7 +241,7 @@ class CustomAnimator: NSObject, UIViewControllerAnimatedTransitioning {
         tDetails?.alpha = 0.0
         tDetailsContent?.alpha = 0.0
         
-        let inset = UIApplication.shared.keyWindow?.safeAreaInsets.bottom ?? 0.0
+        let inset: CGFloat = 0.0
         var fDetailsFrame = (fDetails?.bounds ?? .zero)
         fDetailsFrame.origin.y = (container.frame.height - container.frame.origin.y) - fDetailsFrame.height
         fDetailsFrame = fDetailsFrame.offsetBy(dx: 0.0, dy: -inset)
diff --git a/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift b/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift
index 714fd5f8b..1029c7061 100644
--- a/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift
+++ b/Client/Frontend/Browser/Onboarding/OnboardingRewardsAgreementView.swift
@@ -155,14 +155,12 @@ extension OnboardingRewardsAgreementViewController {
             addSubview(imageView)
             addSubview(mainStackView)
             mainStackView.snp.makeConstraints {
-                $0.leading.equalTo(self.safeArea.leading)
-                $0.trailing.equalTo(self.safeArea.trailing)
-                $0.bottom.equalTo(self.safeArea.bottom)
+                $0.leading.trailing.bottom.equalToSuperview()
             }
             
             descriptionView.addSubview(descriptionStackView)
             descriptionStackView.snp.makeConstraints {
-                $0.edges.equalToSuperview().inset(UX.descriptionContentInset)
+                $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset)
             }
             
             mainStackView.addArrangedSubview(descriptionView)
diff --git a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift
index 351906373..3f014410a 100644
--- a/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift
+++ b/Client/Frontend/Browser/Onboarding/OnboardingRewardsView.swift
@@ -80,14 +80,12 @@ extension OnboardingRewardsViewController {
             addSubview(imageView)
             addSubview(mainStackView)
             mainStackView.snp.makeConstraints {
-                $0.leading.equalTo(self.safeArea.leading)
-                $0.trailing.equalTo(self.safeArea.trailing)
-                $0.bottom.equalTo(self.safeArea.bottom)
+                $0.leading.trailing.bottom.equalToSuperview()
             }
             
             descriptionView.addSubview(descriptionStackView)
             descriptionStackView.snp.makeConstraints {
-                $0.edges.equalToSuperview().inset(UX.descriptionContentInset)
+                $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset)
             }
             
             mainStackView.addArrangedSubview(descriptionView)
diff --git a/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift b/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift
index 61b19d5c0..d2a1015d1 100644
--- a/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift
+++ b/Client/Frontend/Browser/Onboarding/OnboardingShieldsView.swift
@@ -84,14 +84,12 @@ extension OnboardingShieldsViewController {
             addSubview(imageView)
             addSubview(mainStackView)
             mainStackView.snp.makeConstraints {
-                $0.leading.equalTo(self.safeArea.leading)
-                $0.trailing.equalTo(self.safeArea.trailing)
-                $0.bottom.equalTo(self.safeArea.bottom)
+                $0.leading.trailing.bottom.equalToSuperview()
             }
             
             descriptionView.addSubview(descriptionStackView)
             descriptionStackView.snp.makeConstraints {
-                $0.edges.equalToSuperview().inset(UX.descriptionContentInset)
+                $0.edges.equalTo(descriptionView.safeArea.edges).inset(UX.descriptionContentInset)
             }
             
             mainStackView.addArrangedSubview(descriptionView)