diff --git a/__tests__/__snapshots__/Header.snapshot.tsx.snap b/__tests__/__snapshots__/Header.snapshot.tsx.snap
index bc9c6118c..5628e1b74 100644
--- a/__tests__/__snapshots__/Header.snapshot.tsx.snap
+++ b/__tests__/__snapshots__/Header.snapshot.tsx.snap
@@ -33,71 +33,79 @@ exports[`Component Header - test Header Complex - snapshot 1`] = `
         <View
           style={
             {
-              "alignItems": "center",
-              "justifyContent": "center",
-              "margin": 0,
-              "marginRight": 5,
               "minHeight": 25,
-              "minWidth": 25,
-              "padding": 0,
             }
           }
         >
           <View
-            accessibilityState={
-              {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": undefined,
-                "expanded": undefined,
-                "selected": undefined,
-              }
-            }
-            accessibilityValue={
-              {
-                "max": undefined,
-                "min": undefined,
-                "now": undefined,
-                "text": undefined,
-              }
-            }
-            accessible={true}
-            collapsable={false}
-            focusable={true}
-            onClick={[Function]}
-            onResponderGrant={[Function]}
-            onResponderMove={[Function]}
-            onResponderRelease={[Function]}
-            onResponderTerminate={[Function]}
-            onResponderTerminationRequest={[Function]}
-            onStartShouldSetResponder={[Function]}
             style={
               {
-                "opacity": 1,
+                "alignItems": "center",
+                "justifyContent": "center",
+                "margin": 0,
+                "marginRight": 5,
+                "minHeight": 25,
+                "minWidth": 25,
+                "padding": 0,
               }
             }
           >
-            <
-              color="red"
-              icon={
+            <View
+              accessibilityState={
                 {
-                  "icon": [
-                    640,
-                    512,
-                    [
-                      62337,
-                      "cloud-download",
-                      "cloud-download-alt",
-                    ],
-                    "f0ed",
-                    "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
-                  ],
-                  "iconName": "cloud-arrow-down",
-                  "prefix": "fas",
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
               }
-              size={20}
-            />
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "opacity": 1,
+                }
+              }
+            >
+              <
+                color="red"
+                icon={
+                  {
+                    "icon": [
+                      640,
+                      512,
+                      [
+                        62337,
+                        "cloud-download",
+                        "cloud-download-alt",
+                      ],
+                      "f0ed",
+                      "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
+                    ],
+                    "iconName": "cloud-arrow-down",
+                    "prefix": "fas",
+                  }
+                }
+                size={20}
+              />
+            </View>
           </View>
         </View>
       </View>
diff --git a/__tests__/__snapshots__/History.snapshot.tsx.snap b/__tests__/__snapshots__/History.snapshot.tsx.snap
index cbdabc4c9..dbcf9ea3f 100644
--- a/__tests__/__snapshots__/History.snapshot.tsx.snap
+++ b/__tests__/__snapshots__/History.snapshot.tsx.snap
@@ -51,71 +51,79 @@ exports[`Component History - test History currency USD, privacy high & mode adva
         <View
           style={
             {
-              "alignItems": "center",
-              "justifyContent": "center",
-              "margin": 0,
-              "marginRight": 5,
               "minHeight": 25,
-              "minWidth": 25,
-              "padding": 0,
             }
           }
         >
           <View
-            accessibilityState={
-              {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": undefined,
-                "expanded": undefined,
-                "selected": undefined,
-              }
-            }
-            accessibilityValue={
-              {
-                "max": undefined,
-                "min": undefined,
-                "now": undefined,
-                "text": undefined,
-              }
-            }
-            accessible={true}
-            collapsable={false}
-            focusable={true}
-            onClick={[Function]}
-            onResponderGrant={[Function]}
-            onResponderMove={[Function]}
-            onResponderRelease={[Function]}
-            onResponderTerminate={[Function]}
-            onResponderTerminationRequest={[Function]}
-            onStartShouldSetResponder={[Function]}
             style={
               {
-                "opacity": 1,
+                "alignItems": "center",
+                "justifyContent": "center",
+                "margin": 0,
+                "marginRight": 5,
+                "minHeight": 25,
+                "minWidth": 25,
+                "padding": 0,
               }
             }
           >
-            <
-              color="red"
-              icon={
+            <View
+              accessibilityState={
                 {
-                  "icon": [
-                    640,
-                    512,
-                    [
-                      62337,
-                      "cloud-download",
-                      "cloud-download-alt",
-                    ],
-                    "f0ed",
-                    "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
-                  ],
-                  "iconName": "cloud-arrow-down",
-                  "prefix": "fas",
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
               }
-              size={20}
-            />
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "opacity": 1,
+                }
+              }
+            >
+              <
+                color="red"
+                icon={
+                  {
+                    "icon": [
+                      640,
+                      512,
+                      [
+                        62337,
+                        "cloud-download",
+                        "cloud-download-alt",
+                      ],
+                      "f0ed",
+                      "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
+                    ],
+                    "iconName": "cloud-arrow-down",
+                    "prefix": "fas",
+                  }
+                }
+                size={20}
+              />
+            </View>
           </View>
         </View>
       </View>
@@ -810,37 +818,45 @@ exports[`Component History - test History no currency, privacy normal & mode bas
         <View
           style={
             {
-              "alignItems": "center",
-              "justifyContent": "center",
-              "margin": 0,
-              "marginRight": 5,
               "minHeight": 25,
-              "minWidth": 25,
-              "padding": 0,
             }
           }
         >
-          <
-            color="red"
-            icon={
+          <View
+            style={
               {
-                "icon": [
-                  640,
-                  512,
-                  [
-                    62337,
-                    "cloud-download",
-                    "cloud-download-alt",
-                  ],
-                  "f0ed",
-                  "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
-                ],
-                "iconName": "cloud-arrow-down",
-                "prefix": "fas",
+                "alignItems": "center",
+                "justifyContent": "center",
+                "margin": 0,
+                "marginRight": 5,
+                "minHeight": 25,
+                "minWidth": 25,
+                "padding": 0,
               }
             }
-            size={20}
-          />
+          >
+            <
+              color="red"
+              icon={
+                {
+                  "icon": [
+                    640,
+                    512,
+                    [
+                      62337,
+                      "cloud-download",
+                      "cloud-download-alt",
+                    ],
+                    "f0ed",
+                    "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
+                  ],
+                  "iconName": "cloud-arrow-down",
+                  "prefix": "fas",
+                }
+              }
+              size={20}
+            />
+          </View>
         </View>
       </View>
       <View
diff --git a/__tests__/__snapshots__/Messages.snapshot.tsx.snap b/__tests__/__snapshots__/Messages.snapshot.tsx.snap
index 63ddf1af2..aa810ed85 100644
--- a/__tests__/__snapshots__/Messages.snapshot.tsx.snap
+++ b/__tests__/__snapshots__/Messages.snapshot.tsx.snap
@@ -44,71 +44,79 @@ exports[`Component Messages - test Messages currency USD, privacy high & mode ad
         <View
           style={
             {
-              "alignItems": "center",
-              "justifyContent": "center",
-              "margin": 0,
-              "marginRight": 5,
               "minHeight": 25,
-              "minWidth": 25,
-              "padding": 0,
             }
           }
         >
           <View
-            accessibilityState={
-              {
-                "busy": undefined,
-                "checked": undefined,
-                "disabled": undefined,
-                "expanded": undefined,
-                "selected": undefined,
-              }
-            }
-            accessibilityValue={
-              {
-                "max": undefined,
-                "min": undefined,
-                "now": undefined,
-                "text": undefined,
-              }
-            }
-            accessible={true}
-            collapsable={false}
-            focusable={true}
-            onClick={[Function]}
-            onResponderGrant={[Function]}
-            onResponderMove={[Function]}
-            onResponderRelease={[Function]}
-            onResponderTerminate={[Function]}
-            onResponderTerminationRequest={[Function]}
-            onStartShouldSetResponder={[Function]}
             style={
               {
-                "opacity": 1,
+                "alignItems": "center",
+                "justifyContent": "center",
+                "margin": 0,
+                "marginRight": 5,
+                "minHeight": 25,
+                "minWidth": 25,
+                "padding": 0,
               }
             }
           >
-            <
-              color="red"
-              icon={
+            <View
+              accessibilityState={
                 {
-                  "icon": [
-                    640,
-                    512,
-                    [
-                      62337,
-                      "cloud-download",
-                      "cloud-download-alt",
-                    ],
-                    "f0ed",
-                    "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
-                  ],
-                  "iconName": "cloud-arrow-down",
-                  "prefix": "fas",
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
               }
-              size={20}
-            />
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
+                }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "opacity": 1,
+                }
+              }
+            >
+              <
+                color="red"
+                icon={
+                  {
+                    "icon": [
+                      640,
+                      512,
+                      [
+                        62337,
+                        "cloud-download",
+                        "cloud-download-alt",
+                      ],
+                      "f0ed",
+                      "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
+                    ],
+                    "iconName": "cloud-arrow-down",
+                    "prefix": "fas",
+                  }
+                }
+                size={20}
+              />
+            </View>
           </View>
         </View>
         <View
@@ -411,37 +419,45 @@ exports[`Component Messages - test Messages no currency, privacy normal & mode b
         <View
           style={
             {
-              "alignItems": "center",
-              "justifyContent": "center",
-              "margin": 0,
-              "marginRight": 5,
               "minHeight": 25,
-              "minWidth": 25,
-              "padding": 0,
             }
           }
         >
-          <
-            color="red"
-            icon={
+          <View
+            style={
               {
-                "icon": [
-                  640,
-                  512,
-                  [
-                    62337,
-                    "cloud-download",
-                    "cloud-download-alt",
-                  ],
-                  "f0ed",
-                  "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
-                ],
-                "iconName": "cloud-arrow-down",
-                "prefix": "fas",
+                "alignItems": "center",
+                "justifyContent": "center",
+                "margin": 0,
+                "marginRight": 5,
+                "minHeight": 25,
+                "minWidth": 25,
+                "padding": 0,
               }
             }
-            size={20}
-          />
+          >
+            <
+              color="red"
+              icon={
+                {
+                  "icon": [
+                    640,
+                    512,
+                    [
+                      62337,
+                      "cloud-download",
+                      "cloud-download-alt",
+                    ],
+                    "f0ed",
+                    "M144 480C64.5 480 0 415.5 0 336c0-62.8 40.2-116.2 96.2-135.9c-.1-2.7-.2-5.4-.2-8.1c0-88.4 71.6-160 160-160c59.3 0 111 32.2 138.7 80.2C409.9 102 428.3 96 448 96c53 0 96 43 96 96c0 12.2-2.3 23.8-6.4 34.6C596 238.4 640 290.1 640 352c0 70.7-57.3 128-128 128l-368 0zm79-167l80 80c9.4 9.4 24.6 9.4 33.9 0l80-80c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-39 39L344 184c0-13.3-10.7-24-24-24s-24 10.7-24 24l0 134.1-39-39c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9z",
+                  ],
+                  "iconName": "cloud-arrow-down",
+                  "prefix": "fas",
+                }
+              }
+              size={20}
+            />
+          </View>
         </View>
       </View>
     </View>