diff --git a/CovidCertificate/SharedUI/Views/QRCodeNameView.swift b/CovidCertificate/SharedUI/Views/QRCodeNameView.swift
index b325b7a9..5e79cf63 100644
--- a/CovidCertificate/SharedUI/Views/QRCodeNameView.swift
+++ b/CovidCertificate/SharedUI/Views/QRCodeNameView.swift
@@ -77,6 +77,9 @@ class QRCodeNameView: UIView {
             make.leading.trailing.equalToSuperview().inset(self.qrCodeInset)
             make.bottom.equalToSuperview()
         }
+
+        nameView.ub_setContentPriorityRequired()
+        birthdayLabelView.ub_setContentPriorityRequired()
     }
 
     // MARK: - Update
diff --git a/Wallet/Screens/Homescreen/HomescreenCertificateView.swift b/Wallet/Screens/Homescreen/HomescreenCertificateView.swift
index 1e53afb6..6888a32e 100644
--- a/Wallet/Screens/Homescreen/HomescreenCertificateView.swift
+++ b/Wallet/Screens/Homescreen/HomescreenCertificateView.swift
@@ -65,6 +65,7 @@ class HomescreenCertificateView: UIView {
         }
 
         contentView.addSubview(titleLabel)
+        titleLabel.ub_setContentPriorityRequired()
 
         titleLabel.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview().inset(Padding.large)
@@ -91,7 +92,7 @@ class HomescreenCertificateView: UIView {
 
         contentView.addSubview(stateView)
         stateView.snp.makeConstraints { make in
-            make.top.greaterThanOrEqualTo(nameView.snp.bottom).offset(Padding.medium)
+            make.top.greaterThanOrEqualTo(nameView.snp.bottom).offset(Padding.medium + Padding.small)
             make.bottom.left.right.equalToSuperview().inset(2.0 * Padding.small)
         }
 
diff --git a/Wallet/Screens/Homescreen/HomescreenCertificatesViewController.swift b/Wallet/Screens/Homescreen/HomescreenCertificatesViewController.swift
index d246ae91..c65eb52c 100644
--- a/Wallet/Screens/Homescreen/HomescreenCertificatesViewController.swift
+++ b/Wallet/Screens/Homescreen/HomescreenCertificatesViewController.swift
@@ -37,11 +37,14 @@ class HomescreenCertificatesViewController: ViewController {
     private func setup() {
         view.backgroundColor = .clear
 
+        let isSmall = view.frame.size.width <= 375
+        let pageControlBottomPaddig = isSmall ? Padding.large : (Padding.large + Padding.medium)
+
         view.addSubview(pageControl)
 
         pageControl.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().inset(Padding.large + Padding.medium)
+            make.bottom.equalToSuperview().inset(pageControlBottomPaddig)
         }
 
         stackScrollView.scrollView.isPagingEnabled = true