diff --git a/.iyarc b/.iyarc
index abbf0e189d2..270b51b7610 100644
--- a/.iyarc
+++ b/.iyarc
@@ -1,3 +1,4 @@
 # ReDoS vulnerability, no impact to this application, and fix not backported yet to the versions we use
 
 GHSA-c2qf-rxjj-qqgw
+GHSA-8hc4-vh64-cxmj
\ No newline at end of file
diff --git a/app/component-library/components/Icons/Icon/assets/export.svg b/app/component-library/components/Icons/Icon/assets/export.svg
index 2f20cabbd05..e6e266fd06a 100644
--- a/app/component-library/components/Icons/Icon/assets/export.svg
+++ b/app/component-library/components/Icons/Icon/assets/export.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"><path d="m13.28 11 8.2-8.2m.801 4V2h-4.8m-6.2 0h-2c-5 0-7 2-7 7v6c0 5 2 7 7 7h6c5 0 7-2 7-7v-2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
+<svg fill="none" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14.4194 21h-4.83875c-4.54839 0-6.58065-2.0323-6.58065-6.5806v-4.83875c0-4.54839 2.03226-6.58065 6.58065-6.58065h1.64515c.5807 0 .9677.3871.9677.96774 0 .58065-.387.96774-.9677.96774h-1.64515c-3.48388 0-4.64517 1.16129-4.64517 4.64517v4.83875c0 3.4838 1.16129 4.6451 4.64517 4.6451h4.83875c3.4838 0 4.6451-1.1613 4.6451-4.6451v-1.6452c0-.5807.3871-.9677.9678-.9677.5806 0 .9677.387.9677.9677v1.6452c0 4.5483-2.0323 6.5806-6.5806 6.5806zm-1.6452-8.8065c-.2903 0-.4839-.0967-.6774-.2903-.3871-.3871-.3871-.9677 0-1.3548l5.6129-5.61292h-1.5484c-.5807 0-.9677-.38709-.9677-.96774 0-.58064.387-.96774.9677-.96774h3.871c.5806 0 .9677.3871.9677.96774v3.87097c0 .58065-.3871.96774-.9677.96774-.5807 0-.9678-.38709-.9678-.96774v-1.54839l-5.6129 5.61288c-.1935.1936-.3871.2903-.6774.2903z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap b/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap
index 04a715330df..b9c51698952 100644
--- a/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap
+++ b/app/components/Views/OnboardingSuccess/__snapshots__/index.test.js.snap
@@ -1,74 +1,59 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`OnboardingSuccess should render correctly 1`] = `
-<View
+<RCTScrollView
   style={
     {
-      "alignItems": "center",
       "flex": 1,
     }
   }
   testID="onboarding-success-screen"
 >
-  <View
-    style={
-      {
-        "flex": 1,
-        "paddingTop": "10%",
-      }
-    }
-  >
-    <Text
-      style={
-        {
-          "fontSize": 65,
-          "marginBottom": 16,
-          "textAlign": "center",
-        }
-      }
-    >
-      🎉
-    </Text>
-    <Text
-      accessibilityRole="text"
-      style={
-        {
-          "color": "#141618",
-          "fontFamily": "Euclid Circular B",
-          "fontSize": 24,
-          "fontWeight": "700",
-          "letterSpacing": 0,
-          "lineHeight": 22,
-          "paddingTop": 20,
-          "textAlign": "center",
-        }
-      }
-    >
-      Your Wallet is ready
-    </Text>
+  <View>
     <View
       style={
         {
-          "width": "90%",
+          "flex": 1,
+          "padding": 24,
+          "paddingTop": 24,
         }
       }
     >
+      <Text
+        style={
+          {
+            "fontSize": 65,
+            "marginBottom": 16,
+            "textAlign": "center",
+          }
+        }
+      >
+        🎉
+      </Text>
       <Text
         accessibilityRole="text"
         style={
           {
             "color": "#141618",
             "fontFamily": "Euclid Circular B",
-            "fontSize": 14,
-            "fontWeight": "400",
+            "fontSize": 24,
+            "fontWeight": "700",
             "letterSpacing": 0,
             "lineHeight": 22,
-            "marginTop": 14,
-            "textAlign": "left",
+            "paddingTop": 20,
+            "textAlign": "center",
+          }
+        }
+      >
+        Your Wallet is ready
+      </Text>
+      <View
+        style={
+          {
+            "width": "90%",
           }
         }
       >
-        Remember, if you lose your Secret Recovery Phrase, you lose access to your wallet. 
         <Text
           accessibilityRole="text"
           style={
@@ -84,177 +69,194 @@ exports[`OnboardingSuccess should render correctly 1`] = `
             }
           }
         >
+          Remember, if you lose your Secret Recovery Phrase, you lose access to your wallet. 
           <Text
             accessibilityRole="text"
-            onPress={[Function]}
             style={
               {
-                "color": "#0376c9",
+                "color": "#141618",
                 "fontFamily": "Euclid Circular B",
                 "fontSize": 14,
                 "fontWeight": "400",
                 "letterSpacing": 0,
                 "lineHeight": 22,
+                "marginTop": 14,
+                "textAlign": "left",
               }
             }
           >
-            Learn how
-             
+            <Text
+              accessibilityRole="text"
+              onPress={[Function]}
+              style={
+                {
+                  "color": "#0376c9",
+                  "fontFamily": "Euclid Circular B",
+                  "fontSize": 14,
+                  "fontWeight": "400",
+                  "letterSpacing": 0,
+                  "lineHeight": 22,
+                }
+              }
+            >
+              Learn how
+               
+            </Text>
+            to keep this set of words safe so you can always access your funds.
           </Text>
-          to keep this set of words safe so you can always access your funds.
         </Text>
-      </Text>
-    </View>
-    <View
-      style={
-        {
-          "minHeight": 50,
-        }
-      }
-    >
-      <TouchableOpacity
-        onPress={[Function]}
+      </View>
+      <View
         style={
-          [
-            {
-              "alignItems": "center",
-              "flexDirection": "row",
-            },
-            {
-              "paddingTop": 10,
-            },
-          ]
+          {
+            "minHeight": 50,
+          }
         }
       >
-        <View
+        <TouchableOpacity
+          onPress={[Function]}
           style={
-            {
-              "marginRight": 6,
-            }
+            [
+              {
+                "alignItems": "center",
+                "flexDirection": "row",
+              },
+              {
+                "paddingTop": 10,
+              },
+            ]
           }
         >
-          <SvgMock
-            color="#0376c9"
-            height={16}
-            name="Setting"
+          <View
             style={
               {
-                "height": 16,
-                "width": 16,
+                "marginRight": 6,
               }
             }
-            width={16}
-          />
-        </View>
+          >
+            <SvgMock
+              color="#0376c9"
+              height={16}
+              name="Setting"
+              style={
+                {
+                  "height": 16,
+                  "width": 16,
+                }
+              }
+              width={16}
+            />
+          </View>
+          <Text
+            accessibilityRole="text"
+            style={
+              {
+                "color": "#0376c9",
+                "fontFamily": "Euclid Circular B",
+                "fontSize": 14,
+                "fontWeight": "400",
+                "letterSpacing": 0,
+                "lineHeight": 22,
+              }
+            }
+          >
+            Manage default settings
+          </Text>
+        </TouchableOpacity>
         <Text
           accessibilityRole="text"
           style={
             {
-              "color": "#0376c9",
+              "color": "#141618",
               "fontFamily": "Euclid Circular B",
-              "fontSize": 14,
+              "fontSize": 12,
               "fontWeight": "400",
               "letterSpacing": 0,
               "lineHeight": 22,
+              "marginTop": 10,
             }
           }
         >
-          Manage default settings
-        </Text>
-      </TouchableOpacity>
-      <Text
-        accessibilityRole="text"
-        style={
-          {
-            "color": "#141618",
-            "fontFamily": "Euclid Circular B",
-            "fontSize": 12,
-            "fontWeight": "400",
-            "letterSpacing": 0,
-            "lineHeight": 22,
-            "marginTop": 10,
-          }
-        }
-      >
-        Settings are optimized for ease of use and security.
+          Settings are optimized for ease of use and security.
 Change these at any time.
-      </Text>
+        </Text>
+      </View>
     </View>
-  </View>
-  <View
-    style={
-      {
-        "bottom": 50,
-        "width": "85%",
-      }
-    }
-  >
-    <TouchableOpacity
-      accessibilityRole="button"
-      accessible={true}
-      activeOpacity={1}
-      onPressIn={[Function]}
-      onPressOut={[Function]}
+    <View
       style={
         {
-          "alignItems": "center",
-          "alignSelf": "stretch",
-          "backgroundColor": "#0376c9",
-          "borderRadius": 24,
-          "flexDirection": "row",
-          "height": 48,
-          "justifyContent": "center",
-          "paddingHorizontal": 16,
+          "paddingBottom": 50,
+          "paddingHorizontal": 24,
         }
       }
-      testID="onboarding-success-done-button"
-      variant="Primary"
     >
-      <Text
-        accessibilityRole="text"
+      <TouchableOpacity
+        accessibilityRole="button"
+        accessible={true}
+        activeOpacity={1}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
         style={
           {
-            "color": "#ffffff",
-            "fontFamily": "Euclid Circular B",
-            "fontSize": 14,
-            "fontWeight": "400",
-            "letterSpacing": 0,
-            "lineHeight": 22,
+            "alignItems": "center",
+            "alignSelf": "stretch",
+            "backgroundColor": "#0376c9",
+            "borderRadius": 24,
+            "flexDirection": "row",
+            "height": 48,
+            "justifyContent": "center",
+            "paddingHorizontal": 16,
           }
         }
+        testID="onboarding-success-done-button"
+        variant="Primary"
       >
-        Done
-      </Text>
-    </TouchableOpacity>
+        <Text
+          accessibilityRole="text"
+          style={
+            {
+              "color": "#ffffff",
+              "fontFamily": "Euclid Circular B",
+              "fontSize": 14,
+              "fontWeight": "400",
+              "letterSpacing": 0,
+              "lineHeight": 22,
+            }
+          }
+        >
+          Done
+        </Text>
+      </TouchableOpacity>
+    </View>
+    <Modal
+      animationType="none"
+      deviceHeight={null}
+      deviceWidth={null}
+      hardwareAccelerated={false}
+      hideModalContentWhileAnimating={false}
+      onBackdropPress={[Function]}
+      onModalHide={[Function]}
+      onModalWillHide={[Function]}
+      onModalWillShow={[Function]}
+      onRequestClose={[Function]}
+      onSwipeComplete={[Function]}
+      panResponderThreshold={4}
+      scrollHorizontal={false}
+      scrollOffset={0}
+      scrollOffsetMax={0}
+      scrollTo={null}
+      statusBarTranslucent={false}
+      supportedOrientations={
+        [
+          "portrait",
+          "landscape",
+        ]
+      }
+      swipeDirection="down"
+      swipeThreshold={100}
+      transparent={true}
+      visible={false}
+    />
   </View>
-  <Modal
-    animationType="none"
-    deviceHeight={null}
-    deviceWidth={null}
-    hardwareAccelerated={false}
-    hideModalContentWhileAnimating={false}
-    onBackdropPress={[Function]}
-    onModalHide={[Function]}
-    onModalWillHide={[Function]}
-    onModalWillShow={[Function]}
-    onRequestClose={[Function]}
-    onSwipeComplete={[Function]}
-    panResponderThreshold={4}
-    scrollHorizontal={false}
-    scrollOffset={0}
-    scrollOffsetMax={0}
-    scrollTo={null}
-    statusBarTranslucent={false}
-    supportedOrientations={
-      [
-        "portrait",
-        "landscape",
-      ]
-    }
-    swipeDirection="down"
-    swipeThreshold={100}
-    transparent={true}
-    visible={false}
-  />
-</View>
+</RCTScrollView>
 `;
diff --git a/app/components/Views/OnboardingSuccess/index.styles.ts b/app/components/Views/OnboardingSuccess/index.styles.ts
index b31a50bce89..10b6abba87a 100644
--- a/app/components/Views/OnboardingSuccess/index.styles.ts
+++ b/app/components/Views/OnboardingSuccess/index.styles.ts
@@ -3,15 +3,15 @@ import { StyleSheet } from 'react-native';
 const styles = StyleSheet.create({
   root: {
     flex: 1,
-    alignItems: 'center',
   },
   contentWrapper: {
     flex: 1,
-    paddingTop: '10%',
+    paddingTop: 24,
+    padding: 24,
   },
   buttonWrapper: {
-    width: '85%',
-    bottom: 50,
+    paddingHorizontal: 24,
+    paddingBottom: 50,
   },
   emoji: {
     textAlign: 'center',
diff --git a/app/components/Views/OnboardingSuccess/index.tsx b/app/components/Views/OnboardingSuccess/index.tsx
index b8f7feb47c9..cb3d2d859d1 100644
--- a/app/components/Views/OnboardingSuccess/index.tsx
+++ b/app/components/Views/OnboardingSuccess/index.tsx
@@ -1,5 +1,6 @@
 import React, { useLayoutEffect, useState } from 'react';
 import {
+  ScrollView,
   View,
   Linking,
   Keyboard,
@@ -193,7 +194,7 @@ const OnboardingSuccess = ({
   };
 
   return (
-    <View
+    <ScrollView
       style={styles.root}
       testID={OnboardingSuccessSelectorIDs.CONTAINER_ID}
     >
@@ -213,7 +214,7 @@ const OnboardingSuccess = ({
         />
       </View>
       {renderHint()}
-    </View>
+    </ScrollView>
   );
 };