diff --git a/app/containers/Check.tsx b/app/containers/Check.tsx
index 5f47f52fb1..30167b0d12 100644
--- a/app/containers/Check.tsx
+++ b/app/containers/Check.tsx
@@ -8,8 +8,7 @@ import { useTheme } from '../theme';
 const styles = StyleSheet.create({
 	icon: {
 		width: 22,
-		height: 22,
-		marginHorizontal: 15
+		height: 22
 	}
 });
 
diff --git a/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap b/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap
index e6e8b47ee2..43e661446c 100644
--- a/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap
+++ b/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap
@@ -8842,768 +8842,430 @@ exports[`MessageComposer Toolbar tap emoji 1`] = `
 `;
 
 exports[`MessageComposer Toolbar tap mention 1`] = `
-[
-  <keyboard-accessory-view-mock>
+<keyboard-accessory-view-mock>
+  <View
+    style={
+      [
+        {
+          "borderTopWidth": 1,
+          "minHeight": 48,
+          "paddingHorizontal": 16,
+        },
+        {
+          "backgroundColor": "#FFFFFF",
+          "borderTopColor": "#CBCED1",
+        },
+      ]
+    }
+    testID="message-composer"
+  >
     <View
       style={
-        [
-          {
-            "borderTopWidth": 1,
-            "minHeight": 48,
-            "paddingHorizontal": 16,
-          },
-          {
-            "backgroundColor": "#FFFFFF",
-            "borderTopColor": "#CBCED1",
-          },
-        ]
+        {
+          "flexDirection": "row",
+        }
       }
-      testID="message-composer"
     >
-      <View
+      <TextInput
+        blurOnSubmit={false}
+        defaultValue=""
+        keyboardAppearance="light"
+        multiline={true}
+        onBlur={[Function]}
+        onChangeText={[Function]}
+        onFocus={[Function]}
+        onSelectionChange={[Function]}
+        placeholder=""
+        placeholderTextColor="#9EA2A8"
         style={
+          [
+            {
+              "backgroundColor": "transparent",
+              "flex": 1,
+              "fontFamily": "Inter",
+              "fontSize": 16,
+              "fontWeight": "400",
+              "lineHeight": 22,
+              "maxHeight": 200,
+              "minHeight": 48,
+              "paddingBottom": 12,
+              "paddingTop": 12,
+              "textAlign": "left",
+              "textAlignVertical": "center",
+            },
+            {
+              "color": "#2F343D",
+            },
+          ]
+        }
+        testID="message-composer-input"
+        underlineColorAndroid="transparent"
+      />
+    </View>
+    <View
+      style={
+        {
+          "flexDirection": "row",
+          "paddingVertical": 12,
+        }
+      }
+    >
+      <RNGestureHandlerButton
+        activeOpacity={0.3}
+        borderless={true}
+        collapsable={false}
+        delayLongPress={600}
+        handlerTag={184}
+        handlerType="NativeViewGestureHandler"
+        hitSlop={
           {
-            "flexDirection": "row",
+            "bottom": 16,
+            "left": 16,
+            "right": 16,
+            "top": 16,
           }
         }
-      >
-        <TextInput
-          blurOnSubmit={false}
-          defaultValue=""
-          keyboardAppearance="light"
-          multiline={true}
-          onBlur={[Function]}
-          onChangeText={[Function]}
-          onFocus={[Function]}
-          onSelectionChange={[Function]}
-          placeholder=""
-          placeholderTextColor="#9EA2A8"
-          style={
-            [
-              {
-                "backgroundColor": "transparent",
-                "flex": 1,
-                "fontFamily": "Inter",
-                "fontSize": 16,
-                "fontWeight": "400",
-                "lineHeight": 22,
-                "maxHeight": 200,
-                "minHeight": 48,
-                "paddingBottom": 12,
-                "paddingTop": 12,
-                "textAlign": "left",
-                "textAlignVertical": "center",
-              },
-              {
-                "color": "#2F343D",
-              },
-            ]
-          }
-          testID="message-composer-input"
-          underlineColorAndroid="transparent"
-        />
-      </View>
-      <View
+        onActiveStateChange={[Function]}
+        onGestureEvent={[Function]}
+        onGestureHandlerEvent={[Function]}
+        onGestureHandlerStateChange={[Function]}
+        onHandlerStateChange={[Function]}
+        onPress={[Function]}
         style={
           {
-            "flexDirection": "row",
-            "paddingVertical": 12,
+            "alignItems": "center",
+            "height": 24,
+            "justifyContent": "center",
+            "opacity": 1,
+            "width": 24,
           }
         }
+        testID="message-composer-actions"
       >
-        <RNGestureHandlerButton
-          activeOpacity={0.3}
-          borderless={true}
-          collapsable={false}
-          delayLongPress={600}
-          handlerTag={184}
-          handlerType="NativeViewGestureHandler"
-          hitSlop={
-            {
-              "bottom": 16,
-              "left": 16,
-              "right": 16,
-              "top": 16,
-            }
-          }
-          onActiveStateChange={[Function]}
-          onGestureEvent={[Function]}
-          onGestureHandlerEvent={[Function]}
-          onGestureHandlerStateChange={[Function]}
-          onHandlerStateChange={[Function]}
-          onPress={[Function]}
-          style={
-            {
-              "alignItems": "center",
-              "height": 24,
-              "justifyContent": "center",
-              "opacity": 1,
-              "width": 24,
-            }
-          }
-          testID="message-composer-actions"
+        <View
+          accessibilityLabel="Message actions"
+          accessibilityRole="button"
+          accessible={true}
         >
-          <View
-            accessibilityLabel="Message actions"
-            accessibilityRole="button"
-            accessible={true}
-          >
-            <Text
-              allowFontScaling={false}
-              selectable={false}
-              style={
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              [
+                {
+                  "color": "#2F343D",
+                  "fontSize": 24,
+                },
                 [
                   {
-                    "color": "#2F343D",
-                    "fontSize": 24,
-                  },
-                  [
-                    {
-                      "lineHeight": 24,
-                    },
-                    undefined,
-                  ],
-                  {
-                    "fontFamily": "custom",
-                    "fontStyle": "normal",
-                    "fontWeight": "normal",
+                    "lineHeight": 24,
                   },
-                  {},
-                ]
-              }
-            >
-              
-            </Text>
-          </View>
-        </RNGestureHandlerButton>
-        <View
-          style={
-            {
-              "width": 12,
+                  undefined,
+                ],
+                {
+                  "fontFamily": "custom",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                {},
+              ]
             }
+          >
+            
+          </Text>
+        </View>
+      </RNGestureHandlerButton>
+      <View
+        style={
+          {
+            "width": 12,
           }
-        />
-        <RNGestureHandlerButton
-          activeOpacity={0.3}
-          borderless={true}
-          collapsable={false}
-          delayLongPress={600}
-          handlerTag={185}
-          handlerType="NativeViewGestureHandler"
-          hitSlop={
-            {
-              "bottom": 16,
-              "left": 16,
-              "right": 16,
-              "top": 16,
-            }
+        }
+      />
+      <RNGestureHandlerButton
+        activeOpacity={0.3}
+        borderless={true}
+        collapsable={false}
+        delayLongPress={600}
+        handlerTag={185}
+        handlerType="NativeViewGestureHandler"
+        hitSlop={
+          {
+            "bottom": 16,
+            "left": 16,
+            "right": 16,
+            "top": 16,
           }
-          onActiveStateChange={[Function]}
-          onGestureEvent={[Function]}
-          onGestureHandlerEvent={[Function]}
-          onGestureHandlerStateChange={[Function]}
-          onHandlerStateChange={[Function]}
-          onPress={[Function]}
-          style={
-            {
-              "alignItems": "center",
-              "height": 24,
-              "justifyContent": "center",
-              "opacity": 1,
-              "width": 24,
-            }
+        }
+        onActiveStateChange={[Function]}
+        onGestureEvent={[Function]}
+        onGestureHandlerEvent={[Function]}
+        onGestureHandlerStateChange={[Function]}
+        onHandlerStateChange={[Function]}
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "height": 24,
+            "justifyContent": "center",
+            "opacity": 1,
+            "width": 24,
           }
-          testID="message-composer-open-emoji"
-        >
-          <View
-            accessibilityLabel="Open emoji selector"
-            accessibilityRole="button"
-            accessible={true}
-          >
-            <Text
-              allowFontScaling={false}
-              selectable={false}
-              style={
+        }
+        testID="message-composer-open-emoji"
+      >
+        <View
+          accessibilityLabel="Open emoji selector"
+          accessibilityRole="button"
+          accessible={true}
+        >
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              [
+                {
+                  "color": "#2F343D",
+                  "fontSize": 24,
+                },
                 [
                   {
-                    "color": "#2F343D",
-                    "fontSize": 24,
-                  },
-                  [
-                    {
-                      "lineHeight": 24,
-                    },
-                    undefined,
-                  ],
-                  {
-                    "fontFamily": "custom",
-                    "fontStyle": "normal",
-                    "fontWeight": "normal",
+                    "lineHeight": 24,
                   },
-                  {},
-                ]
-              }
-            >
-              
-            </Text>
-          </View>
-        </RNGestureHandlerButton>
-        <View
-          style={
-            {
-              "width": 12,
+                  undefined,
+                ],
+                {
+                  "fontFamily": "custom",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                {},
+              ]
             }
+          >
+            
+          </Text>
+        </View>
+      </RNGestureHandlerButton>
+      <View
+        style={
+          {
+            "width": 12,
           }
-        />
-        <RNGestureHandlerButton
-          activeOpacity={0.3}
-          borderless={true}
-          collapsable={false}
-          delayLongPress={600}
-          handlerTag={186}
-          handlerType="NativeViewGestureHandler"
-          hitSlop={
-            {
-              "bottom": 16,
-              "left": 16,
-              "right": 16,
-              "top": 16,
-            }
+        }
+      />
+      <RNGestureHandlerButton
+        activeOpacity={0.3}
+        borderless={true}
+        collapsable={false}
+        delayLongPress={600}
+        handlerTag={186}
+        handlerType="NativeViewGestureHandler"
+        hitSlop={
+          {
+            "bottom": 16,
+            "left": 16,
+            "right": 16,
+            "top": 16,
           }
-          onActiveStateChange={[Function]}
-          onGestureEvent={[Function]}
-          onGestureHandlerEvent={[Function]}
-          onGestureHandlerStateChange={[Function]}
-          onHandlerStateChange={[Function]}
-          onPress={[Function]}
-          style={
-            {
-              "alignItems": "center",
-              "height": 24,
-              "justifyContent": "center",
-              "opacity": 1,
-              "width": 24,
-            }
+        }
+        onActiveStateChange={[Function]}
+        onGestureEvent={[Function]}
+        onGestureHandlerEvent={[Function]}
+        onGestureHandlerStateChange={[Function]}
+        onHandlerStateChange={[Function]}
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "height": 24,
+            "justifyContent": "center",
+            "opacity": 1,
+            "width": 24,
           }
-          testID="message-composer-open-markdown"
+        }
+        testID="message-composer-open-markdown"
+      >
+        <View
+          accessibilityLabel="Open markdown tools"
+          accessibilityRole="button"
+          accessible={true}
         >
-          <View
-            accessibilityLabel="Open markdown tools"
-            accessibilityRole="button"
-            accessible={true}
-          >
-            <Text
-              allowFontScaling={false}
-              selectable={false}
-              style={
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              [
+                {
+                  "color": "#2F343D",
+                  "fontSize": 24,
+                },
                 [
                   {
-                    "color": "#2F343D",
-                    "fontSize": 24,
-                  },
-                  [
-                    {
-                      "lineHeight": 24,
-                    },
-                    undefined,
-                  ],
-                  {
-                    "fontFamily": "custom",
-                    "fontStyle": "normal",
-                    "fontWeight": "normal",
+                    "lineHeight": 24,
                   },
-                  {},
-                ]
-              }
-            >
-              
-            </Text>
-          </View>
-        </RNGestureHandlerButton>
-        <View
-          style={
-            {
-              "width": 12,
+                  undefined,
+                ],
+                {
+                  "fontFamily": "custom",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                {},
+              ]
             }
+          >
+            
+          </Text>
+        </View>
+      </RNGestureHandlerButton>
+      <View
+        style={
+          {
+            "width": 12,
           }
-        />
-        <RNGestureHandlerButton
-          activeOpacity={0.3}
-          borderless={true}
-          collapsable={false}
-          delayLongPress={600}
-          handlerTag={187}
-          handlerType="NativeViewGestureHandler"
-          hitSlop={
-            {
-              "bottom": 16,
-              "left": 16,
-              "right": 16,
-              "top": 16,
-            }
+        }
+      />
+      <RNGestureHandlerButton
+        activeOpacity={0.3}
+        borderless={true}
+        collapsable={false}
+        delayLongPress={600}
+        handlerTag={187}
+        handlerType="NativeViewGestureHandler"
+        hitSlop={
+          {
+            "bottom": 16,
+            "left": 16,
+            "right": 16,
+            "top": 16,
           }
-          onActiveStateChange={[Function]}
-          onGestureEvent={[Function]}
-          onGestureHandlerEvent={[Function]}
-          onGestureHandlerStateChange={[Function]}
-          onHandlerStateChange={[Function]}
-          onPress={[Function]}
-          style={
-            {
-              "alignItems": "center",
-              "height": 24,
-              "justifyContent": "center",
-              "opacity": 1,
-              "width": 24,
-            }
+        }
+        onActiveStateChange={[Function]}
+        onGestureEvent={[Function]}
+        onGestureHandlerEvent={[Function]}
+        onGestureHandlerStateChange={[Function]}
+        onHandlerStateChange={[Function]}
+        onPress={[Function]}
+        style={
+          {
+            "alignItems": "center",
+            "height": 24,
+            "justifyContent": "center",
+            "opacity": 1,
+            "width": 24,
           }
-          testID="message-composer-mention"
+        }
+        testID="message-composer-mention"
+      >
+        <View
+          accessibilityLabel="Open mention autocomplete"
+          accessibilityRole="button"
+          accessible={true}
         >
-          <View
-            accessibilityLabel="Open mention autocomplete"
-            accessibilityRole="button"
-            accessible={true}
-          >
-            <Text
-              allowFontScaling={false}
-              selectable={false}
-              style={
+          <Text
+            allowFontScaling={false}
+            selectable={false}
+            style={
+              [
+                {
+                  "color": "#2F343D",
+                  "fontSize": 24,
+                },
                 [
                   {
-                    "color": "#2F343D",
-                    "fontSize": 24,
-                  },
-                  [
-                    {
-                      "lineHeight": 24,
-                    },
-                    undefined,
-                  ],
-                  {
-                    "fontFamily": "custom",
-                    "fontStyle": "normal",
-                    "fontWeight": "normal",
+                    "lineHeight": 24,
                   },
-                  {},
-                ]
-              }
-            >
-              
-            </Text>
-          </View>
-        </RNGestureHandlerButton>
-        <View
-          style={
-            {
-              "flex": 1,
-            }
-          }
-        />
-        <RNGestureHandlerButton
-          activeOpacity={0.3}
-          borderless={true}
-          collapsable={false}
-          delayLongPress={600}
-          handlerTag={188}
-          handlerType="NativeViewGestureHandler"
-          hitSlop={
-            {
-              "bottom": 16,
-              "left": 16,
-              "right": 16,
-              "top": 16,
+                  undefined,
+                ],
+                {
+                  "fontFamily": "custom",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                {},
+              ]
             }
+          >
+            
+          </Text>
+        </View>
+      </RNGestureHandlerButton>
+      <View
+        style={
+          {
+            "flex": 1,
           }
-          onActiveStateChange={[Function]}
-          onGestureEvent={[Function]}
-          onGestureHandlerEvent={[Function]}
-          onGestureHandlerStateChange={[Function]}
-          onHandlerStateChange={[Function]}
-          onPress={[Function]}
-          style={
-            {
-              "alignItems": "center",
-              "height": 24,
-              "justifyContent": "center",
-              "opacity": 1,
-              "width": 24,
-            }
+        }
+      />
+      <RNGestureHandlerButton
+        activeOpacity={0.3}
+        borderless={true}
+        collapsable={false}
+        delayLongPress={600}
+        handlerTag={188}
+        handlerType="NativeViewGestureHandler"
+        hitSlop={
+          {
+            "bottom": 16,
+            "left": 16,
+            "right": 16,
+            "top": 16,
           }
-          testID="message-composer-send-audio"
-        >
-          <View
-            accessibilityLabel="Send audio message"
-            accessibilityRole="button"
-            accessible={true}
-          >
-            <Text
-              allowFontScaling={false}
-              selectable={false}
-              style={
-                [
-                  {
-                    "color": "#2F343D",
-                    "fontSize": 24,
-                  },
-                  [
-                    {
-                      "lineHeight": 24,
-                    },
-                    undefined,
-                  ],
-                  {
-                    "fontFamily": "custom",
-                    "fontStyle": "normal",
-                    "fontWeight": "normal",
-                  },
-                  {},
-                ]
-              }
-            >
-              
-            </Text>
-          </View>
-        </RNGestureHandlerButton>
-      </View>
-    </View>
-  </keyboard-accessory-view-mock>,
-  <View
-    style={
-      [
-        {
-          "backgroundColor": "#E4E7EA",
-          "borderRadius": 4,
-          "elevation": 4,
-          "left": 8,
-          "maxHeight": 216,
-          "position": "absolute",
-          "right": 8,
-          "shadowColor": "#000",
-          "shadowOffset": {
-            "height": 2,
-            "width": 0,
-          },
-          "shadowOpacity": 0.5,
-          "shadowRadius": 2,
-        },
-        {
-          "bottom": -4,
-        },
-      ]
-    }
-  >
-    <RCTScrollView
-      contentContainerStyle={
-        {
-          "borderRadius": 4,
-          "overflow": "hidden",
         }
-      }
-      data={
-        [
+        onActiveStateChange={[Function]}
+        onGestureEvent={[Function]}
+        onGestureHandlerEvent={[Function]}
+        onGestureHandlerStateChange={[Function]}
+        onHandlerStateChange={[Function]}
+        onPress={[Function]}
+        style={
           {
-            "id": "all",
-            "subtitle": "Notify all in this room",
-            "t": "d",
-            "title": "all",
-            "type": "@",
-          },
-          {
-            "id": "here",
-            "subtitle": "Notify active users in this room",
-            "t": "d",
-            "title": "here",
-            "type": "@",
-          },
-        ]
-      }
-      getItem={[Function]}
-      getItemCount={[Function]}
-      keyExtractor={[Function]}
-      keyboardShouldPersistTaps="always"
-      onContentSizeChange={[Function]}
-      onLayout={[Function]}
-      onMomentumScrollBegin={[Function]}
-      onMomentumScrollEnd={[Function]}
-      onScroll={[Function]}
-      onScrollBeginDrag={[Function]}
-      onScrollEndDrag={[Function]}
-      removeClippedSubviews={false}
-      renderItem={[Function]}
-      scrollEventThrottle={0.0001}
-      stickyHeaderIndices={[]}
-      testID="autocomplete"
-      viewabilityConfigCallbackPairs={[]}
-    >
-      <View>
+            "alignItems": "center",
+            "height": 24,
+            "justifyContent": "center",
+            "opacity": 1,
+            "width": 24,
+          }
+        }
+        testID="message-composer-send-audio"
+      >
         <View
-          onFocusCapture={[Function]}
-          onLayout={[Function]}
-          style={null}
+          accessibilityLabel="Send audio message"
+          accessibilityRole="button"
+          accessible={true}
         >
-          <RNGestureHandlerButton
-            activeOpacity={0.105}
-            collapsable={false}
-            delayLongPress={600}
-            handlerTag={189}
-            handlerType="NativeViewGestureHandler"
-            onActiveStateChange={[Function]}
-            onGestureEvent={[Function]}
-            onGestureHandlerEvent={[Function]}
-            onGestureHandlerStateChange={[Function]}
-            onHandlerStateChange={[Function]}
-            onPress={[Function]}
-            rippleColor={4279259806}
+          <Text
+            allowFontScaling={false}
+            selectable={false}
             style={
-              {
-                "backgroundColor": "#FFFFFF",
-              }
-            }
-            testID="autocomplete-item-all"
-            underlayColor="#10529E"
-          >
-            <View
-              collapsable={false}
-              style={
+              [
                 {
-                  "backgroundColor": "#10529E",
-                  "borderBottomLeftRadius": undefined,
-                  "borderBottomRightRadius": undefined,
-                  "borderRadius": undefined,
-                  "borderTopLeftRadius": undefined,
-                  "borderTopRightRadius": undefined,
-                  "bottom": 0,
-                  "left": 0,
-                  "opacity": 0,
-                  "position": "absolute",
-                  "right": 0,
-                  "top": 0,
-                }
-              }
-            />
-            <View
-              style={
+                  "color": "#2F343D",
+                  "fontSize": 24,
+                },
+                [
+                  {
+                    "lineHeight": 24,
+                  },
+                  undefined,
+                ],
                 {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "minHeight": 48,
-                  "paddingHorizontal": 16,
-                  "paddingVertical": 6,
-                }
-              }
-            >
-              <View
-                style={
-                  [
-                    {
-                      "flex": 1,
-                      "justifyContent": "center",
-                    },
-                    {
-                      "paddingLeft": 0,
-                    },
-                  ]
-                }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "flex": 1,
-                      "flexDirection": "row",
-                    }
-                  }
-                >
-                  <View
-                    style={
-                      {
-                        "paddingLeft": 0,
-                      }
-                    }
-                  >
-                    <Text
-                      numberOfLines={1}
-                      style={
-                        {
-                          "backgroundColor": "transparent",
-                          "color": "#2F343D",
-                          "fontFamily": "Inter",
-                          "fontSize": 14,
-                          "fontWeight": "700",
-                          "textAlign": "left",
-                        }
-                      }
-                    >
-                      @all
-                    </Text>
-                  </View>
-                </View>
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "flex": 1,
-                      "flexDirection": "row",
-                      "paddingTop": 2,
-                    }
-                  }
-                >
-                  <Text
-                    style={
-                      {
-                        "backgroundColor": "transparent",
-                        "color": "#6C727A",
-                        "flex": 1,
-                        "fontFamily": "Inter",
-                        "fontSize": 14,
-                        "fontWeight": "400",
-                        "textAlign": "left",
-                      }
-                    }
-                  >
-                    Notify all in this room
-                  </Text>
-                </View>
-              </View>
-            </View>
-          </RNGestureHandlerButton>
-        </View>
-        <View
-          onFocusCapture={[Function]}
-          onLayout={[Function]}
-          style={null}
-        >
-          <RNGestureHandlerButton
-            activeOpacity={0.105}
-            collapsable={false}
-            delayLongPress={600}
-            handlerTag={190}
-            handlerType="NativeViewGestureHandler"
-            onActiveStateChange={[Function]}
-            onGestureEvent={[Function]}
-            onGestureHandlerEvent={[Function]}
-            onGestureHandlerStateChange={[Function]}
-            onHandlerStateChange={[Function]}
-            onPress={[Function]}
-            rippleColor={4279259806}
-            style={
-              {
-                "backgroundColor": "#FFFFFF",
-              }
+                  "fontFamily": "custom",
+                  "fontStyle": "normal",
+                  "fontWeight": "normal",
+                },
+                {},
+              ]
             }
-            testID="autocomplete-item-here"
-            underlayColor="#10529E"
           >
-            <View
-              collapsable={false}
-              style={
-                {
-                  "backgroundColor": "#10529E",
-                  "borderBottomLeftRadius": undefined,
-                  "borderBottomRightRadius": undefined,
-                  "borderRadius": undefined,
-                  "borderTopLeftRadius": undefined,
-                  "borderTopRightRadius": undefined,
-                  "bottom": 0,
-                  "left": 0,
-                  "opacity": 0,
-                  "position": "absolute",
-                  "right": 0,
-                  "top": 0,
-                }
-              }
-            />
-            <View
-              style={
-                {
-                  "alignItems": "center",
-                  "flexDirection": "row",
-                  "minHeight": 48,
-                  "paddingHorizontal": 16,
-                  "paddingVertical": 6,
-                }
-              }
-            >
-              <View
-                style={
-                  [
-                    {
-                      "flex": 1,
-                      "justifyContent": "center",
-                    },
-                    {
-                      "paddingLeft": 0,
-                    },
-                  ]
-                }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "flex": 1,
-                      "flexDirection": "row",
-                    }
-                  }
-                >
-                  <View
-                    style={
-                      {
-                        "paddingLeft": 0,
-                      }
-                    }
-                  >
-                    <Text
-                      numberOfLines={1}
-                      style={
-                        {
-                          "backgroundColor": "transparent",
-                          "color": "#2F343D",
-                          "fontFamily": "Inter",
-                          "fontSize": 14,
-                          "fontWeight": "700",
-                          "textAlign": "left",
-                        }
-                      }
-                    >
-                      @here
-                    </Text>
-                  </View>
-                </View>
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "flex": 1,
-                      "flexDirection": "row",
-                      "paddingTop": 2,
-                    }
-                  }
-                >
-                  <Text
-                    style={
-                      {
-                        "backgroundColor": "transparent",
-                        "color": "#6C727A",
-                        "flex": 1,
-                        "fontFamily": "Inter",
-                        "fontSize": 14,
-                        "fontWeight": "400",
-                        "textAlign": "left",
-                      }
-                    }
-                  >
-                    Notify active users in this room
-                  </Text>
-                </View>
-              </View>
-            </View>
-          </RNGestureHandlerButton>
+            
+          </Text>
         </View>
-      </View>
-    </RCTScrollView>
-  </View>,
-]
+      </RNGestureHandlerButton>
+    </View>
+  </View>
+</keyboard-accessory-view-mock>
 `;
 
 exports[`MessageComposer renders correctly 1`] = `
diff --git a/app/containers/ServerItem/styles.ts b/app/containers/ServerItem/styles.ts
index ece4105dff..5a0df8443d 100644
--- a/app/containers/ServerItem/styles.ts
+++ b/app/containers/ServerItem/styles.ts
@@ -7,12 +7,12 @@ export const ROW_HEIGHT = 56;
 export default StyleSheet.create({
 	serverItemContainer: {
 		flexDirection: 'row',
-		alignItems: 'center'
+		alignItems: 'center',
+		padding: 12
 	},
 	serverIcon: {
 		width: 44,
 		height: 44,
-		margin: 12,
 		borderRadius: 4,
 		resizeMode: 'contain'
 	},
@@ -20,7 +20,8 @@ export default StyleSheet.create({
 		flex: 1,
 		flexDirection: 'column',
 		justifyContent: 'center',
-		paddingRight: 18
+		paddingRight: 18,
+		paddingLeft: 12
 	},
 	serverName: {
 		fontSize: 18,
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index a3caa80d66..d515958a53 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -93,6 +93,7 @@
   "Created_snippet": "إنشاء مقتطف",
   "creating_channel": "إنشاء قناة",
   "creating_invite": "إنشاء دعوة",
+  "Current_Status": "الحالة الحالية",
   "Dark": "داكن",
   "Dark_level": "مستوى السمة الداكنة",
   "Default": "افتراضي",
@@ -190,7 +191,6 @@
   "Invalid_or_expired_invite_token": "رمز الدعوة غير صالح أو منتهي الصلاحية",
   "Invalid_server_version": "الخادم الذي تحاول الاتصال به يستخدم إصدارا لم يعد مدعوماً: {{currentVersion}}.\n\n النسخ المدعومة تبدأ من {{minVersion}}",
   "Invalid_workspace_URL": "عنوان URL لمساحة العمل غير صالح",
-  "Invisible": "غير مرئي",
   "Invite_Link": "رابط الدعوة",
   "Invite_user_to_join_channel": "دعوة مستخدم واحد إلى الانضمام إلى هذه القناة",
   "Invite_user_to_join_channel_all_from": "دعوة جميع المستخدمين من [‎#channel] إلى الانضمام إلى هذه القناة",
@@ -296,6 +296,7 @@
   "Notifications": "الإشعارات",
   "Notify_active_in_this_room": "أبلغ المستخدمين النشطين في هذه الغرفة",
   "Notify_all_in_this_room": "أبلغ الجميع في الغرفة",
+  "Offline": "غير متصل بالإنترنت",
   "Omnichannel": "القنوات الموحدة",
   "Omnichannel_enable_alert": "أنت غير متاح ",
   "Onboarding_agree_terms": "بالمواصلة أنت توافق على Rocket.Chat",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index 089f3a95e8..a75e34b04a 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -158,6 +158,7 @@
   "creating_discussion": "আলোচনা তৈরি হচ্ছে",
   "creating_invite": "ইনভাইট তৈরি হচ্ছে",
   "creating_team": "দল তৈরি হচ্ছে",
+  "Current_Status": "বর্তমান অবস্থা",
   "Dark": "অন্ধকার",
   "Dark_level": "অন্ধকার স্তর",
   "decline": "অস্বীকার করুন",
@@ -307,7 +308,6 @@
   "Invalid_or_expired_invite_token": "অকার্যকর বা মেয়াদ উত্তীর্ণ ইনভাইট টোকেন",
   "Invalid_server_version": "আপনি যাচাই করতে চেষ্টা করছেন তার একটি সংস্করণ ব্যবহার করছেন যা এখনও অ্যাপ দ্বারা সাপোর্ট করা হয়নি: {{currentVersion}}।\n\nআমরা সংস্করণ {{minVersion}} প্রয়োজন প্রয়োজন",
   "Invalid_workspace_URL": "অবৈধ ওয়ার্কস্পেস URL",
-  "Invisible": "অদৃশ্য",
   "Invite_Link": "আমন্ত্রণ লিঙ্ক",
   "Invite_users": "ব্যবহারকারীদের আমন্ত্রণ করুন",
   "IP": "IP",
@@ -460,6 +460,7 @@
   "Notify_active_in_this_room": "এই রুমে সক্রিয় ব্যবহারকারীগণকে অবহিত করুন",
   "Notify_all_in_this_room": "এই রুমে সবাইকে অবহিত করুন",
   "Off": "বন্ধ",
+  "Offline": "অফলাইন",
   "Omnichannel": "অমনিচ্যানেল",
   "Omnichannel_enable_alert": "আপনি অমনিচ্যানেলে উপলভ্য নই। আপনি কি উপলব্ধ হতে চান?",
   "Omnichannel_on_hold_chat_resumed": "হোল্ড চ্যাট পুনরায় শুরু হয়েছে: {{comment}}",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index b506a0cfbb..5d33bae611 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -168,6 +168,7 @@
   "creating_discussion": "vytvoření diskuse",
   "creating_invite": "vytváření pozvánky",
   "creating_team": "vytváření týmu",
+  "Current_Status": "Aktuální stav",
   "Custom_push_gateway_connected_description": "Váš pracovní prostor používá vlastní bránu pro oznámení push. Případné problémy si ověřte u správce pracovního prostoru.",
   "Custom_push_gateway_connection": "Připojení vlastní brány",
   "Dark": "Temný",
@@ -331,7 +332,6 @@
   "Invalid_or_expired_invite_token": "Neplatný nebo vypršela platnost tokenu pozvánky",
   "Invalid_server_version": "Pracovní prostor, který se pokoušíte připojit, používá verzi, která již není aplikací podporována: {{currentVersion}}.\n\nPožadujeme verzi {{minVersion}}",
   "Invalid_workspace_URL": "Neplatná URL adresa pracovního prostoru",
-  "Invisible": "Neviditelný",
   "Invite_Link": "Odkaz na pozvánku",
   "Invite_user_to_join_channel": "Pozvat jednoho uživatele, aby se připojil k tomuto kanálu",
   "Invite_user_to_join_channel_all_from": "Pozvat všechny uživatele z [#channel], aby se připojili k tomuto kanálu",
@@ -498,6 +498,7 @@
   "Notify_active_in_this_room": "Upozornit aktivní uživatele v této místnosti",
   "Notify_all_in_this_room": "Upozornit všechny v této místnosti",
   "Off": "Vypnuto",
+  "Offline": "Offline",
   "Omnichannel": "Omnikanál",
   "Omnichannel_enable_alert": "Nejste k dispozici na Omnikanálu. Chcete být k dispozici?",
   "Omnichannel_on_hold_chat_resumed": "Podržený chat obnoven: {{comment}}",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index a865261607..3ac11ac882 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -152,6 +152,7 @@
   "creating_discussion": "Erzeuge Diskussion",
   "creating_invite": "Einladung erstellen",
   "creating_team": "Team erstellen",
+  "Current_Status": "Aktueller Status",
   "Dark": "Dunkel",
   "Dark_level": "Dunkelstufe",
   "decline": "Ablehnen",
@@ -300,7 +301,6 @@
   "Invalid_or_expired_invite_token": "Ungültiger oder abgelaufener Einladungscode",
   "Invalid_server_version": "Der Server, mit dem Sie sich verbinden möchten, verwendet eine Version, die von der App nicht mehr unterstützt wird: {{currentVersion}}.\n\nWir benötigen Version {{minVersion}}.",
   "Invalid_workspace_URL": "Ungültige Arbeitsbereichs-URL",
-  "Invisible": "Unsichtbar",
   "Invite_Link": "Einladungs-Link",
   "Invite_user_to_join_channel": "Benutzer in diesen Channel einladen",
   "Invite_user_to_join_channel_all_from": "Alle Benutzer des Channels [#channel] einladen, diesem Channel zu folgen",
@@ -449,6 +449,7 @@
   "Notifications": "Benachrichtigungen",
   "Notify_active_in_this_room": "Aktive Benutzer in diesem Room benachrichtigen",
   "Notify_all_in_this_room": "Alle in diesem Room nenachrichtigen",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Sie sind in Omnichannel nicht verfügbar. Möchten Sie erreichbar sein?",
   "Omnichannel_on_hold_chat_resumed": "Pausierter Chat wird fortgesetzt: {{comment}}",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 942da87ec3..f3613ba6b8 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -171,6 +171,7 @@
   "creating_discussion": "creating discussion",
   "creating_invite": "creating invite",
   "creating_team": "creating team",
+  "Current_Status": "Current Status",
   "Custom_push_gateway_connected_description": "Your workspace uses a custom push notification gateway. Check with your workspace administrator for any issues.",
   "Custom_push_gateway_connection": "Custom gateway connection",
   "Dark": "Dark",
@@ -352,7 +353,6 @@
   "Invalid_or_expired_invite_token": "Invalid or expired invite token",
   "Invalid_server_version": "The workspace you're trying to connect is using a version that's not supported by the app anymore: {{currentVersion}}.\n\nWe require version {{minVersion}}",
   "Invalid_workspace_URL": "Invalid workspace URL",
-  "Invisible": "Invisible",
   "Invite_Link": "Invite link",
   "Invite_user_to_join_channel": "Invite one user to join this channel",
   "Invite_user_to_join_channel_all_from": "Invite all users from [#channel] to join this channel",
@@ -521,6 +521,7 @@
   "Notify_active_in_this_room": "Notify active users in this room",
   "Notify_all_in_this_room": "Notify all in this room",
   "Off": "Off",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "You're not available on Omnichannel. Would you like to be available?",
   "Omnichannel_on_hold_chat_resumed": "On hold chat resumed: {{comment}}",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index 976ce6ec50..cb2e0fe46e 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -72,6 +72,7 @@
   "Create_Channel": "Crear sala",
   "Created_snippet": "crear mensaje en bloque",
   "creating_channel": "creando channel",
+  "Current_Status": "Estado Actual",
   "Dark": "Oscuro",
   "Dark_level": "Nivel de oscuridad",
   "Default": "Por defecto",
@@ -129,7 +130,6 @@
   "In_App_and_Desktop_Alert_info": "Muestra un banner en la parte superior de la pantalla cuando la aplicación esté abierta y muestra una notificación en el escritorio",
   "Invalid_server_version": "El servidor que intentas conectar está usando una versión que ya no está soportada por la aplicación : {{currentVersion}}. Se requiere una versión {{minVersion}}.",
   "Invalid_workspace_URL": "URL del espacio de trabajo no válida",
-  "Invisible": "Invisible",
   "Invite_user_to_join_channel": "Invitar a un usuario a unirse a este canal",
   "Invite_user_to_join_channel_all_from": "Invitar a todos los usuarios de [#channell] a que se unan a este canal",
   "Invite_user_to_join_channel_all_to": "Invitar a todos los usuarios de este canal a unirse a [#channel]",
@@ -184,6 +184,7 @@
   "Notifications": "Notificaciones",
   "Notify_active_in_this_room": "Notificar a los usuarios activos en esta sala",
   "Notify_all_in_this_room": "Notificar a todos en esta sala",
+  "Offline": "Desconectado",
   "Online": "Conectado",
   "Only_authorized_users_can_write_new_messages": "Sólo pueden escribir mensajes usuarios autorizados",
   "Oops": "Oops!",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index a92e89124b..edd24b1a41 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -142,6 +142,7 @@
   "creating_discussion": "luo keskustelua",
   "creating_invite": "luo kutsua",
   "creating_team": "luo tiimiä",
+  "Current_Status": "Nykytila",
   "Dark": "Tumma",
   "Dark_level": "Tumman taso",
   "Default": "Oletus",
@@ -282,7 +283,6 @@
   "Invalid_or_expired_invite_token": "Virheellinen tai vanhentunut kutsutunnus",
   "Invalid_server_version": "Palvelin, johon yrität muodostaa yhteyttä, käyttää versiota, jota sovellus ei enää tue: {{currentVersion}}.\n\nEdellytämme versiota {{minVersion}}",
   "Invalid_workspace_URL": "Virheellinen työtilan URL-osoite",
-  "Invisible": "Näkymätön",
   "Invite_Link": "Kutsulinkki",
   "Invite_user_to_join_channel": "Kutsu käyttäjä liittymään tälle kanavalle",
   "Invite_user_to_join_channel_all_from": "Kutsu kaikki käyttäjät kanavalta [#channel] liittymään tälle kanavalle",
@@ -426,6 +426,7 @@
   "Notifications": "Ilmoitukset",
   "Notify_active_in_this_room": "Ilmoita tämän huoneen aktiivisille käyttäjille",
   "Notify_all_in_this_room": "Ilmoita kaikille tässä huoneessa",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Et ole saavutettavissa Omnichannelissa. Haluatko olla saavutettavissa?",
   "Omnichannel_on_hold_chat_resumed": "Pidossa olevaa keskustelua jatkettiin: {{comment}}",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 5aba81a464..316e25284a 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -118,6 +118,7 @@
   "creating_discussion": "créer une discussion",
   "creating_invite": "création d'une invitation",
   "creating_team": "création de l'équipe",
+  "Current_Status": "Statut actuel",
   "Dark": "Sombre",
   "Dark_level": "Niveau d'obscurité",
   "Default": "Défaut",
@@ -247,7 +248,6 @@
   "Invalid_or_expired_invite_token": "Jeton d'invitation non valide ou expiré",
   "Invalid_server_version": "Le serveur auquel vous essayez de vous connecter utilise une version qui n'est plus prise en charge par l'application : {{currentVersion}}.\n\nNous exigeons la version {{minVersion}}",
   "Invalid_workspace_URL": "URL d’espace de travail invalide",
-  "Invisible": "Invisible",
   "Invite_Link": "Lien d'invitation",
   "Invite_user_to_join_channel": "Inviter un utilisateur à rejoindre le canal",
   "Invite_user_to_join_channel_all_from": "Inviter tous les utilisateurs de [#channel] à rejoindre ce canal",
@@ -386,6 +386,7 @@
   "Notifications": "Notifications",
   "Notify_active_in_this_room": "Notifier les utilisateurs actifs dans ce salon",
   "Notify_all_in_this_room": "Avertir tout le monde dans ce salon",
+  "Offline": "Hors ligne",
   "Omnichannel": "Omnicanal",
   "Omnichannel_enable_alert": "Vous n'êtes pas disponible sur Omnicanal. Souhaitez-vous être disponible ?",
   "Omnichannel_on_hold_chat_resumed": "Le chat en attente a repris : {{comment}}",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index a361300703..7d999c8501 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -158,6 +158,7 @@
   "creating_discussion": "चर्चा बना रहा है",
   "creating_invite": "आमंत्रण बना रहा है",
   "creating_team": "टीम बना रहा है",
+  "Current_Status": "वर्तमान स्थिति",
   "Dark": "डार्क",
   "Dark_level": "डार्क स्तर",
   "decline": "तिरस्कार",
@@ -307,7 +308,6 @@
   "Invalid_or_expired_invite_token": "अमान्य या समाप्त होने वाला निमंत्रण टोकन",
   "Invalid_server_version": "यह कार्यस्थान जिससे आप कनेक्ट करने का प्रयास कर रहे हैं, वह ऐप द्वारा अब समर्थित नहीं है: {{currentVersion}}।\n\nहमें {{minVersion}} संस्करण की आवश्यकता है",
   "Invalid_workspace_URL": "अमान्य कार्यक्षेत्र URL",
-  "Invisible": "अदृश्य",
   "Invite_Link": "निमंत्रण लिंक",
   "Invite_users": "उपयोगकर्ताओं को निमंत्रित करें",
   "IP": "आईपी",
@@ -460,6 +460,7 @@
   "Notify_active_in_this_room": "इस कमरे में सक्रिय उपयोगकर्ताओं को सूचित करें",
   "Notify_all_in_this_room": "इस कमरे में सभी को सूचित करें",
   "Off": "बंद",
+  "Offline": "ऑफ़लाइन",
   "Omnichannel": "ओमनीचैनल",
   "Omnichannel_enable_alert": "आप ओमनीचैनल पर उपलब्ध नहीं हैं। क्या आप उपलब्ध होना चाहेंगे?",
   "Omnichannel_on_hold_chat_resumed": "होल्ड पर चैट पुनरारंभ: {{comment}}",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 804c9ce32f..7c3d4ac410 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -158,6 +158,7 @@
   "creating_discussion": "megbeszélés létrehozása",
   "creating_invite": "meghívó létrehozása",
   "creating_team": "csapat létrehozása",
+  "Current_Status": "Jelenlegi állapot",
   "Dark": "Sötét",
   "Dark_level": "Sötét szint",
   "decline": "Elutasítom",
@@ -307,7 +308,6 @@
   "Invalid_or_expired_invite_token": "Érvénytelen vagy lejárt meghívási token",
   "Invalid_server_version": "A munkaterület, amelyhez csatlakozni próbál, olyan verziót használ, amelyet az alkalmazás már nem támogat: {{currentVersion}}. \n\nA {{minVersion}} verzióra van szükségünk",
   "Invalid_workspace_URL": "Érvénytelen munkaterület URL",
-  "Invisible": "Láthatatlan",
   "Invite_Link": "Meghívási hivatkozás",
   "Invite_users": "Felhasználók meghívása",
   "IP": "IP-cím",
@@ -461,6 +461,7 @@
   "Notify_active_in_this_room": "Aktív felhasználók értesítése ebben a szobában",
   "Notify_all_in_this_room": "Mindenki értesítése ebben a szobában",
   "Off": "Ki",
+  "Offline": "Offline",
   "Omnichannel": "Összcsatorna",
   "Omnichannel_enable_alert": "Nem vagy elérhető az Összcsatornában. Szeretnél elérhető lenni?",
   "Omnichannel_on_hold_chat_resumed": "Várakoztatott csevegés folytatva: {{comment}}",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 14abb2f041..ebe2b702ca 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -100,6 +100,7 @@
   "Created_snippet": "Snippet creato",
   "creating_channel": "creo canale",
   "creating_invite": "creo invito",
+  "Current_Status": "Stato attuale",
   "Dark": "Scuro",
   "Dark_level": "Contrasto",
   "Default": "Predefinito",
@@ -219,7 +220,6 @@
   "Invalid_or_expired_invite_token": "Token di invito non valido o scaduto",
   "Invalid_server_version": "Il server a cui stai cercando di connetterti sta utilizzando una versione non più supportata dall'app: {{currentVersion}}.\n\nVersione minima richiesta: {{minVersion}}",
   "Invalid_workspace_URL": "URL dello spazio di lavoro non valido",
-  "Invisible": "Invisibile",
   "Invite_Link": "Link di invito",
   "Invite_user_to_join_channel": "Invita un utente ad entrare in questo canale",
   "Invite_user_to_join_channel_all_from": "Invita tutti gli utenti da [#channell] per unirsi a questo canale",
@@ -330,6 +330,7 @@
   "Notifications": "Notifiche",
   "Notify_active_in_this_room": "Notifica solo gli utenti attivi in questa stanza",
   "Notify_all_in_this_room": "Notifica tutti gli utenti in questa stanza",
+  "Offline": "Non in linea",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Non sei ancora su Onmichannel. Vuoi attivarlo?",
   "Onboarding_agree_terms": "Procedendo, accetti Rocket.Chat",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index b0ac2cdc55..dcbeca56bf 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -92,6 +92,7 @@
   "Created_snippet": "スニペットを作成",
   "creating_channel": "チャンネルを作成",
   "creating_invite": "招待を作成",
+  "Current_Status": "現状",
   "Dark": "ダーク",
   "Dark_level": "ダークレベル",
   "Default": "デフォルト",
@@ -191,7 +192,6 @@
   "Invalid_or_expired_invite_token": "招待トークンが無効か、期限が切れています",
   "Invalid_server_version": "接続しようとしているサーバーのバージョン（{{currentVersion}}）はサポートされていません。\n\nサポートする最低バージョンは {{minVersion}} です",
   "Invalid_workspace_URL": "無効なワークスペースのURL",
-  "Invisible": "状態を隠す",
   "Invite_Link": "招待リンク",
   "Invite_user_to_join_channel": "1ユーザーをこのチャネルに招待",
   "Invite_user_to_join_channel_all_from": "[#channel]のすべてのユーザーをこのチャネルに招待",
@@ -273,6 +273,7 @@
   "Notifications": "通知",
   "Notify_active_in_this_room": "このルームのアクティブなユーザーに通知する",
   "Notify_all_in_this_room": "このルームのユーザー全員に通知する",
+  "Offline": "オフライン",
   "Online": "オンライン",
   "Only_authorized_users_can_write_new_messages": "承認されたユーザーだけが新しいメッセージを書き込めます",
   "Oops": "おっと！",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 7a7c8eb46d..9c7f48b362 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -118,6 +118,7 @@
   "creating_discussion": "discussie aanmaken",
   "creating_invite": "uitnodiging maken",
   "creating_team": "team maken",
+  "Current_Status": "Huidige status",
   "Dark": "Donker",
   "Dark_level": "Donker niveau",
   "Default": "Standaard",
@@ -247,7 +248,6 @@
   "Invalid_or_expired_invite_token": "Ongeldige of verlopen uitnodigingstoken",
   "Invalid_server_version": "De server waarmee je probeert te verbinden, gebruikt een versie die niet meer door de app wordt ondersteund: {{currentVersion}}.\n\nWe hebben versie {{minVersion}} nodig",
   "Invalid_workspace_URL": "Ongeldige werkruimte-URL",
-  "Invisible": "Onzichtbaar",
   "Invite_Link": "Uitnodigingslink",
   "Invite_user_to_join_channel": "Nodig een gebruiker uit om lid te worden van dit kanaal",
   "Invite_user_to_join_channel_all_from": "Nodig alle gebruikers van [#kanaal] uit om lid te worden van dit kanaal",
@@ -386,6 +386,7 @@
   "Notifications": "Notificaties",
   "Notify_active_in_this_room": "Waarschuw actieve gebruikers in deze kamer",
   "Notify_all_in_this_room": "Breng iedereen in deze kamer op de hoogte",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Je bent niet beschikbaar op Omnichannel. Wil je beschikbaar zijn?",
   "Omnichannel_on_hold_chat_resumed": "Chat in de wacht hervat: {{comment}}",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index a0a1d8f9db..8a4a86869d 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -168,6 +168,7 @@
   "creating_discussion": "criando discussão",
   "creating_invite": "criando convite",
   "creating_team": "criando time",
+  "Current_Status": "Status atual",
   "Custom_push_gateway_connected_description": "Seu workspace utiliza um gateway de notificação push personalizado. Verifique com o administrador do seu workspace se há algum problema.",
   "Custom_push_gateway_connection": "Conexão personalizada com o gateway",
   "Dark": "Escuro",
@@ -341,7 +342,6 @@
   "Invalid_or_expired_invite_token": "Token de convite inválido ou vencido",
   "Invalid_server_version": "O servidor que você está conectando não é suportado mais por esta versão do aplicativo: {{currentVersion}}.\n\nEsta versão do aplicativo requer a versão {{minVersion}} da workspace para funcionar corretamente.",
   "Invalid_workspace_URL": "URL de workspace inválida",
-  "Invisible": "Invisível",
   "Invite_Link": "Link de convite",
   "Invite_user_to_join_channel": "Convidar um usuário para ingressar neste canal",
   "Invite_user_to_join_channel_all_from": "Convidar todos os usuários de [#channel] para ingressar neste canal",
@@ -508,6 +508,7 @@
   "Notify_active_in_this_room": "Notificar usuários ativos nesta sala",
   "Notify_all_in_this_room": "Notificar todos nesta sala",
   "Off": "Desativado",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Você não está disponível no Omnichannel. Você quer ficar disponível?",
   "Omnichannel_on_hold_chat_resumed": "Conversa em espera retomada: {{comment}}",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index fc678dd4ec..96c75a60ec 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -88,6 +88,7 @@
   "Created_snippet": "criado um extracto",
   "creating_channel": "a criar canal",
   "creating_invite": "a criar convite",
+  "Current_Status": "Estado Atual",
   "Dark": "Escuro",
   "Dark_level": "Nível Escuro",
   "Default": "Predefinição",
@@ -186,7 +187,6 @@
   "Invalid_or_expired_invite_token": "Token de convite invalido ou expirado",
   "Invalid_server_version": "O servidor ao qual esta tentando ligar-se, utiliza uma versão que não é suporta pela aplicação: {{currentVersion}}.\n\nA versão mínima requerida é {{minVersion}}",
   "Invalid_workspace_URL": "URL de espaço de trabalho inválida",
-  "Invisible": "Invisível",
   "Invite_Link": "Link de convite",
   "Invite_user_to_join_channel": "Convidar um utilizador para juntar-se a este canal",
   "Invite_user_to_join_channel_all_from": "Convide todos os utilizadores de [#channel] a participar deste canal",
@@ -273,6 +273,7 @@
   "Notifications": "Notificações",
   "Notify_active_in_this_room": "Notifica utilizadores activos nesta sala",
   "Notify_all_in_this_room": "Notifica todos os utilizadores nesta sala",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Você não está disponível no Omnichannel. Você gostaria de estar disponível?",
   "Onboarding_agree_terms": "Ao continuar, você concorda com Rocket.Chat",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index cbf943b4b0..9456d8954b 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -136,6 +136,7 @@
   "creating_discussion": "создание обсуждения",
   "creating_invite": "создание приглашения",
   "creating_team": "создание Команды",
+  "Current_Status": "Текущий статус",
   "Dark": "Темный",
   "Dark_level": "Уровень затемненности",
   "Default": "По умолчанию",
@@ -272,7 +273,6 @@
   "Invalid_or_expired_invite_token": "Токен приглашения не действителен или с истекшим сроком действия",
   "Invalid_server_version": "Сервер, к которому вы пытаетесь подключиться, использует версию, которая больше не поддерживается приложением: {{currentVersion}}.\n\nНам нужна версия {{minVersion}}",
   "Invalid_workspace_URL": "Недействительный URL рабочего пространства",
-  "Invisible": "Невидимый",
   "Invite_Link": "Ссылка Приглашения",
   "Invite_user_to_join_channel": "Пригласить пользователя в канал",
   "Invite_user_to_join_channel_all_from": "Пригласить всех пользователей из [#channel] присоединиться к этому каналу",
@@ -416,6 +416,7 @@
   "Notifications": "Уведомления",
   "Notify_active_in_this_room": "Уведомить всех активных пользователей в этом чате",
   "Notify_all_in_this_room": "Уведомить всех в этом чате",
+  "Offline": "Оффлайн",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Вы не доступны в Omnichannel. Хотите стать доступными?",
   "Omnichannel_on_hold_chat_resumed": "Чат в режиме удержания возобновлен: {{comment}}",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index e1abfaf287..68321efb57 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -123,6 +123,7 @@
   "creating_discussion": "ustvarjanje razprave",
   "creating_invite": "kreiranje povabila",
   "creating_team": "ustvarjanje ekipe",
+  "Current_Status": "Trenutno stanje",
   "Dark": "Temno",
   "Dark_level": "Temna raven",
   "Default": "Privzeto",
@@ -257,7 +258,6 @@
   "Invalid_or_expired_invite_token": "Neveljaven ali iztekel žeton povabila",
   "Invalid_server_version": "Strežnik, ki ga poskušate povezati, uporablja različico, ki je aplikacija ne podpira več: {{currentVersion}}.\n\nZahtevamo različico {{minVersion}}",
   "Invalid_workspace_URL": "Neveljaven URL delovnega prostora",
-  "Invisible": "Neviden",
   "Invite_Link": "Povezava povabila",
   "Invite_user_to_join_channel": "Povabi uporabnika, da se pridruži kanalu",
   "Invite_user_to_join_channel_all_from": "Povabi vse uporabnike iz [#channel], da se pridružijo kanalu",
@@ -398,6 +398,7 @@
   "Notifications": "Obvestila",
   "Notify_active_in_this_room": "Obvesti aktivne uporabnike v tej sobi",
   "Notify_all_in_this_room": "Obvesti vse v tej sobi",
+  "Offline": "Brez povezave",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Niste na voljo na Omnichannelu. Bi radi bili na voljo?",
   "Omnichannel_on_hold_chat_resumed": "Na zadrževanju klepeta se je nadaljeval: {{comment}}",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index e6a2667023..cd84aeb011 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -142,6 +142,7 @@
   "creating_discussion": "skapar diskussion",
   "creating_invite": "skapar inbjudan",
   "creating_team": "skapar team",
+  "Current_Status": "Aktuell status",
   "Dark": "Mörk",
   "Dark_level": "Mörk nivå",
   "Default": "Standard",
@@ -281,7 +282,6 @@
   "Invalid_or_expired_invite_token": "Ogiltig eller utgången inbjudningstoken",
   "Invalid_server_version": "Den server du försöker ansluta till använder en version som appen inte har stöd för längre: {{currentVersion}}.\n\nDu måste ha version {{minVersion}}",
   "Invalid_workspace_URL": "Ogiltig arbetsytas URL",
-  "Invisible": "Dold",
   "Invite_Link": "Inbjudningslänk",
   "Invite_user_to_join_channel": "Bjud in en användare till att ansluta till denna kanal.",
   "Invite_user_to_join_channel_all_from": "Bjud in alla användare från [#kanalen] för att gå med i den här kanalen",
@@ -425,6 +425,7 @@
   "Notifications": "Meddelanden",
   "Notify_active_in_this_room": "Meddela aktiva användare i rummet",
   "Notify_all_in_this_room": "Meddela alla i rummet",
+  "Offline": "Offline",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "Du är inte tillgänglig i Omnichannel. Vill du vara tillgänglig?",
   "Omnichannel_on_hold_chat_resumed": "Återupptog parkerad chatt: {{comment}}",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 921eb3f05a..4186463cc5 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -158,6 +158,7 @@
   "creating_discussion": "பேச்சு உருவாக்குதல்",
   "creating_invite": "கர்த்தாலை உருவாக்குதல்",
   "creating_team": "குழு உருவாக்குகின்றன",
+  "Current_Status": "நடப்பு நிலை",
   "Dark": "கருப்பு",
   "Dark_level": "கருப்பு அளவு",
   "decline": "மறுக்கு",
@@ -307,7 +308,6 @@
   "Invalid_or_expired_invite_token": "தவறான அல்லது காலாவதி அழைப்பு டோக்கன்",
   "Invalid_server_version": "நீங்கள் இணைக்க முயற்சிக்கின்றீர்கள் பயன்பாட்டை ஆதரிக்காத பதிப்புக்கு உள்ள வெளிப்புற படைப்புக்கு உபயோகிக்கிற பேனல்: {{currentVersion}}.\n\nஎங்களுக்கு பதிப்பு தேவைப்படுகின்றது {{minVersion}}",
   "Invalid_workspace_URL": "தவறான வேலைத்தள URL",
-  "Invisible": "தெரியாதது",
   "Invite_Link": "அழைப்பு இணைப்பு",
   "Invite_users": "பயனர்களை அழை",
   "IP": "IP",
@@ -460,6 +460,7 @@
   "Notify_active_in_this_room": "இந்த அறையில் செயலில் உள்ளவர்களுக்கு அறிவிக்க",
   "Notify_all_in_this_room": "இந்த அறையில் உள்ளவைகளுக்கு அறிவிக்க",
   "Off": "அணுக",
+  "Offline": "ஒஃப்லைன்",
   "Omnichannel": "ஒம்நிசானல்",
   "Omnichannel_enable_alert": "நீங்கள் ஒம்நிசானலில் கிடைக்காமல் உள்ளீர்கள். நீங்கள் கிடைக்க விரும்புகிறீர்களா?",
   "Omnichannel_on_hold_chat_resumed": "அழிந்துகொண்டுள்ள உரையாடல் மீட்கப்பட்டது: {{comment}}",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 088f8eb54e..c902040de6 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -157,6 +157,7 @@
   "creating_discussion": "సంవాదాలను సృష్టిస్తోంది",
   "creating_invite": "ఆహ్వానాన్ని సృష్టించడం",
   "creating_team": "టీమ్ సృష్టిస్తోంది",
+  "Current_Status": "वर्तमान स्थिति",
   "Dark": "గాఢంగా",
   "Dark_level": "గాఢంగా స్థాయి",
   "decline": "నిరాకరించు",
@@ -306,7 +307,6 @@
   "Invalid_or_expired_invite_token": "అమాయక లేదా అవధిచుక్తాయిన అమర్పు టోకెన్",
   "Invalid_server_version": "మీరు కనెక్ట్ చేయడానికి ప్రయాసిస్తున్న వర్క్‌స్పేస్ యొక్క ఒక అవసరం లేదు: {{currentVersion}}.\n\nమేము వినియోగించే అప్లికేషన్ యొక్క ఆవశ్యకానికి అయితే మేము అవసరం ఉన్న సంస్కరణం: {{minVersion}}",
   "Invalid_workspace_URL": "చెల్లని వర్క్‌స్పేస్ URL",
-  "Invisible": "కనిపించదు",
   "Invite_Link": "ఆమంత్రణ లింక్",
   "Invite_users": "వాడికి ఆమంత్రణం పంపండి",
   "IP": "IP",
@@ -459,6 +459,7 @@
   "Notify_active_in_this_room": "ఈ గదిలో సక్రియంగా ఉన్న వాడులను నవోదయించు",
   "Notify_all_in_this_room": "ఈ గదిలో అన్నివారినీ నవోదయించు",
   "Off": "ఆఫ్",
+  "Offline": "ऑफ़लाइन",
   "Omnichannel": "ఒమ్నిచానెల్",
   "Omnichannel_enable_alert": "మీరు ఒమ్నిచానెల్‌లో అందుబాటులేదు. మీరు అందుబాటునారా?",
   "Omnichannel_on_hold_chat_resumed": "ఆఫ్‌లోడ్ లోని చాట్ పునఃప్రారంభించబడింది: {{comment}}",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index a58f38f91f..7ab7ede34c 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -92,6 +92,7 @@
   "Created_snippet": "kalıp oluşturdu",
   "creating_channel": "kanal açılıyor",
   "creating_invite": "davet üretiliyor",
+  "Current_Status": "Mevcut Durum",
   "Dark": "Karanlık",
   "Dark_level": "Karanlık Seviyesi",
   "Default": "Varsayılan",
@@ -205,7 +206,6 @@
   "Invalid_or_expired_invite_token": "Geçersiz veya süresi dolmuş davet belirteci (token)",
   "Invalid_server_version": "Bağlanmaya çalıştığınız sunucu artık uygulama tarafından desteklenmeyen bir sürüm kullanıyor: {{currentVersion}}.\n\n{{minVersion}} sürümüne ihtiyacımız var",
   "Invalid_workspace_URL": "Geçersiz çalışma alanı URL'si",
-  "Invisible": "Görünmez",
   "Invite_Link": "Davet Bağlantısı",
   "Invite_user_to_join_channel": "Bu kanala katılması için bir kullanıcı davet",
   "Invite_user_to_join_channel_all_from": "[#kanal] 'daki tüm kullanıcıları bu kanala katılmaya davet et",
@@ -313,6 +313,7 @@
   "Notifications": "Bildirimler",
   "Notify_active_in_this_room": "Bu odadaki çevrimiçi kullanıcıları bilgilendir",
   "Notify_all_in_this_room": "Bu odadaki herkesi bilgilendir",
+  "Offline": "Çevrimdışı",
   "Omnichannel": "Çoklu Kanal",
   "Omnichannel_enable_alert": "Çoklu Kanal'da mevcut değilsiniz. Erişilebilir olmak ister misiniz?",
   "Onboarding_agree_terms": "Devam ederek Rocket.Chat'i kabul etmiş olursunuz",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index 99fcf89b1c..51b7b0f2fb 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -91,6 +91,7 @@
   "Created_snippet": "新增程式码片段",
   "creating_channel": "创建频道",
   "creating_invite": "创建邀请",
+  "Current_Status": "当前状态",
   "Dark": "深色",
   "Dark_level": "深色程度",
   "Default": "默認",
@@ -197,7 +198,6 @@
   "Invalid_or_expired_invite_token": "无效或到期的邀请 token",
   "Invalid_server_version": "此 App 版本已不支援您正在连线之服务器版本。当前版本: {{currentVersion}}.\\n\\n最低版本要求: {{minVersion}}",
   "Invalid_workspace_URL": "无效的工作区 URL",
-  "Invisible": "隐身",
   "Invite_Link": "邀请链接",
   "Invite_users": "邀请用戶",
   "IP": "IP",
@@ -296,6 +296,7 @@
   "Notifications": "通知",
   "Notify_active_in_this_room": "通知这个聊天室的活跃用户",
   "Notify_all_in_this_room": "通知这个聊天室的所有人",
+  "Offline": "离线",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "您尚未启用 Omnichannel，是否想要启用？",
   "Onboarding_agree_terms": "继续，即表示您同意 Rocket.Chat",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 4d6b0acd8c..0f9655477e 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -93,6 +93,7 @@
   "Created_snippet": "新增程式碼片段",
   "creating_channel": "新建頻道",
   "creating_invite": "建立邀請",
+  "Current_Status": "目前狀態",
   "Dark": "深色",
   "Dark_level": "深色程度",
   "Default": "預設",
@@ -207,7 +208,6 @@
   "Invalid_or_expired_invite_token": "無效或到期的邀請 token",
   "Invalid_server_version": "此 App 版本已不支援您正在連線之伺服器版本。當前版本: {{currentVersion}}.\\n\\n最低版本要求: {{minVersion}}",
   "Invalid_workspace_URL": "無效的工作區 URL",
-  "Invisible": "隱身",
   "Invite_Link": "邀請連結",
   "Invite_user_to_join_channel": "邀請使用者加入此頻道",
   "Invite_user_to_join_channel_all_from": "邀請[#channel]中的所有使用者加入此頻道",
@@ -313,6 +313,7 @@
   "Notifications": "通知",
   "Notify_active_in_this_room": "通知這個聊天室的活躍使用者",
   "Notify_all_in_this_room": "通知這個聊天室的所有人",
+  "Offline": "離線",
   "Omnichannel": "Omnichannel",
   "Omnichannel_enable_alert": "您尚未啟用 Omnichannel，是否想要啟用？",
   "Onboarding_agree_terms": "繼續，即表示您同意 Rocket.Chat",
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index c1abc6d0b3..ea274d22fe 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -313,7 +313,11 @@ const InsideStackNavigator = () => {
 				options={{ headerShown: false }}
 			/>
 			<InsideStack.Screen name='AttachmentView' component={AttachmentView} />
-			<InsideStack.Screen name='StatusView' component={StatusView} />
+			<InsideStack.Screen
+				name='StatusView'
+				component={StatusView}
+				options={{ presentation: 'transparentModal', animation: 'slide_from_bottom' }}
+			/>
 			{/* @ts-ignore */}
 			<InsideStack.Screen name='ShareView' component={ShareView} />
 			{/* @ts-ignore */}
diff --git a/app/views/DirectoryView/styles.ts b/app/views/DirectoryView/styles.ts
index d9e998d0c7..981e08dc16 100644
--- a/app/views/DirectoryView/styles.ts
+++ b/app/views/DirectoryView/styles.ts
@@ -16,7 +16,8 @@ export default StyleSheet.create({
 	filterItemContainer: {
 		flex: 1,
 		flexDirection: 'row',
-		alignItems: 'center'
+		alignItems: 'center',
+		paddingRight: 15
 	},
 	filterItemText: {
 		fontSize: 18,
diff --git a/app/views/StatusView/index.tsx b/app/views/StatusView/index.tsx
index 9e569bbb57..496ced8946 100644
--- a/app/views/StatusView/index.tsx
+++ b/app/views/StatusView/index.tsx
@@ -1,6 +1,6 @@
 import { useNavigation } from '@react-navigation/native';
 import React, { useEffect, useState } from 'react';
-import { FlatList, StyleSheet } from 'react-native';
+import { FlatList, StyleSheet, View } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { setUser } from '../../actions/login';
@@ -18,6 +18,8 @@ import { getUserSelector } from '../../selectors/login';
 import { showErrorAlert } from '../../lib/methods/helpers';
 import log, { events, logEvent } from '../../lib/methods/helpers/log';
 import { useTheme } from '../../theme';
+import Button from '../../containers/Button';
+import Check from '../../containers/Check';
 
 interface IStatus {
 	id: TUserStatus;
@@ -39,24 +41,24 @@ const STATUS: IStatus[] = [
 	},
 	{
 		id: 'offline',
-		name: 'Invisible'
+		name: 'Offline'
 	}
 ];
 
 const styles = StyleSheet.create({
 	inputContainer: {
-		marginTop: 16,
-		marginBottom: 16
-	},
-	inputLeft: {
-		position: 'absolute',
-		left: 12
+		paddingHorizontal: 16,
+		marginTop: 24,
+		marginBottom: 12
 	},
 	inputStyle: {
-		paddingLeft: 48,
 		borderRadius: 0,
 		borderTopWidth: 1,
 		borderBottomWidth: 1
+	},
+	footerComponent: {
+		marginTop: 36,
+		paddingHorizontal: 16
 	}
 });
 
@@ -71,18 +73,23 @@ const Status = ({
 }) => {
 	const { id, name } = statusType;
 	return (
-		<List.Item
-			title={name}
-			onPress={() => {
-				const key = `STATUS_${statusType.id.toUpperCase()}` as keyof typeof events;
-				logEvent(events[key]);
-				if (status !== statusType.id) {
-					setStatus(statusType.id);
-				}
-			}}
-			testID={`status-view-${id}`}
-			left={() => <StatusIcon size={24} status={statusType.id} />}
-		/>
+		<>
+			<List.Item
+				additionalAcessibilityLabel={`${status === id ? I18n.t('Current_Status') : ''}`}
+				title={name}
+				onPress={() => {
+					const key = `STATUS_${statusType.id.toUpperCase()}` as keyof typeof events;
+					logEvent(events[key]);
+					if (status !== statusType.id) {
+						setStatus(statusType.id);
+					}
+				}}
+				testID={`status-view-${id}`}
+				left={() => <StatusIcon size={24} status={statusType.id} />}
+				right={() => (status === id ? <Check /> : null)}
+			/>
+			<List.Separator />
+		</>
 	);
 };
 
@@ -98,31 +105,21 @@ const StatusView = (): React.ReactElement => {
 
 	const dispatch = useDispatch();
 	const { setOptions, goBack } = useNavigation();
-
 	const { colors } = useTheme();
 
+	const submit = async () => {
+		logEvent(events.STATUS_DONE);
+		if (statusText !== user.statusText || status !== user.status) {
+			await setCustomStatus(status, statusText);
+		}
+		goBack();
+	};
+
 	useEffect(() => {
-		const submit = async () => {
-			logEvent(events.STATUS_DONE);
-			if (statusText !== user.statusText || status !== user.status) {
-				await setCustomStatus(status, statusText);
-			}
-			goBack();
-		};
 		const setHeader = () => {
 			setOptions({
 				title: I18n.t('Edit_Status'),
-				headerLeft: isMasterDetail ? undefined : () => <HeaderButton.CancelModal onPress={goBack} />,
-				headerRight: () => (
-					<HeaderButton.Container>
-						<HeaderButton.Item
-							title={I18n.t('Save')}
-							onPress={submit}
-							disabled={status === user.status && statusText === user.statusText}
-							testID='status-view-submit'
-						/>
-					</HeaderButton.Container>
-				)
+				headerLeft: isMasterDetail ? undefined : () => <HeaderButton.CloseModal onPress={goBack} />
 			});
 		};
 		setHeader();
@@ -149,6 +146,19 @@ const StatusView = (): React.ReactElement => {
 
 	const statusType = Accounts_AllowInvisibleStatusOption ? STATUS : STATUS.filter(s => s.id !== 'offline');
 
+	const isStatusMatching = () => {
+		const isStatusEqual = status === user.status;
+		const isStatusTextEqual = (!!user.statusText && user.statusText === statusText) || (!user.statusText && !statusText);
+
+		return isStatusEqual && isStatusTextEqual;
+	};
+
+	const FooterComponent = () => (
+		<View style={styles.footerComponent}>
+			<Button testID='status-view-submit' disabled={isStatusMatching()} onPress={submit} title={I18n.t('Save')} />
+		</View>
+	);
+
 	return (
 		<SafeAreaView testID='status-view'>
 			<FlatList
@@ -158,19 +168,17 @@ const StatusView = (): React.ReactElement => {
 				ListHeaderComponent={
 					<>
 						<FormTextInput
+							label={I18n.t('Message')}
 							value={statusText}
 							containerStyle={styles.inputContainer}
 							onChangeText={text => setStatusText(text)}
-							left={<StatusIcon accessible={false} testID={`status-view-current-${status}`} style={styles.inputLeft} status={status} size={24} />}
 							inputStyle={styles.inputStyle}
-							placeholder={I18n.t('What_are_you_doing_right_now')}
 							testID='status-view-input'
 						/>
 						<List.Separator />
 					</>
 				}
-				ListFooterComponent={List.Separator}
-				ItemSeparatorComponent={List.Separator}
+				ListFooterComponent={FooterComponent}
 				style={{ backgroundColor: colors.surfaceTint }}
 			/>
 		</SafeAreaView>