diff --git a/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch b/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
index 93b92243..aa50ba1b 100644
--- a/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
+++ b/.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch
@@ -1,5 +1,5 @@
 diff --git a/RNFastImage.podspec b/RNFastImage.podspec
-index db0fada63fc06191f8620d336d244edde6c3dba3..b6ffe6c77ab1fd5b821525f6f0b7363a13cba3a0 100644
+index db0fada63fc06191f8620d336d244edde6c3dba3..9c22c36f6978530da21afe143324ff79b4e96454 100644
 --- a/RNFastImage.podspec
 +++ b/RNFastImage.podspec
 @@ -16,6 +16,6 @@ Pod::Spec.new do |s|
@@ -8,7 +8,7 @@ index db0fada63fc06191f8620d336d244edde6c3dba3..b6ffe6c77ab1fd5b821525f6f0b7363a
    s.dependency 'React-Core'
 -  s.dependency 'SDWebImage', '~> 5.11.1'
 -  s.dependency 'SDWebImageWebPCoder', '~> 0.8.4'
-+  s.dependency 'SDWebImage', '~> 5.14.3'
++  s.dependency 'SDWebImage', '~> 5.15.0'
 +  s.dependency 'SDWebImageWebPCoder', '~> 0.9.1'
  end
 diff --git a/android/build.gradle b/android/build.gradle
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5ec02e74..c86a286f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -16,7 +16,7 @@ PODS:
     - ExpoModulesCore
   - EXNotifications (0.17.0):
     - ExpoModulesCore
-  - Expo (47.0.12):
+  - Expo (47.0.13):
     - ExpoModulesCore
   - ExpoCrypto (12.1.0):
     - ExpoModulesCore
@@ -301,11 +301,11 @@ PODS:
     - React-Core
   - react-native-blurhash (1.1.10):
     - React-Core
-  - react-native-cameraroll (5.2.1):
+  - react-native-cameraroll (5.2.3):
     - React-Core
-  - react-native-image-picker (4.10.3):
+  - react-native-image-picker (5.0.1):
     - React-Core
-  - react-native-ios-context-menu (1.15.1):
+  - react-native-ios-context-menu (1.15.3):
     - React-Core
   - react-native-language-detection (0.2.2):
     - React
@@ -318,12 +318,12 @@ PODS:
     - React-Core
   - react-native-pager-view (6.1.2):
     - React-Core
-  - react-native-paste-input (0.5.2):
+  - react-native-paste-input (0.6.0):
     - React-Core
     - Swime (= 3.0.6)
   - react-native-quick-base64 (2.0.5):
     - React-Core
-  - react-native-safe-area-context (4.4.1):
+  - react-native-safe-area-context (4.5.0):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -403,11 +403,11 @@ PODS:
     - React-Core
   - RNFastImage (8.6.3):
     - React-Core
-    - SDWebImage (~> 5.14.3)
+    - SDWebImage (~> 5.15.0)
     - SDWebImageWebPCoder (~> 0.9.1)
-  - RNGestureHandler (2.8.0):
+  - RNGestureHandler (2.9.0):
     - React-Core
-  - RNReanimated (2.13.0):
+  - RNReanimated (2.14.4):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -434,23 +434,23 @@ PODS:
     - React-RCTText
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.18.2):
+  - RNScreens (3.19.0):
     - React-Core
     - React-RCTImage
-  - RNSentry (4.12.0):
+  - RNSentry (4.13.0):
     - React-Core
-    - Sentry/HybridSDK (= 7.31.3)
+    - Sentry/HybridSDK (= 7.31.5)
   - RNShareMenu (6.0.0):
     - React
-  - RNSVG (13.6.0):
+  - RNSVG (13.7.0):
     - React-Core
-  - SDWebImage (5.14.3):
-    - SDWebImage/Core (= 5.14.3)
-  - SDWebImage/Core (5.14.3)
+  - SDWebImage (5.15.0):
+    - SDWebImage/Core (= 5.15.0)
+  - SDWebImage/Core (5.15.0)
   - SDWebImageWebPCoder (0.9.1):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.13)
-  - Sentry/HybridSDK (7.31.3)
+  - Sentry/HybridSDK (7.31.5)
   - Swime (3.0.6)
   - Yoga (1.14.0)
 
@@ -716,7 +716,7 @@ SPEC CHECKSUMS:
   EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXNotifications: babce2a87b7922051354fcfe7a74dd279b7e272a
-  Expo: f48d305fda3e4e501d686e6bad7d8c8373828279
+  Expo: b9fa98bf260992312ee3c424400819fb9beadafe
   ExpoCrypto: 6eb2a5ede7d95b7359a5f0391ee0c5d2ecd144b3
   ExpoHaptics: 129d3f8d44c2205adcdf8db760602818463d5437
   ExpoKeepAwake: 69b59d0a8d2b24de9f82759c39b3821fec030318
@@ -756,17 +756,17 @@ SPEC CHECKSUMS:
   React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-blurhash: add4df9a937b4e021a24bc67a0714f13e0bd40b7
-  react-native-cameraroll: f94bf9f46c998963ecd2bb6e9a3f9cca59b6d9f1
-  react-native-image-picker: 60f4246eb5bb7187fc15638a8c1f13abd3820695
-  react-native-ios-context-menu: b170594b4448c0cd10c79e13432216bac99de1ac
+  react-native-cameraroll: 5b25d0be40185d02e522bf2abf8a1ba4e8faa107
+  react-native-image-picker: 8cb4280e2c1efc3daeb2d9d597f9429a60472e40
+  react-native-ios-context-menu: e529171ba760a1af7f2ef0729f5a7f4d226171c5
   react-native-language-detection: f414937fa715108ab50a6269a3de0bcb95e4ceb0
   react-native-menu: 9d7d6f819cc7fa14a15cf86888c53f3240d86f1b
   react-native-mmkv: 69b9c003f10afdd01addf7c6ee784ce42ee2eff3
   react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
   react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43
-  react-native-paste-input: 88709b4fd586ea8cc56ba5e2fc4cdfe90597730c
+  react-native-paste-input: 5182843692fd2ec72be50f241a38a49796e225d7
   react-native-quick-base64: e657e9197e61b60a9dec49807843052b830da254
-  react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
+  react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc
   react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097
   React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595
   React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466
@@ -782,16 +782,16 @@ SPEC CHECKSUMS:
   ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c
   RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
   RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd
-  RNFastImage: 756ab178acb5e3f11d8b0a931956fbd9da8d6e54
-  RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
-  RNReanimated: ce445c233a6ff5600223484a88ad5704945d972a
-  RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
-  RNSentry: 4c09f4dd9740cb9b33e94303de5b6d0dbeb0737d
+  RNFastImage: bd611b5635f1e0f43c8ccf597b1ef6ee0d0f966d
+  RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
+  RNReanimated: 6668b0587bebd4b15dd849b99e5a9c70fc12ed95
+  RNScreens: ea4cd3a853063cda19a4e3c28d2e52180c80f4eb
+  RNSentry: acebe4104a6f5915ae871eb59dc73f13dcc92ef7
   RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3
-  RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
-  SDWebImage: 9c36e66c8ce4620b41a7407698dda44211a96764
+  RNSVG: d787d64ca06b9158e763ad2638a8c4edce00782a
+  SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
   SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
-  Sentry: 08884c523575ec0f6690d94ed3ccb0246a1600bf
+  Sentry: 4c9babff9034785067c896fd580b1f7de44da020
   Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
   Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc
 
diff --git a/package.json b/package.json
index 14f3da27..bf9c040f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tooot",
-  "version": "4.8.3",
+  "version": "4.8.4",
   "description": "tooot for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
   "license": "GPL-3.0-or-later",
@@ -24,26 +24,26 @@
     "@formatjs/intl-numberformat": "^8.3.3",
     "@formatjs/intl-pluralrules": "^5.1.8",
     "@formatjs/intl-relativetimeformat": "^11.1.8",
-    "@mattermost/react-native-paste-input": "^0.5.2",
+    "@mattermost/react-native-paste-input": "^0.6.0",
     "@neverdull-agency/expo-unlimited-secure-store": "^1.0.10",
     "@react-native-async-storage/async-storage": "~1.17.11",
-    "@react-native-camera-roll/camera-roll": "^5.2.1",
+    "@react-native-camera-roll/camera-roll": "^5.2.3",
     "@react-native-clipboard/clipboard": "^1.11.1",
     "@react-native-community/blur": "^4.3.0",
     "@react-native-community/netinfo": "9.3.7",
     "@react-native-community/segmented-control": "^2.2.2",
-    "@react-native-firebase/app": "^16.5.0",
+    "@react-native-firebase/app": "^16.5.2",
     "@react-native-menu/menu": "^0.7.3",
-    "@react-navigation/bottom-tabs": "^6.5.2",
-    "@react-navigation/native": "^6.1.1",
-    "@react-navigation/native-stack": "^6.9.7",
-    "@react-navigation/stack": "^6.3.10",
-    "@sentry/react-native": "4.12.0",
+    "@react-navigation/bottom-tabs": "^6.5.3",
+    "@react-navigation/native": "^6.1.2",
+    "@react-navigation/native-stack": "^6.9.8",
+    "@react-navigation/stack": "^6.3.11",
+    "@sentry/react-native": "4.13.0",
     "@sharcoux/slider": "^6.1.1",
-    "@tanstack/react-query": "^4.20.9",
-    "axios": "^1.2.2",
+    "@tanstack/react-query": "^4.23.0",
+    "axios": "^1.2.4",
     "diff": "^5.1.0",
-    "expo": "^47.0.12",
+    "expo": "^47.0.13",
     "expo-auth-session": "^3.8.0",
     "expo-av": "^13.1.0",
     "expo-constants": "^14.1.0",
@@ -62,7 +62,7 @@
     "expo-video-thumbnails": "^7.1.0",
     "expo-web-browser": "~12.0.0",
     "htmlparser2": "^8.0.1",
-    "i18next": "^22.4.8",
+    "i18next": "^22.4.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",
     "react": "^18.2.0",
@@ -72,21 +72,20 @@
     "react-native": "^0.70.6",
     "react-native-blurhash": "^1.1.10",
     "react-native-fast-image": "^8.6.3",
-    "react-native-feather": "^1.1.2",
     "react-native-flash-message": "^0.4.0",
-    "react-native-gesture-handler": "~2.8.0",
-    "react-native-image-picker": "^4.10.3",
-    "react-native-ios-context-menu": "^1.15.1",
+    "react-native-gesture-handler": "~2.9.0",
+    "react-native-image-picker": "^5.0.1",
+    "react-native-ios-context-menu": "^1.15.3",
     "react-native-language-detection": "^0.2.2",
     "react-native-mmkv": "^2.5.1",
     "react-native-pager-view": "^6.1.2",
     "react-native-quick-base64": "^2.0.5",
-    "react-native-reanimated": "^2.13.0",
+    "react-native-reanimated": "^2.14.4",
     "react-native-reanimated-zoom": "^0.3.3",
-    "react-native-safe-area-context": "^4.4.1",
-    "react-native-screens": "^3.18.2",
+    "react-native-safe-area-context": "^4.5.0",
+    "react-native-screens": "^3.19.0",
     "react-native-share-menu": "^6.0.0",
-    "react-native-svg": "^13.6.0",
+    "react-native-svg": "^13.7.0",
     "react-native-swipe-list-view": "^3.2.9",
     "react-native-tab-view": "^3.3.4",
     "react-redux": "^8.0.5",
@@ -102,14 +101,15 @@
     "@types/diff": "^5.0.2",
     "@types/linkify-it": "^3.0.2",
     "@types/lodash": "^4.14.191",
-    "@types/react": "^18.0.26",
+    "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
-    "@types/react-native": "^0.70.8",
+    "@types/react-native": "^0.70.9",
     "@types/react-native-share-menu": "^5.0.2",
     "@types/url-parse": "^1.4.8",
-    "babel-plugin-module-resolver": "^4.1.0",
+    "babel-plugin-module-resolver": "^5.0.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "chalk": "^4.1.2",
+    "deprecated-react-native-prop-types": "^4.0.0",
     "dotenv": "^16.0.3",
     "react-native-clean-project": "^4.0.1",
     "typescript": "^4.9.4"
diff --git a/src/@types/mastodon.d.ts b/src/@types/mastodon.d.ts
index e1dcfa40..2a90a73a 100644
--- a/src/@types/mastodon.d.ts
+++ b/src/@types/mastodon.d.ts
@@ -452,6 +452,7 @@ declare namespace Mastodon {
     'posting:default:language'?: string
     'reading:expand:media'?: 'default' | 'show_all' | 'hide_all'
     'reading:expand:spoilers'?: boolean
+    'reading:autoplay:gifs'?: boolean
   }
 
   type PushSubscription = {
diff --git a/src/@types/untyped.d.ts b/src/@types/untyped.d.ts
index e00bdb1d..ea8a8636 100644
--- a/src/@types/untyped.d.ts
+++ b/src/@types/untyped.d.ts
@@ -1,5 +1,4 @@
 declare module 'gl-react-blurhash'
-declare module 'react-native-feather'
 declare module 'react-native-toast-message'
 declare module 'rtl-detect'
 
diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index bd43dff1..a59b51f1 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -68,7 +68,7 @@ const ComponentAccount: React.FC<PropsWithChildren & Props> = ({ account, props,
           </View>
           {props.onPress && !props.disabled ? (
             <Icon
-              name='ChevronRight'
+              name='chevron-right'
               size={StyleConstants.Font.Size.L}
               color={colors.secondary}
               style={{ marginLeft: 8 }}
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index bcf90e21..76ce50c9 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -1,4 +1,4 @@
-import Icon from '@components/Icon'
+import Icon, { IconName } from '@components/Icon'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useState } from 'react'
@@ -6,21 +6,17 @@ import { AccessibilityProps, Pressable, StyleProp, View, ViewStyle } from 'react
 import { Loading } from './Loading'
 import CustomText from './Text'
 
-export interface Props {
+export type Props = {
   accessibilityLabel?: AccessibilityProps['accessibilityLabel']
   accessibilityHint?: AccessibilityProps['accessibilityHint']
 
   style?: StyleProp<ViewStyle>
 
-  type: 'icon' | 'text'
-  content: string
-
   selected?: boolean
   loading?: boolean
   destructive?: boolean
   disabled?: boolean
 
-  strokeWidth?: number
   size?: 'S' | 'M' | 'L'
   fontBold?: boolean
   spacing?: 'XS' | 'S' | 'M' | 'L'
@@ -28,7 +24,7 @@ export interface Props {
   overlay?: boolean
 
   onPress: () => void
-}
+} & ({ type: 'icon'; content: IconName } | { type: 'text'; content: string })
 
 const Button: React.FC<Props> = ({
   accessibilityLabel,
@@ -40,7 +36,6 @@ const Button: React.FC<Props> = ({
   loading = false,
   destructive = false,
   disabled = false,
-  strokeWidth,
   size = 'M',
   fontBold = false,
   spacing = 'S',
@@ -81,7 +76,6 @@ const Button: React.FC<Props> = ({
             <Icon
               name={content}
               color={mainColor()}
-              strokeWidth={strokeWidth}
               style={{ opacity: loading ? 0 : 1 }}
               size={StyleConstants.Font.Size[size] * (size === 'L' ? 1.25 : 1)}
             />
diff --git a/src/components/Emojis/Button.tsx b/src/components/Emojis/Button.tsx
index ba68cd81..98ca98d6 100644
--- a/src/components/Emojis/Button.tsx
+++ b/src/components/Emojis/Button.tsx
@@ -39,7 +39,7 @@ const EmojisButton: React.FC = () => {
           }}
         >
           <Icon
-            name={emojis.current && emojis.current.length ? 'Smile' : 'Meh'}
+            name={emojis.current && emojis.current.length ? 'smile' : 'meh'}
             size={24}
             color={
               emojis.current && emojis.current.length ? colors.primaryDefault : colors.disabled
diff --git a/src/components/Emojis/List.tsx b/src/components/Emojis/List.tsx
index 5cf7df55..e8d2f953 100644
--- a/src/components/Emojis/List.tsx
+++ b/src/components/Emojis/List.tsx
@@ -188,7 +188,7 @@ const EmojisList = () => {
             paddingRight: StyleConstants.Spacing.S
           }}
         >
-          <Icon name='Search' size={StyleConstants.Font.Size.L} color={colors.secondary} />
+          <Icon name='search' size={StyleConstants.Font.Size.L} color={colors.secondary} />
         </View>
         <TextInput
           style={{
@@ -214,7 +214,7 @@ const EmojisList = () => {
             emojisDispatch({ type: 'target', payload: -1 })
           }}
         >
-          <Icon name='ChevronDown' size={StyleConstants.Font.Size.L} color={colors.secondary} />
+          <Icon name='chevron-down' size={StyleConstants.Font.Size.L} color={colors.secondary} />
         </Pressable>
       </View>
       <SectionList
diff --git a/src/components/Filter.tsx b/src/components/Filter.tsx
new file mode 100644
index 00000000..f9c57fef
--- /dev/null
+++ b/src/components/Filter.tsx
@@ -0,0 +1,111 @@
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import { Fragment } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { View, ViewStyle } from 'react-native'
+import { TouchableNativeFeedback } from 'react-native-gesture-handler'
+import Icon from './Icon'
+import CustomText from './Text'
+
+export type Props = {
+  onPress: () => void
+  filter: Mastodon.Filter<'v2'>
+  button?: React.ReactNode
+  style?: ViewStyle
+}
+
+export const Filter: React.FC<Props> = ({ onPress, filter, button, style }) => {
+  const { t } = useTranslation(['common', 'screenTabs'])
+  const { colors } = useTheme()
+
+  return (
+    <TouchableNativeFeedback onPress={onPress}>
+      <View
+        style={{
+          paddingVertical: StyleConstants.Spacing.S,
+          flexDirection: 'row',
+          alignItems: 'center',
+          backgroundColor: colors.backgroundDefault,
+          ...style
+        }}
+      >
+        <View style={{ flex: 1 }}>
+          <CustomText
+            fontStyle='M'
+            children={filter.title}
+            style={{ color: colors.primaryDefault }}
+            numberOfLines={1}
+          />
+          <View
+            style={{
+              flexDirection: 'row',
+              alignItems: 'center',
+              marginVertical: StyleConstants.Spacing.XS
+            }}
+          >
+            {filter.expires_at && new Date() > new Date(filter.expires_at) ? (
+              <CustomText
+                fontStyle='S'
+                fontWeight='Bold'
+                children={t('screenTabs:me.preferencesFilters.expired')}
+                style={{ color: colors.red, marginRight: StyleConstants.Spacing.M }}
+              />
+            ) : null}
+            {filter.keywords?.length ? (
+              <CustomText
+                children={t('screenTabs:me.preferencesFilters.keywords', {
+                  count: filter.keywords.length
+                })}
+                style={{ color: colors.primaryDefault }}
+              />
+            ) : null}
+            {filter.keywords?.length && filter.statuses?.length ? (
+              <CustomText
+                children={t('common:separator')}
+                style={{ color: colors.primaryDefault }}
+              />
+            ) : null}
+            {filter.statuses?.length ? (
+              <CustomText
+                children={t('screenTabs:me.preferencesFilters.statuses', {
+                  count: filter.statuses.length
+                })}
+                style={{ color: colors.primaryDefault }}
+              />
+            ) : null}
+          </View>
+          <CustomText
+            style={{ color: colors.secondary }}
+            children={
+              <Trans
+                ns='screenTabs'
+                i18nKey='me.preferencesFilters.context'
+                components={[
+                  <>
+                    {filter.context.map((c, index) => (
+                      <Fragment key={index}>
+                        <CustomText
+                          style={{ color: colors.secondary }}
+                          children={t(`screenTabs:me.preferencesFilters.contexts.${c}`)}
+                        />
+                        <CustomText children={t('common:separator')} />
+                      </Fragment>
+                    ))}
+                  </>
+                ]}
+              />
+            }
+          />
+        </View>
+        {button || (
+          <Icon
+            name='chevron-right'
+            size={StyleConstants.Font.Size.L}
+            color={colors.primaryDefault}
+            style={{ marginLeft: 8 }}
+          />
+        )}
+      </View>
+    </TouchableNativeFeedback>
+  )
+}
diff --git a/src/components/Hashtag.tsx b/src/components/Hashtag.tsx
index 4f84c9e7..355e39d2 100644
--- a/src/components/Hashtag.tsx
+++ b/src/components/Hashtag.tsx
@@ -22,7 +22,7 @@ const ComponentHashtag: React.FC<PropsWithChildren & Props> = ({
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
 
   const onPress = () => {
-    navigation.push('Tab-Shared-Hashtag', { hashtag: hashtag.name })
+    navigation.push('Tab-Shared-Hashtag', { tag_name: hashtag.name })
   }
 
   const padding = StyleConstants.Spacing.Global.PagePadding
diff --git a/src/components/Header/Left.tsx b/src/components/Header/Left.tsx
index d0c9444c..b2f39d0d 100644
--- a/src/components/Header/Left.tsx
+++ b/src/components/Header/Left.tsx
@@ -1,21 +1,19 @@
-import Icon from '@components/Icon'
+import Icon, { IconName } from '@components/Icon'
 import CustomText from '@components/Text'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React from 'react'
 import { Pressable } from 'react-native'
 
-export interface Props {
-  type?: 'icon' | 'text'
-  content?: string
+export type Props = {
   native?: boolean
   background?: boolean
 
   onPress: () => void
-}
+} & ({ type?: undefined; content?: IconName } | { type: 'text'; content: string })
 
 const HeaderLeft: React.FC<Props> = ({
-  type = 'icon',
+  type,
   content,
   native = true,
   background = false,
@@ -25,18 +23,18 @@ const HeaderLeft: React.FC<Props> = ({
 
   const children = () => {
     switch (type) {
-      case 'icon':
-        return (
-          <Icon
-            color={colors.primaryDefault}
-            name={content || 'ChevronLeft'}
-            size={StyleConstants.Spacing.M * 1.25}
-          />
-        )
       case 'text':
         return (
           <CustomText fontStyle='M' style={{ color: colors.primaryDefault }} children={content} />
         )
+      default:
+        return (
+          <Icon
+            color={colors.primaryDefault}
+            name={content || 'chevron-left'}
+            size={StyleConstants.Spacing.M * 1.25}
+          />
+        )
     }
   }
 
@@ -52,7 +50,7 @@ const HeaderLeft: React.FC<Props> = ({
         minHeight: 44,
         minWidth: 44,
         marginLeft: native ? -StyleConstants.Spacing.S : StyleConstants.Spacing.S,
-        ...(type === 'icon' && {
+        ...(type === undefined && {
           borderRadius: 100
         }),
         ...(type === 'text' && {
diff --git a/src/components/Header/Right.tsx b/src/components/Header/Right.tsx
index e0f460a0..91ab09f2 100644
--- a/src/components/Header/Right.tsx
+++ b/src/components/Header/Right.tsx
@@ -1,4 +1,4 @@
-import Icon from '@components/Icon'
+import Icon, { IconName } from '@components/Icon'
 import { Loading } from '@components/Loading'
 import CustomText from '@components/Text'
 import { StyleConstants } from '@utils/styles/constants'
@@ -6,13 +6,11 @@ import { useTheme } from '@utils/styles/ThemeManager'
 import React from 'react'
 import { AccessibilityProps, Pressable, View } from 'react-native'
 
-export interface Props {
+export type Props = {
   accessibilityLabel?: string
   accessibilityHint?: string
   accessibilityState?: AccessibilityProps['accessibilityState']
 
-  type?: 'icon' | 'text'
-  content: string
   native?: boolean
   background?: boolean
 
@@ -21,7 +19,7 @@ export interface Props {
   destructive?: boolean
 
   onPress: () => void
-}
+} & ({ type?: undefined; content: IconName } | { type: 'text'; content: string })
 
 const HeaderRight: React.FC<Props> = ({
   // Accessibility - Start
@@ -29,7 +27,7 @@ const HeaderRight: React.FC<Props> = ({
   accessibilityHint,
   accessibilityState,
   // Accessibility - End
-  type = 'icon',
+  type,
   content,
   native = true,
   background = false,
@@ -38,7 +36,7 @@ const HeaderRight: React.FC<Props> = ({
   destructive = false,
   onPress
 }) => {
-  const { colors, theme } = useTheme()
+  const { colors } = useTheme()
 
   const loadingSpinkit = () =>
     loading ? (
@@ -49,18 +47,6 @@ const HeaderRight: React.FC<Props> = ({
 
   const children = () => {
     switch (type) {
-      case 'icon':
-        return (
-          <>
-            <Icon
-              name={content}
-              style={{ opacity: loading ? 0 : 1 }}
-              size={StyleConstants.Spacing.M * 1.25}
-              color={disabled ? colors.secondary : destructive ? colors.red : colors.primaryDefault}
-            />
-            {loadingSpinkit()}
-          </>
-        )
       case 'text':
         return (
           <>
@@ -80,6 +66,18 @@ const HeaderRight: React.FC<Props> = ({
             {loadingSpinkit()}
           </>
         )
+      default:
+        return (
+          <>
+            <Icon
+              name={content}
+              style={{ opacity: loading ? 0 : 1 }}
+              size={StyleConstants.Spacing.M * 1.25}
+              color={disabled ? colors.secondary : destructive ? colors.red : colors.primaryDefault}
+            />
+            {loadingSpinkit()}
+          </>
+        )
     }
   }
 
@@ -100,7 +98,7 @@ const HeaderRight: React.FC<Props> = ({
         minHeight: 44,
         minWidth: 44,
         marginRight: native ? -StyleConstants.Spacing.S : StyleConstants.Spacing.S,
-        ...(type === 'icon' && {
+        ...(type === undefined && {
           borderRadius: 100
         }),
         ...(type === 'text' && {
diff --git a/src/components/Hr.tsx b/src/components/Hr.tsx
new file mode 100644
index 00000000..d7c87938
--- /dev/null
+++ b/src/components/Hr.tsx
@@ -0,0 +1,23 @@
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import { View, ViewStyle } from 'react-native'
+
+const Hr: React.FC<{ style?: ViewStyle }> = ({ style }) => {
+  const { colors } = useTheme()
+
+  return (
+    <View
+      style={[
+        {
+          borderTopColor: colors.border,
+          borderTopWidth: 1,
+          height: 1,
+          paddingVertical: StyleConstants.Spacing.S
+        },
+        style
+      ]}
+    />
+  )
+}
+
+export default Hr
diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx
index 37c7e61e..5389500d 100644
--- a/src/components/Icon.tsx
+++ b/src/components/Icon.tsx
@@ -1,15 +1,16 @@
-import React, { createElement } from 'react'
+import FeatherNames from '@expo/vector-icons/build/vendor/react-native-vector-icons/glyphmaps/Feather.json'
+import Feather from '@expo/vector-icons/Feather'
+import React from 'react'
 import { AccessibilityProps, StyleProp, View, ViewStyle } from 'react-native'
-import * as FeatherIcon from 'react-native-feather'
+
+export type IconName = keyof typeof FeatherNames
 
 export interface Props {
   accessibilityLabel?: AccessibilityProps['accessibilityLabel']
 
-  name: string
+  name: IconName
   size: number
   color: string
-  fill?: string
-  strokeWidth?: number
   style?: StyleProp<ViewStyle>
   crossOut?: boolean
 }
@@ -19,8 +20,6 @@ const Icon: React.FC<Props> = ({
   name,
   size,
   color,
-  fill,
-  strokeWidth = 2,
   style,
   crossOut = false
 }) => {
@@ -37,13 +36,7 @@ const Icon: React.FC<Props> = ({
         }
       ]}
     >
-      {createElement(FeatherIcon[name], {
-        width: size,
-        height: size,
-        color,
-        fill,
-        strokeWidth
-      })}
+      <Feather name={name} size={size} color={color} />
       {crossOut ? (
         <View
           style={{
@@ -51,7 +44,7 @@ const Icon: React.FC<Props> = ({
             transform: [{ rotate: '45deg' }],
             width: size * 1.35,
             borderBottomColor: color,
-            borderBottomWidth: strokeWidth
+            borderBottomWidth: 2
           }}
         />
       ) : null}
diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 02febb0c..736b2af6 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -9,7 +9,9 @@ import CustomText from './Text'
 export type Props = {
   title?: string
   multiline?: boolean
-} & Pick<NonNullable<EmojisState['inputProps'][0]>, 'value' | 'selection' | 'isFocused'> &
+  invalid?: boolean
+} & Pick<NonNullable<EmojisState['inputProps'][0]>, 'value'> &
+  Pick<Partial<EmojisState['inputProps'][0]>, 'isFocused' | 'selection'> &
   Omit<
     TextInputProps,
     | 'style'
@@ -27,8 +29,9 @@ const ComponentInput = forwardRef(
     {
       title,
       multiline = false,
+      invalid = false,
       value: [value, setValue],
-      selection: [selection, setSelection],
+      selection,
       isFocused,
       ...props
     }: Props,
@@ -43,7 +46,7 @@ const ComponentInput = forwardRef(
           paddingHorizontal: withTiming(StyleConstants.Spacing.XS),
           left: withTiming(StyleConstants.Spacing.S),
           top: withTiming(-(StyleConstants.Font.Size.S / 2) - 2),
-          backgroundColor: withTiming(colors.backgroundDefault)
+          backgroundColor: colors.backgroundDefault
         }
       } else {
         return {
@@ -62,7 +65,7 @@ const ComponentInput = forwardRef(
           borderWidth: 1,
           marginVertical: StyleConstants.Spacing.S,
           padding: StyleConstants.Spacing.S,
-          borderColor: colors.border,
+          borderColor: invalid ? colors.red : colors.border,
           flexDirection: multiline ? 'column' : 'row',
           alignItems: 'stretch'
         }}
@@ -78,9 +81,13 @@ const ComponentInput = forwardRef(
           }}
           value={value}
           onChangeText={setValue}
-          onFocus={() => (isFocused.current = true)}
-          onBlur={() => (isFocused.current = false)}
-          onSelectionChange={({ nativeEvent }) => setSelection(nativeEvent.selection)}
+          {...(isFocused !== undefined && {
+            onFocus: () => (isFocused.current = true),
+            onBlur: () => (isFocused.current = false)
+          })}
+          {...(selection !== undefined && {
+            onSelectionChange: ({ nativeEvent }) => selection[1](nativeEvent.selection)
+          })}
           {...(multiline && {
             multiline,
             numberOfLines: Platform.OS === 'android' ? 5 : undefined
diff --git a/src/components/Instance/index.tsx b/src/components/Instance/index.tsx
index 5d8e829d..5aad3b7b 100644
--- a/src/components/Instance/index.tsx
+++ b/src/components/Instance/index.tsx
@@ -235,12 +235,7 @@ const ComponentInstance: React.FC<Props> = ({
           />
         </View>
       ) : null}
-      <View
-        style={{
-          marginTop: StyleConstants.Spacing.L,
-          marginHorizontal: StyleConstants.Spacing.Global.PagePadding
-        }}
-      >
+      <View style={{ marginTop: StyleConstants.Spacing.L }}>
         <View
           style={{
             flexDirection: 'row',
@@ -345,7 +340,7 @@ const ComponentInstance: React.FC<Props> = ({
             }}
           >
             <Icon
-              name='Lock'
+              name='lock'
               size={StyleConstants.Font.Size.S}
               color={colors.secondary}
               style={{
@@ -365,7 +360,7 @@ const ComponentInstance: React.FC<Props> = ({
             }}
           >
             <Icon
-              name='CheckSquare'
+              name='check-square'
               size={StyleConstants.Font.Size.S}
               color={colors.secondary}
               style={{
diff --git a/src/components/Menu/Container.tsx b/src/components/Menu/Container.tsx
index b591386a..c47d5c8d 100644
--- a/src/components/Menu/Container.tsx
+++ b/src/components/Menu/Container.tsx
@@ -1,17 +1,19 @@
 import { StyleConstants } from '@utils/styles/constants'
 import React from 'react'
-import { View } from 'react-native'
+import { View, ViewStyle } from 'react-native'
 
 export interface Props {
+  style?: ViewStyle
   children: React.ReactNode
 }
 
-const MenuContainer: React.FC<Props> = ({ children }) => {
+const MenuContainer: React.FC<Props> = ({ style, children }) => {
   return (
     <View
       style={{
         paddingHorizontal: StyleConstants.Spacing.Global.PagePadding,
-        marginBottom: StyleConstants.Spacing.Global.PagePadding
+        marginBottom: StyleConstants.Spacing.Global.PagePadding,
+        ...style
       }}
     >
       {children}
diff --git a/src/components/Menu/Row.tsx b/src/components/Menu/Row.tsx
index 2fcc8fbc..ffad2741 100644
--- a/src/components/Menu/Row.tsx
+++ b/src/components/Menu/Row.tsx
@@ -1,4 +1,4 @@
-import Icon from '@components/Icon'
+import Icon, { IconName } from '@components/Icon'
 import { Loading } from '@components/Loading'
 import CustomText from '@components/Text'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
@@ -10,7 +10,7 @@ import { View } from 'react-native'
 import { State, Switch, TapGestureHandler } from 'react-native-gesture-handler'
 
 export interface Props {
-  iconFront?: any
+  iconFront?: IconName
   iconFrontColor?: ColorDefinitions
 
   title: string
@@ -22,7 +22,7 @@ export interface Props {
   switchDisabled?: boolean
   switchOnValueChange?: () => void
 
-  iconBack?: 'ChevronRight' | 'ExternalLink' | 'Check'
+  iconBack?: 'chevron-right' | 'external-link' | 'check'
   iconBackColor?: ColorDefinitions
 
   loading?: boolean
@@ -44,7 +44,7 @@ const MenuRow: React.FC<Props> = ({
   loading = false,
   onPress
 }) => {
-  const { colors, theme } = useTheme()
+  const { colors } = useTheme()
   const { screenReaderEnabled } = useAccessibility()
 
   return (
diff --git a/src/components/Message.tsx b/src/components/Message.tsx
index ad1f02ec..dcdc0994 100644
--- a/src/components/Message.tsx
+++ b/src/components/Message.tsx
@@ -54,13 +54,13 @@ const Message = React.forwardRef<FlashMessage>((_, ref) => {
   const { colors, theme } = useTheme()
 
   enum iconMapping {
-    success = 'CheckCircle',
-    danger = 'XCircle',
-    warning = 'AlertCircle',
-    none = '',
-    default = '',
-    info = '',
-    auto = ''
+    success = 'check-circle',
+    danger = 'x-circle',
+    warning = 'alert-circle',
+    none = 'x',
+    default = 'x',
+    info = 'x',
+    auto = 'x'
   }
   enum colorMapping {
     success = 'blue',
diff --git a/src/components/ModalScrollView.tsx b/src/components/ModalScrollView.tsx
new file mode 100644
index 00000000..302ffeef
--- /dev/null
+++ b/src/components/ModalScrollView.tsx
@@ -0,0 +1,29 @@
+import { useHeaderHeight } from '@react-navigation/elements'
+import { StyleConstants } from '@utils/styles/constants'
+import { forwardRef, PropsWithChildren, RefObject } from 'react'
+import { KeyboardAvoidingView, Platform, ScrollView } from 'react-native'
+import { SafeAreaView } from 'react-native-safe-area-context'
+
+export const ModalScrollView = forwardRef(
+  ({ children }: PropsWithChildren, ref: RefObject<ScrollView>) => {
+    const headerHeight = useHeaderHeight()
+
+    return (
+      <KeyboardAvoidingView
+        style={{ flex: 1 }}
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        keyboardVerticalOffset={headerHeight}
+      >
+        <SafeAreaView style={{ flex: 1 }} edges={['bottom']}>
+          <ScrollView
+            ref={ref}
+            keyboardShouldPersistTaps='always'
+            contentContainerStyle={{ padding: StyleConstants.Spacing.Global.PagePadding }}
+          >
+            {children}
+          </ScrollView>
+        </SafeAreaView>
+      </KeyboardAvoidingView>
+    )
+  }
+)
diff --git a/src/components/Parse/HTML.tsx b/src/components/Parse/HTML.tsx
index e8cd52b3..03f7f8f4 100644
--- a/src/components/Parse/HTML.tsx
+++ b/src/components/Parse/HTML.tsx
@@ -69,6 +69,7 @@ const ParseHTML: React.FC<Props> = ({
 
   const [followedTags] = useAccountStorage.object('followed_tags')
 
+  const MAX_ALLOWED_LINES = 35
   const [totalLines, setTotalLines] = useState<number>()
   const [expanded, setExpanded] = useState(highlighted)
 
@@ -146,7 +147,7 @@ const ParseHTML: React.FC<Props> = ({
                       tag?.length &&
                       !disableDetails &&
                       !sameHashtag &&
-                      navigation.push('Tab-Shared-Hashtag', { hashtag: tag })
+                      navigation.push('Tab-Shared-Hashtag', { tag_name: tag })
                     }
                     children={children}
                   />
@@ -202,9 +203,7 @@ const ParseHTML: React.FC<Props> = ({
                 onPress={async () => {
                   if (!disableDetails) {
                     if (shouldBeTag) {
-                      navigation.push('Tab-Shared-Hashtag', {
-                        hashtag: content.substring(1)
-                      })
+                      navigation.push('Tab-Shared-Hashtag', { tag_name: content.substring(1) })
                     } else {
                       await openLink(href, navigation)
                     }
@@ -275,14 +274,18 @@ const ParseHTML: React.FC<Props> = ({
               hint: expandHint,
               moreLines:
                 numberOfLines > 1 && typeof totalLines === 'number'
-                  ? t('HTML.moreLines', { count: totalLines - numberOfLines })
+                  ? t('HTML.moreLines', {
+                      count:
+                        totalLines === MAX_ALLOWED_LINES
+                          ? (`${totalLines - numberOfLines}+` as unknown as number)
+                          : totalLines - numberOfLines
+                    })
                   : ''
             })}
           />
           <Icon
-            name={expanded ? 'Minimize2' : 'Maximize2'}
+            name={expanded ? 'minimize-2' : 'maximize-2'}
             color={colors.primaryDefault}
-            strokeWidth={2}
             size={StyleConstants.Font.Size[size]}
           />
         </Pressable>
@@ -304,7 +307,11 @@ const ParseHTML: React.FC<Props> = ({
           height: numberOfLines === 1 && !expanded ? 0 : undefined
         }}
         numberOfLines={
-          typeof totalLines === 'number' ? (expanded ? 999 : numberOfLines) : undefined
+          typeof totalLines === 'number'
+            ? expanded
+              ? 999
+              : numberOfLines
+            : Math.max(MAX_ALLOWED_LINES, numberOfLines)
         }
         selectable={selectable}
       />
diff --git a/src/components/Relationship/Incoming.tsx b/src/components/Relationship/Incoming.tsx
index 6855f499..efb4559b 100644
--- a/src/components/Relationship/Incoming.tsx
+++ b/src/components/Relationship/Incoming.tsx
@@ -51,7 +51,7 @@ const RelationshipIncoming: React.FC<Props> = ({ id }) => {
       <Button
         round
         type='icon'
-        content='X'
+        content='x'
         loading={mutation.isLoading}
         onPress={() =>
           mutation.mutate({
@@ -64,7 +64,7 @@ const RelationshipIncoming: React.FC<Props> = ({ id }) => {
       <Button
         round
         type='icon'
-        content='Check'
+        content='check'
         loading={mutation.isLoading}
         onPress={() =>
           mutation.mutate({
diff --git a/src/components/Relationship/Outgoing.tsx b/src/components/Relationship/Outgoing.tsx
index 6d59a01f..e4fabbf2 100644
--- a/src/components/Relationship/Outgoing.tsx
+++ b/src/components/Relationship/Outgoing.tsx
@@ -13,7 +13,6 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
-import { View } from 'react-native'
 
 export interface Props {
   id: Mastodon.Account['id']
@@ -127,11 +126,11 @@ const RelationshipOutgoing: React.FC<Props> = ({ id }: Props) => {
   const isPageNotifications = name === 'Tab-Notifications-Root'
 
   return (
-    <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+    <>
       {!isPageNotifications && canFollowNotify && query.data?.following ? (
         <Button
           type='icon'
-          content={query.data.notifying ? 'BellOff' : 'Bell'}
+          content={query.data.notifying ? 'bell-off' : 'bell'}
           round
           onPress={() =>
             mutation.mutate({
@@ -155,7 +154,7 @@ const RelationshipOutgoing: React.FC<Props> = ({ id }: Props) => {
         loading={query.isLoading || mutation.isLoading}
         disabled={query.isError || query.data?.blocked_by}
       />
-    </View>
+    </>
   )
 }
 
diff --git a/src/components/Selections.tsx b/src/components/Selections.tsx
index 9fa38501..bbad0a2b 100644
--- a/src/components/Selections.tsx
+++ b/src/components/Selections.tsx
@@ -8,72 +8,100 @@ import { ParseEmojis } from './Parse'
 import CustomText from './Text'
 
 export interface Props {
+  title?: string
+
   multiple?: boolean
   options: { selected: boolean; content: string }[]
   setOptions: React.Dispatch<React.SetStateAction<{ selected: boolean; content: string }[]>>
   disabled?: boolean
+  invalid?: boolean
 }
 
 const Selections: React.FC<Props> = ({
+  title,
   multiple = false,
   options,
   setOptions,
-  disabled = false
+  disabled = false,
+  invalid = false
 }) => {
   const { colors } = useTheme()
 
-  const isSelected = (index: number): string =>
+  const isSelected = (index: number) =>
     options[index].selected
-      ? `Check${multiple ? 'Square' : 'Circle'}`
-      : `${multiple ? 'Square' : 'Circle'}`
+      ? multiple
+        ? 'check-square'
+        : 'check-circle'
+      : multiple
+      ? 'square'
+      : 'circle'
 
   return (
-    <View>
-      {options.map((option, index) => (
-        <Pressable
-          key={index}
-          disabled={disabled}
-          style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}
-          onPress={() => {
-            if (multiple) {
-              haptics('Light')
-
-              setOptions(options.map((o, i) => (i === index ? { ...o, selected: !o.selected } : o)))
-            } else {
-              if (!option.selected) {
+    <View style={{ marginVertical: StyleConstants.Spacing.S }}>
+      {title ? (
+        <CustomText
+          fontStyle='M'
+          children={title}
+          style={{ color: disabled ? colors.disabled : colors.primaryDefault }}
+        />
+      ) : null}
+      <View
+        style={{
+          paddingHorizontal: StyleConstants.Spacing.M,
+          paddingVertical: StyleConstants.Spacing.XS,
+          marginTop: StyleConstants.Spacing.S,
+          borderWidth: 1,
+          borderColor: disabled ? colors.disabled : invalid ? colors.red : colors.border
+        }}
+      >
+        {options.map((option, index) => (
+          <Pressable
+            key={index}
+            disabled={disabled}
+            style={{ flex: 1, paddingVertical: StyleConstants.Spacing.S }}
+            onPress={() => {
+              if (multiple) {
                 haptics('Light')
+
                 setOptions(
-                  options.map((o, i) => {
-                    if (i === index) {
-                      return { ...o, selected: true }
-                    } else {
-                      return { ...o, selected: false }
-                    }
-                  })
+                  options.map((o, i) => (i === index ? { ...o, selected: !o.selected } : o))
                 )
+              } else {
+                if (!option.selected) {
+                  haptics('Light')
+                  setOptions(
+                    options.map((o, i) => {
+                      if (i === index) {
+                        return { ...o, selected: true }
+                      } else {
+                        return { ...o, selected: false }
+                      }
+                    })
+                  )
+                }
               }
-            }
-          }}
-        >
-          <View style={{ flex: 1, flexDirection: 'row' }}>
-            <Icon
-              style={{
-                paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
-                marginRight: StyleConstants.Spacing.S
-              }}
-              name={isSelected(index)}
-              size={StyleConstants.Font.Size.M}
-              color={disabled ? colors.disabled : colors.primaryDefault}
-            />
-            <CustomText style={{ flex: 1 }}>
-              <ParseEmojis
-                content={option.content}
-                style={{ color: disabled ? colors.disabled : colors.primaryDefault }}
+            }}
+          >
+            <View style={{ flex: 1, flexDirection: 'row' }}>
+              <Icon
+                style={{
+                  marginTop: (StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M) / 2,
+                  marginRight: StyleConstants.Spacing.S
+                }}
+                name={isSelected(index)}
+                size={StyleConstants.Font.Size.M}
+                color={disabled ? colors.disabled : colors.primaryDefault}
               />
-            </CustomText>
-          </View>
-        </Pressable>
-      ))}
+              <CustomText fontStyle='S' style={{ flex: 1 }}>
+                <ParseEmojis
+                  content={option.content}
+                  style={{ color: disabled ? colors.disabled : colors.primaryDefault }}
+                />
+              </CustomText>
+            </View>
+          </Pressable>
+        ))}
+      </View>
     </View>
   )
 }
diff --git a/src/components/Sparkline.tsx b/src/components/Sparkline.tsx
index 707f28e7..8ef25c37 100644
--- a/src/components/Sparkline.tsx
+++ b/src/components/Sparkline.tsx
@@ -68,7 +68,7 @@ const Sparkline: React.FC<Props> = ({ data, width, height, margin = 0 }) => {
   const fillPoints = linePoints.concat(closePolyPoints)
 
   return (
-    <Svg height={height} width={width} style={{ marginRight: margin }}>
+    <Svg height={height} width={width} style={{ marginRight: margin }} fill='none'>
       <G>
         <Path d={'M' + fillPoints.join(' ')} fill={colors.blue} fillOpacity={0.1} />
         <Path
diff --git a/src/components/SwipeToActions.tsx b/src/components/SwipeToActions.tsx
new file mode 100644
index 00000000..1b391de3
--- /dev/null
+++ b/src/components/SwipeToActions.tsx
@@ -0,0 +1,57 @@
+import { StyleConstants } from '@utils/styles/constants'
+import { ColorValue, TouchableNativeFeedback, View } from 'react-native'
+import { SwipeListView } from 'react-native-swipe-list-view'
+import haptics from './haptics'
+import Icon, { IconName } from './Icon'
+import ComponentSeparator from './Separator'
+
+export type Props = {
+  actions: {
+    onPress: (item: any) => void
+    color: ColorValue
+    icon: IconName
+    haptic?: Parameters<typeof haptics>['0']
+  }[]
+}
+
+export const SwipeToActions = <T extends unknown>({
+  actions,
+  ...rest
+}: Props & SwipeListView<T>['props']) => {
+  const perActionWidth = StyleConstants.Spacing.L * 2 + StyleConstants.Font.Size.L
+
+  return (
+    <SwipeListView
+      renderHiddenItem={({ item }) => (
+        <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'flex-end' }}>
+          {actions.map((action, index) => (
+            <TouchableNativeFeedback
+              key={index}
+              onPress={() => {
+                haptics(action.haptic || 'Light')
+                action.onPress({ item })
+              }}
+            >
+              <View
+                style={{
+                  paddingHorizontal: StyleConstants.Spacing.L,
+                  flexBasis: perActionWidth,
+                  backgroundColor: action.color,
+                  justifyContent: 'center',
+                  alignItems: 'center'
+                }}
+              >
+                <Icon name={action.icon} color='white' size={StyleConstants.Font.Size.L} />
+              </View>
+            </TouchableNativeFeedback>
+          ))}
+        </View>
+      )}
+      rightOpenValue={-perActionWidth * actions.length}
+      disableRightSwipe
+      closeOnRowPress
+      ItemSeparatorComponent={ComponentSeparator}
+      {...rest}
+    />
+  )
+}
diff --git a/src/components/Timeline/Empty.tsx b/src/components/Timeline/Empty.tsx
index 5fe79703..5486d02d 100644
--- a/src/components/Timeline/Empty.tsx
+++ b/src/components/Timeline/Empty.tsx
@@ -29,7 +29,7 @@ const TimelineEmpty: React.FC<Props> = ({ queryKey }) => {
       case 'error':
         return (
           <>
-            <Icon name='Frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
+            <Icon name='frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
             <CustomText
               fontStyle='M'
               style={{
@@ -47,7 +47,7 @@ const TimelineEmpty: React.FC<Props> = ({ queryKey }) => {
         return (
           <>
             <Icon
-              name='Smartphone'
+              name='smartphone'
               size={StyleConstants.Font.Size.L}
               color={colors.primaryDefault}
             />
diff --git a/src/components/Timeline/Footer.tsx b/src/components/Timeline/Footer.tsx
index db50cc12..99f865f5 100644
--- a/src/components/Timeline/Footer.tsx
+++ b/src/components/Timeline/Footer.tsx
@@ -38,7 +38,7 @@ const TimelineFooter: React.FC<Props> = ({ queryKey, disableInfinity }) => {
             ns='componentTimeline'
             i18nKey='end.message'
             components={[
-              <Icon name='Coffee' size={StyleConstants.Font.Size.S} color={colors.secondary} />
+              <Icon name='coffee' size={StyleConstants.Font.Size.S} color={colors.secondary} />
             ]}
           />
         </CustomText>
diff --git a/src/components/Timeline/Refresh.tsx b/src/components/Timeline/Refresh.tsx
index 2c6f8ebe..d97ea7db 100644
--- a/src/components/Timeline/Refresh.tsx
+++ b/src/components/Timeline/Refresh.tsx
@@ -276,7 +276,7 @@ const TimelineRefresh: React.FC<Props> = ({
           ]}
           children={
             <Icon
-              name='ArrowLeft'
+              name='arrow-left'
               size={StyleConstants.Font.Size.M}
               color={colors.primaryDefault}
             />
diff --git a/src/components/Timeline/Shared/Actioned.tsx b/src/components/Timeline/Shared/Actioned.tsx
index bd2cbcec..7d2c2ff9 100644
--- a/src/components/Timeline/Shared/Actioned.tsx
+++ b/src/components/Timeline/Shared/Actioned.tsx
@@ -46,7 +46,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='Anchor'
+              name='anchor'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -58,7 +58,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='Heart'
+              name='heart'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -72,7 +72,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='UserPlus'
+              name='user-plus'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -86,7 +86,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='UserPlus'
+              name='user-plus'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -100,7 +100,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='BarChart2'
+              name='bar-chart-2'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -112,7 +112,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='Repeat'
+              name='repeat'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -130,7 +130,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='Activity'
+              name='activity'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -144,7 +144,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='BarChart2'
+              name='bar-chart-2'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -156,7 +156,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='Users'
+              name='users'
               size={StyleConstants.Font.Size.S}
               color={iconColor}
               style={styles.icon}
@@ -168,7 +168,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
         return (
           <>
             <Icon
-              name='AlertOctagon'
+              name='alert-octagon'
               size={StyleConstants.Font.Size.S}
               color={colors.red}
               style={styles.icon}
diff --git a/src/components/Timeline/Shared/Actions.tsx b/src/components/Timeline/Shared/Actions.tsx
index 29b32815..ec3dfdb7 100644
--- a/src/components/Timeline/Shared/Actions.tsx
+++ b/src/components/Timeline/Shared/Actions.tsx
@@ -165,7 +165,7 @@ const TimelineActions: React.FC = () => {
 
   const childrenReply = () => (
     <>
-      <Icon name='MessageCircle' color={iconColor} size={StyleConstants.Font.Size.L} />
+      <Icon name='message-circle' color={iconColor} size={StyleConstants.Font.Size.L} />
       {status.replies_count > 0 ? (
         <CustomText
           fontStyle='S'
@@ -186,7 +186,7 @@ const TimelineActions: React.FC = () => {
     return (
       <>
         <Icon
-          name='Repeat'
+          name='repeat'
           color={disabled ? colors.disabled : color(status.reblogged)}
           crossOut={disabled}
           size={StyleConstants.Font.Size.L}
@@ -212,7 +212,7 @@ const TimelineActions: React.FC = () => {
     const color = (state: boolean) => (state ? colors.red : colors.secondary)
     return (
       <>
-        <Icon name='Heart' color={color(status.favourited)} size={StyleConstants.Font.Size.L} />
+        <Icon name='heart' color={color(status.favourited)} size={StyleConstants.Font.Size.L} />
         {status.favourites_count > 0 ? (
           <CustomText
             fontStyle='S'
@@ -227,7 +227,7 @@ const TimelineActions: React.FC = () => {
   const childrenBookmark = () => {
     const color = (state: boolean) => (state ? colors.yellow : colors.secondary)
     return (
-      <Icon name='Bookmark' color={color(status.bookmarked)} size={StyleConstants.Font.Size.L} />
+      <Icon name='bookmark' color={color(status.bookmarked)} size={StyleConstants.Font.Size.L} />
     )
   }
 
diff --git a/src/components/Timeline/Shared/Attachment.tsx b/src/components/Timeline/Shared/Attachment.tsx
index af3abfc6..73a181d1 100644
--- a/src/components/Timeline/Shared/Attachment.tsx
+++ b/src/components/Timeline/Shared/Attachment.tsx
@@ -216,7 +216,7 @@ const TimelineAttachment = () => {
         ) : (
           <Button
             type='icon'
-            content='EyeOff'
+            content='eye-off'
             round
             overlay
             onPress={() => {
diff --git a/src/components/Timeline/Shared/Attachment/Audio.tsx b/src/components/Timeline/Shared/Attachment/Audio.tsx
index 9e4cc767..3c3cd5ee 100644
--- a/src/components/Timeline/Shared/Attachment/Audio.tsx
+++ b/src/components/Timeline/Shared/Attachment/Audio.tsx
@@ -92,7 +92,7 @@ const AttachmentAudio: React.FC<Props> = ({ total, index, sensitiveShown, audio
             ) : null}
             <Button
               type='icon'
-              content={audioPlaying ? 'PauseCircle' : 'PlayCircle'}
+              content={audioPlaying ? 'pause-circle' : 'play-circle'}
               size='L'
               round
               overlay
diff --git a/src/components/Timeline/Shared/Attachment/Video.tsx b/src/components/Timeline/Shared/Attachment/Video.tsx
index cd8ac046..69189fd5 100644
--- a/src/components/Timeline/Shared/Attachment/Video.tsx
+++ b/src/components/Timeline/Shared/Attachment/Video.tsx
@@ -1,6 +1,6 @@
 import Button from '@components/Button'
 import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
-import { useGlobalStorage } from '@utils/storage/actions'
+import { useAccountStorage, useGlobalStorage } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import { ResizeMode, Video, VideoFullscreenUpdate } from 'expo-av'
 import { Platform } from 'expo-modules-core'
@@ -28,6 +28,11 @@ const AttachmentVideo: React.FC<Props> = ({
 }) => {
   const { reduceMotionEnabled } = useAccessibility()
   const [autoplayGifv] = useGlobalStorage.boolean('app.auto_play_gifv')
+  const [preferences] = useAccountStorage.object('preferences')
+  const shouldAutoplayGifv =
+    preferences?.['reading:autoplay:gifs'] !== undefined
+      ? preferences['reading:autoplay:gifs']
+      : autoplayGifv
 
   const videoPlayer = useRef<Video>(null)
   const [videoLoading, setVideoLoading] = useState(false)
@@ -63,7 +68,7 @@ const AttachmentVideo: React.FC<Props> = ({
         resizeMode={videoResizeMode}
         {...(gifv
           ? {
-              shouldPlay: reduceMotionEnabled || !autoplayGifv ? false : true,
+              shouldPlay: reduceMotionEnabled || !shouldAutoplayGifv ? false : true,
               isMuted: true,
               isLooping: true,
               source: { uri: video.url }
@@ -82,7 +87,7 @@ const AttachmentVideo: React.FC<Props> = ({
               Platform.OS === 'android' &&
                 (await ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.PORTRAIT))
               Platform.OS === 'android' && setVideoResizeMode(ResizeMode.COVER)
-              if (gifv && !reduceMotionEnabled && autoplayGifv) {
+              if (gifv && !reduceMotionEnabled && shouldAutoplayGifv) {
                 videoPlayer.current?.playAsync()
               } else {
                 videoPlayer.current?.pauseAsync()
@@ -116,20 +121,20 @@ const AttachmentVideo: React.FC<Props> = ({
           video.blurhash ? (
             <Blurhash blurhash={video.blurhash} style={{ width: '100%', height: '100%' }} />
           ) : null
-        ) : !gifv || (gifv && (reduceMotionEnabled || !autoplayGifv)) ? (
+        ) : !gifv || (gifv && (reduceMotionEnabled || !shouldAutoplayGifv)) ? (
           <Button
             round
             overlay
             size='L'
             type='icon'
-            content='PlayCircle'
+            content='play-circle'
             onPress={playOnPress}
             loading={videoLoading}
           />
         ) : null}
         <AttachmentAltText sensitiveShown={sensitiveShown} text={video.description} />
       </Pressable>
-      {gifv && !autoplayGifv ? (
+      {gifv && !shouldAutoplayGifv ? (
         <Button
           style={{
             position: 'absolute',
diff --git a/src/components/Timeline/Shared/Filtered.tsx b/src/components/Timeline/Shared/Filtered.tsx
index 9a8c11de..4a0c00da 100644
--- a/src/components/Timeline/Shared/Filtered.tsx
+++ b/src/components/Timeline/Shared/Filtered.tsx
@@ -99,7 +99,7 @@ export const shouldFilter = ({
         break
     }
   }
-  const queryKeyFilters: QueryKeyFilters = ['Filters']
+  const queryKeyFilters: QueryKeyFilters = ['Filters', { version: 'v1' }]
   queryClient.getQueryData<Mastodon.Filter<'v1'>[]>(queryKeyFilters)?.forEach(filter => {
     if (returnFilter) {
       return
diff --git a/src/components/Timeline/Shared/HeaderAndroid.tsx b/src/components/Timeline/Shared/HeaderAndroid.tsx
index b81864af..696b8fb4 100644
--- a/src/components/Timeline/Shared/HeaderAndroid.tsx
+++ b/src/components/Timeline/Shared/HeaderAndroid.tsx
@@ -43,7 +43,7 @@ const TimelineHeaderAndroid: React.FC = () => {
               }}
             >
               <Icon
-                name='MoreHorizontal'
+                name='more-horizontal'
                 color={colors.secondary}
                 size={StyleConstants.Font.Size.L}
               />
diff --git a/src/components/Timeline/Shared/HeaderConversation.tsx b/src/components/Timeline/Shared/HeaderConversation.tsx
index db93625e..bfb68a92 100644
--- a/src/components/Timeline/Shared/HeaderConversation.tsx
+++ b/src/components/Timeline/Shared/HeaderConversation.tsx
@@ -87,7 +87,7 @@ const HeaderConversation = ({ conversation }: Props) => {
             id: conversation.id
           })
         }
-        children={<Icon name='Trash' color={colors.secondary} size={StyleConstants.Font.Size.L} />}
+        children={<Icon name='trash' color={colors.secondary} size={StyleConstants.Font.Size.L} />}
       />
     </View>
   )
diff --git a/src/components/Timeline/Shared/HeaderDefault.tsx b/src/components/Timeline/Shared/HeaderDefault.tsx
index 9b46fac3..d917c0f9 100644
--- a/src/components/Timeline/Shared/HeaderDefault.tsx
+++ b/src/components/Timeline/Shared/HeaderDefault.tsx
@@ -58,7 +58,7 @@ const TimelineHeaderDefault: React.FC = () => {
         >
           {isRemote ? (
             <Icon
-              name='Wifi'
+              name='wifi'
               size={StyleConstants.Font.Size.M}
               color={colors.secondary}
               style={{ marginRight: StyleConstants.Spacing.S }}
@@ -80,7 +80,7 @@ const TimelineHeaderDefault: React.FC = () => {
           <DropdownMenu.Root onOpenChange={setOpenChange}>
             <DropdownMenu.Trigger>
               <Icon
-                name='MoreHorizontal'
+                name='more-horizontal'
                 color={colors.secondary}
                 size={StyleConstants.Font.Size.L}
               />
diff --git a/src/components/Timeline/Shared/HeaderNotification.tsx b/src/components/Timeline/Shared/HeaderNotification.tsx
index fa6340e8..54a7203b 100644
--- a/src/components/Timeline/Shared/HeaderNotification.tsx
+++ b/src/components/Timeline/Shared/HeaderNotification.tsx
@@ -81,7 +81,7 @@ const TimelineHeaderNotification: React.FC<Props> = ({ notification }) => {
                 <DropdownMenu.Root onOpenChange={setOpenChange}>
                   <DropdownMenu.Trigger>
                     <Icon
-                      name='MoreHorizontal'
+                      name='more-horizontal'
                       color={colors.secondary}
                       size={StyleConstants.Font.Size.L}
                     />
diff --git a/src/components/Timeline/Shared/HeaderShared/Created.tsx b/src/components/Timeline/Shared/HeaderShared/Created.tsx
index 091715f3..8248e713 100644
--- a/src/components/Timeline/Shared/HeaderShared/Created.tsx
+++ b/src/components/Timeline/Shared/HeaderShared/Created.tsx
@@ -35,7 +35,7 @@ const HeaderSharedCreated: React.FC<Props> = ({ created_at }) => {
       {status.edited_at && !highlighted ? (
         <Icon
           accessibilityLabel={t('shared.header.shared.edited.accessibilityLabel')}
-          name='Edit'
+          name='edit'
           size={StyleConstants.Font.Size.S}
           color={colors.secondary}
           style={{ marginLeft: StyleConstants.Spacing.S }}
diff --git a/src/components/Timeline/Shared/HeaderShared/Muted.tsx b/src/components/Timeline/Shared/HeaderShared/Muted.tsx
index 426340af..bdec2ef5 100644
--- a/src/components/Timeline/Shared/HeaderShared/Muted.tsx
+++ b/src/components/Timeline/Shared/HeaderShared/Muted.tsx
@@ -13,7 +13,7 @@ const HeaderSharedMuted: React.FC = () => {
   return status?.muted ? (
     <Icon
       accessibilityLabel={t('shared.header.shared.muted.accessibilityLabel')}
-      name='VolumeX'
+      name='volume-x'
       size={StyleConstants.Font.Size.M}
       color={colors.secondary}
       style={{ marginLeft: StyleConstants.Spacing.S }}
diff --git a/src/components/Timeline/Shared/HeaderShared/Visibility.tsx b/src/components/Timeline/Shared/HeaderShared/Visibility.tsx
index 9ed76444..3e9c8240 100644
--- a/src/components/Timeline/Shared/HeaderShared/Visibility.tsx
+++ b/src/components/Timeline/Shared/HeaderShared/Visibility.tsx
@@ -16,7 +16,7 @@ const HeaderSharedVisibility: React.FC = () => {
       return (
         <Icon
           accessibilityLabel={t('shared.header.shared.visibility.private.accessibilityLabel')}
-          name='Unlock'
+          name='unlock'
           size={StyleConstants.Font.Size.S}
           color={colors.secondary}
           style={styles.visibility}
@@ -26,7 +26,7 @@ const HeaderSharedVisibility: React.FC = () => {
       return (
         <Icon
           accessibilityLabel={t('shared.header.shared.visibility.private.accessibilityLabel')}
-          name='Lock'
+          name='lock'
           size={StyleConstants.Font.Size.S}
           color={colors.secondary}
           style={styles.visibility}
@@ -36,7 +36,7 @@ const HeaderSharedVisibility: React.FC = () => {
       return (
         <Icon
           accessibilityLabel={t('shared.header.shared.visibility.direct.accessibilityLabel')}
-          name='Mail'
+          name='mail'
           size={StyleConstants.Font.Size.S}
           color={colors.secondary}
           style={styles.visibility}
diff --git a/src/components/Timeline/Shared/Poll.tsx b/src/components/Timeline/Shared/Poll.tsx
index 06557731..775cff83 100644
--- a/src/components/Timeline/Shared/Poll.tsx
+++ b/src/components/Timeline/Shared/Poll.tsx
@@ -117,10 +117,14 @@ const TimelinePoll: React.FC = () => {
     }
   }
 
-  const isSelected = (index: number): string =>
+  const isSelected = (index: number) =>
     allOptions[index]
-      ? `Check${poll.multiple ? 'Square' : 'Circle'}`
-      : `${poll.multiple ? 'Square' : 'Circle'}`
+      ? poll.multiple
+        ? 'check-square'
+        : 'check-circle'
+      : poll.multiple
+      ? 'square'
+      : 'circle'
 
   const pollBodyDisallow = () => {
     const maxValue = maxBy(poll.options, option => option.votes_count)?.votes_count
@@ -129,12 +133,12 @@ const TimelinePoll: React.FC = () => {
         <View style={{ flex: 1, flexDirection: 'row' }}>
           <Icon
             style={{
-              paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
+              marginTop: (StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M) / 2,
               marginRight: StyleConstants.Spacing.S
             }}
             name={
-              `${poll.own_votes?.includes(index) ? 'Check' : ''}${
-                poll.multiple ? 'Square' : 'Circle'
+              `${poll.own_votes?.includes(index) ? 'check-' : ''}${
+                poll.multiple ? 'square' : 'circle'
               }` as any
             }
             size={StyleConstants.Font.Size.M}
@@ -201,7 +205,7 @@ const TimelinePoll: React.FC = () => {
         <View style={{ flex: 1, flexDirection: 'row' }}>
           <Icon
             style={{
-              paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
+              marginTop: (StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M) / 2,
               marginRight: StyleConstants.Spacing.S
             }}
             name={isSelected(index)}
diff --git a/src/components/Timeline/index.tsx b/src/components/Timeline/index.tsx
index b0af184e..884d224e 100644
--- a/src/components/Timeline/index.tsx
+++ b/src/components/Timeline/index.tsx
@@ -145,12 +145,12 @@ const Timeline: React.FC<Props> = ({
         ref={customFLRef || flRef}
         scrollEventThrottle={16}
         onScroll={onScroll}
-        windowSize={7}
+        windowSize={5}
         data={flattenPages(data)}
         {...(customProps?.renderItem
           ? { renderItem: customProps.renderItem }
           : { renderItem: ({ item }) => <TimelineDefault item={item} queryKey={queryKey} /> })}
-        initialNumToRender={6}
+        initialNumToRender={3}
         maxToRenderPerBatch={3}
         onEndReached={() => !disableInfinity && !isFetchingNextPage && fetchNextPage()}
         onEndReachedThreshold={0.75}
diff --git a/src/components/contextMenu/hashtag.ts b/src/components/contextMenu/hashtag.ts
new file mode 100644
index 00000000..688beb2e
--- /dev/null
+++ b/src/components/contextMenu/hashtag.ts
@@ -0,0 +1,96 @@
+import haptics from '@components/haptics'
+import { displayMessage } from '@components/Message'
+import { useNavigation } from '@react-navigation/native'
+import { NativeStackNavigationProp } from '@react-navigation/native-stack'
+import { useQueryClient } from '@tanstack/react-query'
+import { featureCheck } from '@utils/helpers/featureCheck'
+import { TabSharedStackParamList } from '@utils/navigation/navigators'
+import { QueryKeyFollowedTags, useTagMutation, useTagQuery } from '@utils/queryHooks/tags'
+import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
+import { useTranslation } from 'react-i18next'
+
+const menuHashtag = ({
+  tag_name,
+  queryKey
+}: {
+  tag_name: Mastodon.Tag['name']
+  queryKey?: QueryKeyTimeline
+}): ContextMenu => {
+  const navigation =
+    useNavigation<NativeStackNavigationProp<TabSharedStackParamList, any, undefined>>()
+  const { t } = useTranslation(['common', 'componentContextMenu'])
+
+  const canFollowTags = featureCheck('follow_tags')
+
+  const queryClient = useQueryClient()
+
+  const {
+    data,
+    isFetching: tagIsFetching,
+    refetch: tagRefetch
+  } = useTagQuery({ tag_name, options: { enabled: canFollowTags } })
+  const tagMutation = useTagMutation({
+    onSuccess: () => {
+      haptics('Light')
+      tagRefetch()
+      const queryKeyFollowedTags: QueryKeyFollowedTags = ['FollowedTags']
+      queryClient.invalidateQueries({ queryKey: queryKeyFollowedTags })
+    },
+    onError: (err: any, { to }) => {
+      displayMessage({
+        type: 'error',
+        message: t('common:message.error.message', {
+          function: t('componentContextMenu:hashtag.follow', {
+            defaultValue: 'false',
+            context: to.toString()
+          })
+        }),
+        ...(err.status &&
+          typeof err.status === 'number' &&
+          err.data &&
+          err.data.error &&
+          typeof err.data.error === 'string' && {
+            description: err.data.error
+          })
+      })
+    }
+  })
+
+  const menus: ContextMenu = []
+
+  menus.push([
+    {
+      type: 'item',
+      key: 'hashtag-follow',
+      props: {
+        onSelect: () =>
+          typeof data?.following === 'boolean' &&
+          tagMutation.mutate({ tag_name, to: !data.following }),
+        disabled: tagIsFetching,
+        destructive: false,
+        hidden: !canFollowTags
+      },
+      title: t('componentContextMenu:hashtag.follow.action', {
+        defaultValue: 'false',
+        context: (data?.following || false).toString()
+      }),
+      icon: data?.following ? 'rectangle.stack.badge.minus' : 'rectangle.stack.badge.plus'
+    },
+    {
+      type: 'item',
+      key: 'hashtag-filter',
+      props: {
+        onSelect: () => navigation.navigate('Tab-Shared-Filter', { source: 'hashtag', tag_name }),
+        disabled: false,
+        destructive: false,
+        hidden: !canFollowTags
+      },
+      title: t('componentContextMenu:hashtag.filter.action'),
+      icon: 'line.3.horizontal.decrease'
+    }
+  ])
+
+  return menus
+}
+
+export default menuHashtag
diff --git a/src/components/contextMenu/status.ts b/src/components/contextMenu/status.ts
index 5641d38e..8e8a964f 100644
--- a/src/components/contextMenu/status.ts
+++ b/src/components/contextMenu/status.ts
@@ -231,6 +231,22 @@ const menuStatus = ({
         context: (status.pinned || false).toString()
       }),
       icon: status.pinned ? 'pin.slash' : 'pin'
+    },
+    {
+      type: 'item',
+      key: 'status-filter',
+      props: {
+        // @ts-ignore
+        onSelect: () => navigation.navigate('Tab-Shared-Filter', { source: 'status', status, queryKey }),
+        disabled: false,
+        destructive: false,
+        hidden: !('filtered' in status)
+      },
+      title: t('componentContextMenu:status.filter.action', {
+        defaultValue: 'false',
+        context: (!!status.filtered?.length).toString()
+      }),
+      icon: status.pinned ? 'rectangle.badge.checkmark' : 'rectangle.badge.xmark'
     }
   ])
 
diff --git a/src/components/openLink.ts b/src/components/openLink.ts
index fbe4eabe..e5790c28 100644
--- a/src/components/openLink.ts
+++ b/src/components/openLink.ts
@@ -73,17 +73,18 @@ const openLink = async (url: string, navigation?: any) => {
     }
   }
 
+  // Some links might end with an empty space at the end that triggers an error
   switch (getGlobalStorage.string('app.browser')) {
-    // Some links might end with an empty space at the end that triggers an error
+    case 'external':
+      await Linking.openURL(url.trim())
+      break
     case 'internal':
+    default:
       await WebBrowser.openBrowserAsync(url.trim(), {
         dismissButtonStyle: 'close',
         enableBarCollapsing: true,
         ...(await browserPackage())
-      })
-      break
-    case 'external':
-      await Linking.openURL(url.trim())
+      }).catch(() => Linking.openURL(url.trim()))
       break
   }
 }
diff --git a/src/i18n/ca/components/contextMenu.json b/src/i18n/ca/components/contextMenu.json
index f63e450b..12777ca9 100644
--- a/src/i18n/ca/components/contextMenu.json
+++ b/src/i18n/ca/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Segueix l'usuari",
       "action_true": "Deixa de seguir l'usuari"
     },
-    "inLists": "Llistes que continguin l'usuari",
+    "inLists": "Llistes que hi sigui l'usuari...",
     "showBoosts": {
       "action_false": "Mostra els impulsos de l'usuari",
       "action_true": "Oculta els impulsos de l'usuari"
@@ -16,12 +16,12 @@
       "action_true": "Deixa de silenciar l'usuari"
     },
     "followAs": {
-      "trigger": "Segueix com...",
+      "trigger": "",
       "succeed_default": "Seguint a @{{target}} com @{{source}}",
       "succeed_locked": "Enviada la sol·licitud de seguiment a @{{target}} com {{source}}, pendent d'aprovar-la",
       "failed": "Segueix com"
     },
-    "blockReport": "Bloqueja i denuncia...",
+    "blockReport": "Bloqueja i denuncia",
     "block": {
       "action_false": "Bloqueja l'usuari",
       "action_true": "Deixa de bloquejar l'usuari",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "Segueix",
+      "action_true": "Deixa de seguir"
+    },
+    "filter": {
+      "action": "Filtra l'etiqueta..."
+    }
+  },
   "share": {
     "status": {
       "action": "Comparteix la publicació"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Fixa la publicació",
       "action_true": "Deixa de fixar la publicació"
+    },
+    "filter": {
+      "action_false": "Filtra la publicació...",
+      "action_true": "Gestiona els filtres..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ca/components/timeline.json b/src/i18n/ca/components/timeline.json
index 24fb514a..a8c99fdf 100644
--- a/src/i18n/ca/components/timeline.json
+++ b/src/i18n/ca/components/timeline.json
@@ -98,7 +98,7 @@
       "match_v2_one": "Filtrat per {{filters}}.",
       "match_v2_other": "Filtrat per {{count}} filtres, {{filters}}."
     },
-    "fullConversation": "Llegeix conversacions",
+    "fullConversation": "Llegeix converses",
     "translate": {
       "default": "Tradueix",
       "succeed": "Traduït per {{provider}} des de l'idioma {{source}}",
diff --git a/src/i18n/ca/screens/compose.json b/src/i18n/ca/screens/compose.json
index 5c9e5da2..3e17e8d2 100644
--- a/src/i18n/ca/screens/compose.json
+++ b/src/i18n/ca/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Descriu el contingut per a persones amb discapacitat visual",
           "placeholder": "Pots afegir una descripció, també conegut com a text alternatiu, als teus fitxers perquè siguin accessibles a més persones, també aquelles amb discapacitat visual.\n\nLes bones descripcions han de ser concises, però que s'expressin tot el que surt als fitxers amb exactitud per poder entendre el seu context."
-        },
-        "imageFocus": "Arrossega el cercle per a canviar el seu punt d'atenció"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/ca/screens/tabs.json b/src/i18n/ca/screens/tabs.json
index 06204002..c9e35252 100644
--- a/src/i18n/ca/screens/tabs.json
+++ b/src/i18n/ca/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Notificacions push"
       },
+      "preferences": {
+        "name": "Preferències"
+      },
+      "preferencesFilters": {
+        "name": "Tots els filtres de continguts"
+      },
+      "preferencesFilterAdd": {
+        "name": "Crea un filtre"
+      },
+      "preferencesFilterEdit": {
+        "name": "Edita el filtre"
+      },
       "profile": {
         "name": "Edita el teu perfil"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Configuració de l'aplicació"
       },
-      "webSettings": {
-        "name": "Més configuracions del compte"
-      },
       "switch": {
         "name": "Canvia de compte"
       }
@@ -125,6 +134,85 @@
         "message": "Aquesta acció no es pot desfer."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Visibilitat de la publicació per defecte",
+        "options": {
+          "public": "Públic",
+          "unlisted": "Sense llistar",
+          "private": "Només als seguidors"
+        }
+      },
+      "sensitive": {
+        "title": "Marca el contingut com a sensible"
+      },
+      "media": {
+        "title": "Mostra el contingut multimèdia",
+        "options": {
+          "default": "Amaga el contingut multimèdia com a sensible",
+          "show_all": "Mostra sempre el contingut multimèdia",
+          "hide_all": "Amaga sempre el contingut multimèdia"
+        }
+      },
+      "spoilers": {
+        "title": "Amplia sempre el contingut amb alertes"
+      },
+      "autoplay_gifs": {
+        "title": "Autoreprodueix els GIF"
+      },
+      "filters": {
+        "title": "Filtres de continguts",
+        "content": "{{count}} actiu/s"
+      },
+      "web_only": {
+        "title": "Actualitza la configuració",
+        "description": "Les configuracions següents només es poden actualitzant fent servir el web"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Caducat",
+      "keywords_one": "{{count}} paraula clau",
+      "keywords_other": "{{count}} paraules clau",
+      "statuses_one": "{{count}} publicació",
+      "statuses_other": "{{count}} publicacions",
+      "context": "Aplica a <0 />",
+      "contexts": {
+        "home": "Seguits i llistes",
+        "notifications": "Notificació",
+        "public": "federat",
+        "thread": "Conversa",
+        "account": "Perfil"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Nom",
+      "expiration": "Venciment",
+      "expirationOptions": {
+        "0": "Mai",
+        "1800": "Després de 30 minuts",
+        "3600": "Després d'una hora",
+        "43200": "Després de 12 hores",
+        "86400": "Després d'un dia",
+        "604800": "Després d'una setmana",
+        "18144000": "Després d'un mes"
+      },
+      "context": "Aplica a",
+      "contexts": {
+        "home": "Seguits i llistes",
+        "notifications": "Notificació",
+        "public": "Línia de temps federada",
+        "thread": "Vista de conversa",
+        "account": "Vista del perfil"
+      },
+      "action": "Quan coincideix",
+      "actions": {
+        "warn": "",
+        "hide": "Amagat completament"
+      },
+      "keywords": "Coincidències per aquestes paraules claus",
+      "keyword": "Paraula clau",
+      "statuses": "Coincideixen aquestes publicacions"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} actualitzat",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} camp",
           "total_other": "{{count}} camps"
         },
-        "visibility": {
-          "title": "Visibilitat",
-          "options": {
-            "public": "Públic",
-            "unlisted": "Sense llistar",
-            "private": "Només als seguidors"
-          }
-        },
-        "sensitive": {
-          "title": "Continguts multimèdia sensibles"
-        },
         "lock": {
           "title": "Fes el compte privat",
           "description": "Caldrà l'aprovació manual de seguidors nous"
@@ -322,15 +399,15 @@
     "attachments": {
       "name": "Multimèdia de <0 /><1></1>"
     },
-    "hashtag": {
-      "follow": "Segueix",
-      "unfollow": "Deixa de seguir"
+    "filter": {
+      "name": "Afegeix al filtre",
+      "existed": "Existia sota aquests filtres"
     },
     "history": {
       "name": "Edita l'historial"
     },
     "report": {
-      "name": "Denuncia {{acct}}",
+      "name": "Denúncia a {{acct}}",
       "report": "Denúncia",
       "forward": {
         "heading": "Envia anònimament al servidor remot {{instance}}"
diff --git a/src/i18n/cs/components/contextMenu.json b/src/i18n/cs/components/contextMenu.json
index 19cd5f9e..6306d3a7 100644
--- a/src/i18n/cs/components/contextMenu.json
+++ b/src/i18n/cs/components/contextMenu.json
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": ""
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "",
       "action_true": ""
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/cs/screens/compose.json b/src/i18n/cs/screens/compose.json
index 2d94048a..771e39e8 100644
--- a/src/i18n/cs/screens/compose.json
+++ b/src/i18n/cs/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "",
           "placeholder": ""
-        },
-        "imageFocus": ""
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/cs/screens/tabs.json b/src/i18n/cs/screens/tabs.json
index 09a175ac..6491ce64 100644
--- a/src/i18n/cs/screens/tabs.json
+++ b/src/i18n/cs/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": ""
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": ""
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": ""
       },
-      "webSettings": {
-        "name": ""
-      },
       "switch": {
         "name": ""
       }
@@ -125,6 +134,85 @@
         "message": ""
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "",
@@ -150,17 +238,6 @@
           "total_one": "",
           "total_other": ""
         },
-        "visibility": {
-          "title": "",
-          "options": {
-            "public": "",
-            "unlisted": "",
-            "private": ""
-          }
-        },
-        "sensitive": {
-          "title": ""
-        },
         "lock": {
           "title": "",
           "description": ""
@@ -322,9 +399,9 @@
     "attachments": {
       "name": ""
     },
-    "hashtag": {
-      "follow": "",
-      "unfollow": ""
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": ""
diff --git a/src/i18n/de/components/contextMenu.json b/src/i18n/de/components/contextMenu.json
index e5ebc881..cf71ee5e 100644
--- a/src/i18n/de/components/contextMenu.json
+++ b/src/i18n/de/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Folgen",
       "action_true": "Nutzer entfolgen"
     },
-    "inLists": "Listen mit Nutzern",
+    "inLists": "",
     "showBoosts": {
       "action_false": "",
       "action_true": ""
@@ -16,12 +16,12 @@
       "action_true": "Stummschaltung des Nutzers aufheben"
     },
     "followAs": {
-      "trigger": "Folgen als…",
+      "trigger": "",
       "succeed_default": "Folgt nun @{{target}} als @{{source}}",
       "succeed_locked": "Follower-Anfrage an @{{target}} mit {{source}} gesendet, Bestätigung ausstehend",
       "failed": "Folgen als…"
     },
-    "blockReport": "Blockieren und melden…",
+    "blockReport": "",
     "block": {
       "action_false": "Nutzer blockieren",
       "action_true": "User entblocken",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Tröt teilen"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Tröt anheften",
       "action_true": "Tröt nicht mehr anheften"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/de/screens/compose.json b/src/i18n/de/screens/compose.json
index caa03047..7b1ae518 100644
--- a/src/i18n/de/screens/compose.json
+++ b/src/i18n/de/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Beschreibe den Inhalt für Sehbehinderte",
           "placeholder": "Du kannst den Inhalten eine Beschreibung hinzufügen, auch \"Alt-Text\" genannt, damit sie für mehr Menschen zugänglich sind - auch für Blinde oder Sehbehinderte.\n\nGute Beschreibungen sind kurz und prägnant, geben aber den Inhalt Ihrer Medien genau genug wieder, um den Kontext zu verstehen."
-        },
-        "imageFocus": "Ziehe den Fokuskreis, um den Fokuspunkt zu aktualisieren"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/de/screens/tabs.json b/src/i18n/de/screens/tabs.json
index c83d2a8b..759a0ba2 100644
--- a/src/i18n/de/screens/tabs.json
+++ b/src/i18n/de/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Push-Benachrichtigung"
       },
+      "preferences": {
+        "name": "Einstellungen"
+      },
+      "preferencesFilters": {
+        "name": "Inhaltsfilter"
+      },
+      "preferencesFilterAdd": {
+        "name": "Filterregel erstellen"
+      },
+      "preferencesFilterEdit": {
+        "name": "Filter bearbeiten"
+      },
       "profile": {
         "name": "Profil bearbeiten"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "App-Einstellungen"
       },
-      "webSettings": {
-        "name": "Kontoeinstellungen"
-      },
       "switch": {
         "name": "Konto wechseln"
       }
@@ -125,6 +134,85 @@
         "message": "Diese Aktion kann nicht rückgängig gemacht werden."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Standard-Einstellung für die Sichtbarkeit des Tröts",
+        "options": {
+          "public": "Öffentlich",
+          "unlisted": "Ungelistet",
+          "private": "Nur für Follower"
+        }
+      },
+      "sensitive": {
+        "title": "Medien immer als sensibel kennzeichnen"
+      },
+      "media": {
+        "title": "Medien-Anzeige",
+        "options": {
+          "default": "Als heikel gekennzeichnete Medien ausblenden",
+          "show_all": "Medien immer anzeigen",
+          "hide_all": "Medien immer verstecken"
+        }
+      },
+      "spoilers": {
+        "title": "Beiträge mit Inhaltswarnungen immer ausklappen"
+      },
+      "autoplay_gifs": {
+        "title": "GIFs automatisch abspielen"
+      },
+      "filters": {
+        "title": "Inhaltsfilter",
+        "content": "{{count}} aktiv"
+      },
+      "web_only": {
+        "title": "Einstellungen aktualisieren",
+        "description": "Nachfolgende Einstellungen können nur über das Web-Interface aktualisiert werden"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Abgelaufen",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "{{count}} Tröt",
+      "statuses_other": "{{count}} Tröts",
+      "context": "Läuft in <0 /> ab",
+      "contexts": {
+        "home": "Gefolgte und Listen",
+        "notifications": "Benachrichtigung",
+        "public": "Föderiert",
+        "thread": "Unterhaltung",
+        "account": "Profil"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Name",
+      "expiration": "Ablaufdatum",
+      "expirationOptions": {
+        "0": "Niemals",
+        "1800": "Nach 30 Minuten",
+        "3600": "Nach einer Stunde",
+        "43200": "Nach 12 Stunden",
+        "86400": "Nach einem Tag",
+        "604800": "Nach einer Woche",
+        "18144000": "Nach einem Monat"
+      },
+      "context": "",
+      "contexts": {
+        "home": "Gefolgte und Listen",
+        "notifications": "Benachrichtigung",
+        "public": "Föderierte Timeline",
+        "thread": "Unterhaltungsansicht",
+        "account": "Profilansicht"
+      },
+      "action": "Bei Übereinstimmung",
+      "actions": {
+        "warn": "Verdeckt, kann aber aufgedeckt werden",
+        "hide": "Vollständig verdeckt"
+      },
+      "keywords": "",
+      "keyword": "Stichwörter",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} aktualisiert",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} Feld",
           "total_other": "{{count}} Felder"
         },
-        "visibility": {
-          "title": "Sichtbarkeit des Beitrags",
-          "options": {
-            "public": "Öffentlich",
-            "unlisted": "Ungelistet",
-            "private": "Nur für Follower"
-          }
-        },
-        "sensitive": {
-          "title": "Expliziten Beitrag posten"
-        },
         "lock": {
           "title": "Konto sperren",
           "description": "Follower manuell bestätigen"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>'s Medien</1>"
     },
-    "hashtag": {
-      "follow": "Folgen",
-      "unfollow": "Entfolgen"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Bearbeitungsverlauf"
diff --git a/src/i18n/el/components/contextMenu.json b/src/i18n/el/components/contextMenu.json
index 3cf8450b..85357001 100644
--- a/src/i18n/el/components/contextMenu.json
+++ b/src/i18n/el/components/contextMenu.json
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Κοινοποίηση ανάρτησης"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Κρέμασμα ανάρτησης",
       "action_true": "Ξεκρέμασμα ανάρτησης"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/el/screens/compose.json b/src/i18n/el/screens/compose.json
index 3215c860..f613e108 100644
--- a/src/i18n/el/screens/compose.json
+++ b/src/i18n/el/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Περιγραφή πολυμέσων για άτομα με προβλήματα όρασης",
           "placeholder": "Μπορείτε να προσθέσετε μια περιγραφή, που μερικές φορές ονομάζεται alt-text, στα πολυμέσα σας, ώστε να είναι προσβάσιμα σε ακόμα περισσότερους ανθρώπους, συμπεριλαμβανομένων εκείνων που είναι τυφλοί ή έχουν προβλήματα όρασης.\n\nΟι καλές περιγραφές είναι συνοπτικές, αλλά παρουσιάζουν τι απεικονίζεται με αρκετή ακρίβεια ώστε να είναι κατανοητό το συγκείμενο."
-        },
-        "imageFocus": "Σύρετε τον κύκλο για να την ενημέρωση του κέντρου προσοχής"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/el/screens/tabs.json b/src/i18n/el/screens/tabs.json
index acc3d375..8fd80b88 100644
--- a/src/i18n/el/screens/tabs.json
+++ b/src/i18n/el/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Ειδοποιήσεις push"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "Επεξεργασία προφίλ"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Ρυθμίσεις εφαρμογής"
       },
-      "webSettings": {
-        "name": "Περισσότερες ρυθμίσεις λογαριασμού"
-      },
       "switch": {
         "name": "Εναλλαγή λογαριασμού"
       }
@@ -125,6 +134,85 @@
         "message": "Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}}: ενημερώθηκε",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} πεδίο",
           "total_other": "{{count}} πεδία"
         },
-        "visibility": {
-          "title": "Ορατότητα αναρτήσεων",
-          "options": {
-            "public": "Δημόσια",
-            "unlisted": "Χωρίς καταχώρηση",
-            "private": "Μόνο για τους ακολούθους"
-          }
-        },
-        "sensitive": {
-          "title": "Ανάρτηση πολυμέσων ευαίσθητης φύσης"
-        },
         "lock": {
           "title": "Κλείδωμα λογαριασμού",
           "description": "Είναι απαραίτητη η χειρονακτική έγκριση των ακολούθων σας"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1> πολυμέσα</1>"
     },
-    "hashtag": {
-      "follow": "Ακολουθήστε",
-      "unfollow": "Διακοπή παρακολούθησης"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Ιστορικό επεξεργασίας"
diff --git a/src/i18n/en/components/contextMenu.json b/src/i18n/en/components/contextMenu.json
index f9a4ad28..b740d672 100644
--- a/src/i18n/en/components/contextMenu.json
+++ b/src/i18n/en/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Follow user",
       "action_true": "Unfollow user"
     },
-    "inLists": "Lists containing user",
+    "inLists": "Lists containing user ...",
     "showBoosts": {
       "action_false": "Show user's boosts",
       "action_true": "Hide users's boosts"
@@ -16,12 +16,12 @@
       "action_true": "Unmute user"
     },
     "followAs": {
-      "trigger": "Follow as...",
+      "trigger": "Follow as ...",
       "succeed_default": "Now following @{{target}} with @{{source}}",
       "succeed_locked": "Sent follow request to @{{target}} with {{source}}, pending approval",
       "failed": "Follow as"
     },
-    "blockReport": "Block and report...",
+    "blockReport": "Block and report",
     "block": {
       "action_false": "Block user",
       "action_true": "Unblock user",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "Follow",
+      "action_true": "Unfollow"
+    },
+    "filter": {
+      "action": "Filter hashtag ..."
+    }
+  },
   "share": {
     "status": {
       "action": "Share toot"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Pin toot",
       "action_true": "Unpin toot"
+    },
+    "filter": {
+      "action_false": "Filter toot ...",
+      "action_true": "Manage filters ..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/en/screens/compose.json b/src/i18n/en/screens/compose.json
index 60d3db4e..dfb83acb 100644
--- a/src/i18n/en/screens/compose.json
+++ b/src/i18n/en/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Describe media for the visually impaired",
           "placeholder": "You can add a description, sometimes called alt-text, to your media so they are accessible to even more people, including those who are blind or visually impaired.\n\nGood descriptions are concise, but present what is in your media accurately enough to understand their context."
-        },
-        "imageFocus": "Drag the focus circle to update focus point"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index 051ab6e5..3c27bd0b 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Push Notification"
       },
+      "preferences": {
+        "name": "Preferences"
+      },
+      "preferencesFilters": {
+        "name": "All content filters"
+      },
+      "preferencesFilterAdd": {
+        "name": "Create a Filter"
+      },
+      "preferencesFilterEdit": {
+        "name": "Edit Filter"
+      },
       "profile": {
         "name": "Edit Profile"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "App Settings"
       },
-      "webSettings": {
-        "name": "More Account Settings"
-      },
       "switch": {
         "name": "Switch Account"
       }
@@ -125,6 +134,85 @@
         "message": "This action is not recoverable."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Default posting visibility",
+        "options": {
+          "public": "Public",
+          "unlisted": "Unlisted",
+          "private": "Followers only"
+        }
+      },
+      "sensitive": {
+        "title": "Default mark media as sensitive"
+      },
+      "media": {
+        "title": "Media display",
+        "options": {
+          "default": "Hide media marked as sensitive",
+          "show_all": "Always show media",
+          "hide_all": "Always hide media"
+        }
+      },
+      "spoilers": {
+        "title": "Auto expand toots with content warning"
+      },
+      "autoplay_gifs": {
+        "title": "Autoplay GIF in toots"
+      },
+      "filters": {
+        "title": "Content filters",
+        "content": "{{count}} active"
+      },
+      "web_only": {
+        "title": "Update settings",
+        "description": "Settings below can only be updated using the web UI"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Expired",
+      "keywords_one": "{{count}} keyword",
+      "keywords_other": "{{count}} keywords",
+      "statuses_one": "{{count}} toot",
+      "statuses_other": "{{count}} toots",
+      "context": "Applies in <0 />",
+      "contexts": {
+        "home": "following and lists",
+        "notifications": "notification",
+        "public": "federated",
+        "thread": "conversation",
+        "account": "profile"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Name",
+      "expiration": "Expiration",
+      "expirationOptions": {
+        "0": "Never",
+        "1800": "After 30 minutes",
+        "3600": "After 1 hour",
+        "43200": "After 12 hours",
+        "86400": "After 1 day",
+        "604800": "After 1 week",
+        "18144000": "After 1 month"
+      },
+      "context": "Applies in",
+      "contexts": {
+        "home": "Following and lists",
+        "notifications": "Notification",
+        "public": "Federated timeline",
+        "thread": "Conversation view",
+        "account": "Profile view"
+      },
+      "action": "When matched",
+      "actions": {
+        "warn": "Collapsed but can be revealed",
+        "hide": "Hidden completely"
+      },
+      "keywords": "Matches for these keywords",
+      "keyword": "Keyword",
+      "statuses": "Matches these toots"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} updated",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} field",
           "total_other": "{{count}} fields"
         },
-        "visibility": {
-          "title": "Posting Visibility",
-          "options": {
-            "public": "Public",
-            "unlisted": "Unlisted",
-            "private": "Followers only"
-          }
-        },
-        "sensitive": {
-          "title": "Posting Media Sensitive"
-        },
         "lock": {
           "title": "Lock Account",
           "description": "Requires you to manually approve followers"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>'s media</1>"
     },
-    "hashtag": {
-      "follow": "Follow",
-      "unfollow": "Unfollow"
+    "filter": {
+      "name": "Add to filter",
+      "existed": "Existed in these filters"
     },
     "history": {
       "name": "Edit History"
diff --git a/src/i18n/es/components/contextMenu.json b/src/i18n/es/components/contextMenu.json
index 95658089..5c225435 100644
--- a/src/i18n/es/components/contextMenu.json
+++ b/src/i18n/es/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Seguir usuario",
       "action_true": "Dejar de seguir usuario"
     },
-    "inLists": "Listas que contienen el usuario",
+    "inLists": "Listas que contienen el usuario...",
     "showBoosts": {
       "action_false": "Mostrar los impulsos del usuario",
       "action_true": "Ocultar los impulsos del usuario"
@@ -16,12 +16,12 @@
       "action_true": "Dejar de silenciar al usuario"
     },
     "followAs": {
-      "trigger": "Seguir como...",
+      "trigger": "",
       "succeed_default": "Siguiendo @{{target}} como @{{source}}",
       "succeed_locked": "Enviado la solicitud de seguimiento a @{{target}} como {{source}}, pendiente de aprobación",
       "failed": "Seguir como"
     },
-    "blockReport": "Bloquear y denunciar...",
+    "blockReport": "Bloquear y denunciar",
     "block": {
       "action_false": "Bloquear usuario",
       "action_true": "Desbloquear usuario",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "Seguir",
+      "action_true": "Dejar de seguir"
+    },
+    "filter": {
+      "action": "Filtrar la etiqueta..."
+    }
+  },
   "share": {
     "status": {
       "action": "Compartir toot"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Fijar toot",
       "action_true": "Desfijar toot"
+    },
+    "filter": {
+      "action_false": "Filtrar la publicación...",
+      "action_true": "Gestiona los filtros..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/es/screens/compose.json b/src/i18n/es/screens/compose.json
index 9e2de85b..1012ece5 100644
--- a/src/i18n/es/screens/compose.json
+++ b/src/i18n/es/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Describir para personas con dificultades de visión",
           "placeholder": "Añade una descripción, también llamada texto alternativo, a tu archivo y haz que sea más accesible, incluso para personas ciegas o con dificultades de visión.\n\nLo mejor es que sean concisas, pero que expresen todo lo que aparece en las imágenes con exactitud para dar contexto."
-        },
-        "imageFocus": "Arrastra el círculo para cambiar el punto de atención"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/es/screens/tabs.json b/src/i18n/es/screens/tabs.json
index f1c12d76..074703bc 100644
--- a/src/i18n/es/screens/tabs.json
+++ b/src/i18n/es/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Notificaciones push"
       },
+      "preferences": {
+        "name": "Preferencias"
+      },
+      "preferencesFilters": {
+        "name": "Todos los filtros de contenido"
+      },
+      "preferencesFilterAdd": {
+        "name": "Crear filtro"
+      },
+      "preferencesFilterEdit": {
+        "name": "Editar filtro"
+      },
       "profile": {
         "name": "Editar perfil"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Ajustes de la aplicación"
       },
-      "webSettings": {
-        "name": "Más ajustes de la cuenta"
-      },
       "switch": {
         "name": "Cambiar de cuenta"
       }
@@ -125,6 +134,85 @@
         "message": "Esta acción no se podrá deshacer."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Visibilidad de publicación predeterminada",
+        "options": {
+          "public": "Público",
+          "unlisted": "No listado",
+          "private": "Solo seguidores"
+        }
+      },
+      "sensitive": {
+        "title": "Marcar el contenido multimedia como sensibles por defecto"
+      },
+      "media": {
+        "title": "Mostrar el contenido multimedia",
+        "options": {
+          "default": "Ocultar los contenidos multimedia marcados como sensibles",
+          "show_all": "Mostrar siempre el contenido multimedia",
+          "hide_all": "Siempre ocultar el contenido multimedia"
+        }
+      },
+      "spoilers": {
+        "title": "Siempre expandir las publicaciones marcadas con advertencias de contenido"
+      },
+      "autoplay_gifs": {
+        "title": "Reproduce automáticamente los GIF"
+      },
+      "filters": {
+        "title": "Filtros de contenido",
+        "content": "{{count}} activo"
+      },
+      "web_only": {
+        "title": "Actualizar ajustes",
+        "description": "Los ajustes a continuación solo se pueden actualizar mediante la interfaz web"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Expirado",
+      "keywords_one": "{{count}} palabra clave",
+      "keywords_other": "{{count}} palabras clave",
+      "statuses_one": "{{count}} publicación",
+      "statuses_other": "{{count}} publicaciones",
+      "context": "Se aplica en <0 />",
+      "contexts": {
+        "home": "Seguidos y listas",
+        "notifications": "Notificación",
+        "public": "Federado",
+        "thread": "Conversación",
+        "account": "Perfil"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Nombre",
+      "expiration": "Vencimiento",
+      "expirationOptions": {
+        "0": "Nunca",
+        "1800": "Después de 30 minutos",
+        "3600": "Después de 1 hora",
+        "43200": "Después de 12 horas",
+        "86400": "Después de 1 día",
+        "604800": "Después de 1 semana",
+        "18144000": "Después de 1 mes"
+      },
+      "context": "Se aplica en",
+      "contexts": {
+        "home": "Seguidos y listas",
+        "notifications": "Notificación",
+        "public": "Cronología federada",
+        "thread": "Vista de conversación",
+        "account": "Vista de perfil"
+      },
+      "action": "Al coincidir",
+      "actions": {
+        "warn": "",
+        "hide": "Oculto completamente"
+      },
+      "keywords": "Coincide con estas palabras clave",
+      "keyword": "Palabra clave",
+      "statuses": "Coincide con estas publicaciones"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} actualizado",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} campo",
           "total_other": "{{count}} campos"
         },
-        "visibility": {
-          "title": "Visibilidad de publicación",
-          "options": {
-            "public": "Público",
-            "unlisted": "No listado",
-            "private": "Solo seguidores"
-          }
-        },
-        "sensitive": {
-          "title": "Publicar contenido multimedia sensible"
-        },
         "lock": {
           "title": "Hacer la cuenta privada",
           "description": "Necesitas aprobar manualmente los seguidores nuevos"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "Multimedia de <0 /><1></1>"
     },
-    "hashtag": {
-      "follow": "Seguir",
-      "unfollow": "Dejar de seguir"
+    "filter": {
+      "name": "Añadir al filtro",
+      "existed": "Existe en estos filtros"
     },
     "history": {
       "name": "Historial de ediciones"
diff --git a/src/i18n/eu/common.json b/src/i18n/eu/common.json
new file mode 100644
index 00000000..2bed7048
--- /dev/null
+++ b/src/i18n/eu/common.json
@@ -0,0 +1,32 @@
+{
+  "buttons": {
+    "OK": "Ados",
+    "apply": "Aplikatu",
+    "cancel": "Utzi",
+    "discard": "Baztertu",
+    "continue": "Jarraitu",
+    "create": "Sortu",
+    "delete": "Ezabatu",
+    "done": "Eginda",
+    "confirm": "Berretsi"
+  },
+  "customEmoji": {
+    "accessibilityLabel": "Emoji pertsonalizatua {{emoji}}"
+  },
+  "message": {
+    "success": {
+      "message": "{{function}} ongi burutu da"
+    },
+    "warning": {
+      "message": ""
+    },
+    "error": {
+      "message": "{{function}}-(e)k huts egin du, mesedez, saia zaitez berriro"
+    }
+  },
+  "separator": ", ",
+  "discard": {
+    "title": "Aldaketa ez da gorde",
+    "message": "Zuk eginiko aldaketa ez da gorde. Baztertu nahi al duzu?"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/components/contextMenu.json b/src/i18n/eu/components/contextMenu.json
new file mode 100644
index 00000000..afe429bc
--- /dev/null
+++ b/src/i18n/eu/components/contextMenu.json
@@ -0,0 +1,106 @@
+{
+  "accessibilityHint": "",
+  "account": {
+    "title": "",
+    "following": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "inLists": "Erabiltzaile hau zerrenda hauetan dago...",
+    "showBoosts": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "mute": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "followAs": {
+      "trigger": "Honela jarraitu...",
+      "succeed_default": "",
+      "succeed_locked": "",
+      "failed": ""
+    },
+    "blockReport": "Blokeatu eta salatu",
+    "block": {
+      "action_false": "",
+      "action_true": "",
+      "alert": {
+        "title": ""
+      }
+    },
+    "reports": {
+      "action": "",
+      "alert": {
+        "title": ""
+      }
+    }
+  },
+  "at": {
+    "direct": "",
+    "public": ""
+  },
+  "copy": {
+    "action": "",
+    "succeed": ""
+  },
+  "instance": {
+    "title": "",
+    "block": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": ""
+      }
+    }
+  },
+  "hashtag": {
+    "follow": {
+      "action_false": "Jarraitu",
+      "action_true": "Jarraitzeari utzi"
+    },
+    "filter": {
+      "action": "Traola iragazi..."
+    }
+  },
+  "share": {
+    "status": {
+      "action": ""
+    },
+    "account": {
+      "action": ""
+    }
+  },
+  "status": {
+    "title": "",
+    "edit": {
+      "action": ""
+    },
+    "delete": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "deleteEdit": {
+      "action": "",
+      "alert": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "mute": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "pin": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action_false": "Tuta iragazi...",
+      "action_true": "Iragazkiak kudeatu..."
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/components/emojis.json b/src/i18n/eu/components/emojis.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/src/i18n/eu/components/emojis.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/i18n/eu/components/instance.json b/src/i18n/eu/components/instance.json
new file mode 100644
index 00000000..111640e3
--- /dev/null
+++ b/src/i18n/eu/components/instance.json
@@ -0,0 +1,27 @@
+{
+  "server": {
+    "textInput": {
+      "placeholder": "Instantziaren domeinua"
+    },
+    "whitelisted": "Baliteke instantzia hau zerrenda zuri batean egotea eta toootek bertako data ezin eskura ahal izatea saioa hasi aurretik.",
+    "button": "Saioa hasi",
+    "information": {
+      "name": "Izena",
+      "accounts": "Erabiltzaileak",
+      "statuses": "Tutak",
+      "domains": "Domeinuak"
+    },
+    "disclaimer": {
+      "base": "Saioa hasteko prozesuak sistemako nabigatzailea erabiltzen du, beraz, zure kontuko informazioa ez da tooot aplikazioarentzat ikusgarri izango."
+    },
+    "terms": {
+      "base": "Saio hastean, <0>pribatutasun-politika</0> eta <1>zerbitzuaren terminoak</1> onartzen dituzu."
+    }
+  },
+  "update": {
+    "alert": {
+      "title": "Instantzia honetan saioa hasita",
+      "message": "Beste kontu batekin saioa has dezakezu, saioa hasita duen kontua mantentzen delarik"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/components/mediaSelector.json b/src/i18n/eu/components/mediaSelector.json
new file mode 100644
index 00000000..afd894e4
--- /dev/null
+++ b/src/i18n/eu/components/mediaSelector.json
@@ -0,0 +1,10 @@
+{
+  "title": "",
+  "message": "",
+  "options": {
+    "image": "",
+    "image_max": "",
+    "video": "",
+    "video_max": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/components/parse.json b/src/i18n/eu/components/parse.json
new file mode 100644
index 00000000..8157efb8
--- /dev/null
+++ b/src/i18n/eu/components/parse.json
@@ -0,0 +1,8 @@
+{
+  "HTML": {
+    "accessibilityHint": "",
+    "expanded": "{{hint}}{{moreLines}}",
+    "moreLines": " ({{count}} lerro gehiago)",
+    "defaultHint": "Tut luzea"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/components/relationship.json b/src/i18n/eu/components/relationship.json
new file mode 100644
index 00000000..9cfe2f09
--- /dev/null
+++ b/src/i18n/eu/components/relationship.json
@@ -0,0 +1,16 @@
+{
+  "follow": {
+    "function": "Erabiltzailea jarraitu"
+  },
+  "block": {
+    "function": "Erabiltzailea blokeatu"
+  },
+  "button": {
+    "error": "Errorea kargatzean",
+    "blocked_by": "Erabiltzaileak blokeatua",
+    "blocking": "Desblokeatu",
+    "following": "Jarraitzeari utzi",
+    "requested": "Eskaera baztertu",
+    "default": "Jarraitu"
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/components/timeline.json b/src/i18n/eu/components/timeline.json
new file mode 100644
index 00000000..9ff54704
--- /dev/null
+++ b/src/i18n/eu/components/timeline.json
@@ -0,0 +1,162 @@
+{
+  "empty": {
+    "error": {
+      "message": "Errorea kargatzean",
+      "button": "Berriro saiatu"
+    },
+    "success": {
+      "message": "Denbora-lerroa hutsik"
+    }
+  },
+  "end": {
+    "message": "Amaitu dugu, katilu bat <0 /> nahi?"
+  },
+  "lookback": {
+    "message": "Azkenekoz irakurria"
+  },
+  "refresh": {
+    "fetchPreviousPage": "Berrienak hemendik hasita",
+    "refetch": "Azkenekora arte"
+  },
+  "shared": {
+    "actioned": {
+      "pinned": "Finkatua",
+      "favourite": "{{name}}-(e)k zure tuta gogoko du",
+      "status": "{{name}}-(e)k tut bat bidali berri du",
+      "follow": "{{name}}-(e)k jarraitu zaitu",
+      "follow_request": "{{name}}-(e)k zu jarraitzeko eskaera egin du",
+      "poll": "Erantzun zenuen inkesta bat amaitu da",
+      "reblog": {
+        "default": "{{name}}-(e)k bultzatu du",
+        "notification": "{{name}}-(e)k zure tuta bultzatu du"
+      },
+      "update": "Bultzada editatua izan da",
+      "admin.sign_up": "{{name}} instantziara elkartu da",
+      "admin.report": "{{name}}-(e)k zera salatu du:"
+    },
+    "actions": {
+      "reply": {
+        "accessibilityLabel": "Tut honi erantzun"
+      },
+      "reblogged": {
+        "accessibilityLabel": "Tut hau bultzatu",
+        "function": "Tuta bultzatu",
+        "options": {
+          "title": "",
+          "public": "",
+          "unlisted": ""
+        }
+      },
+      "favourited": {
+        "accessibilityLabel": "",
+        "function": ""
+      },
+      "bookmarked": {
+        "accessibilityLabel": "",
+        "function": ""
+      },
+      "openReport": ""
+    },
+    "actionsUsers": {
+      "reblogged_by": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text": ""
+      },
+      "favourited_by": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text": ""
+      },
+      "history": {
+        "accessibilityLabel": "",
+        "accessibilityHint": "",
+        "text_one": "",
+        "text_other": ""
+      }
+    },
+    "attachment": {
+      "sensitive": {
+        "button": ""
+      },
+      "unsupported": {
+        "text": "",
+        "button": ""
+      },
+      "altText": ""
+    },
+    "avatar": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    },
+    "content": {
+      "expandHint": ""
+    },
+    "filtered": {
+      "reveal": "",
+      "match_v1": "",
+      "match_v2_one": "",
+      "match_v2_other": ""
+    },
+    "fullConversation": "",
+    "translate": {
+      "default": "",
+      "succeed": "",
+      "failed": "",
+      "source_not_supported": "",
+      "target_not_supported": ""
+    },
+    "header": {
+      "shared": {
+        "account": {
+          "name": {
+            "accessibilityHint": ""
+          },
+          "account": {
+            "accessibilityHint": ""
+          }
+        },
+        "application": "",
+        "edited": {
+          "accessibilityLabel": ""
+        },
+        "muted": {
+          "accessibilityLabel": ""
+        },
+        "replies": "",
+        "visibility": {
+          "direct": {
+            "accessibilityLabel": ""
+          },
+          "private": {
+            "accessibilityLabel": ""
+          }
+        }
+      },
+      "conversation": {
+        "withAccounts": "",
+        "delete": {
+          "function": ""
+        }
+      }
+    },
+    "poll": {
+      "meta": {
+        "button": {
+          "vote": "",
+          "refresh": ""
+        },
+        "count": {
+          "voters_one": "",
+          "voters_other": "",
+          "votes_one": "",
+          "votes_other": ""
+        },
+        "expiration": {
+          "expired": "",
+          "until": ""
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/screens.json b/src/i18n/eu/screens.json
new file mode 100644
index 00000000..35d8636e
--- /dev/null
+++ b/src/i18n/eu/screens.json
@@ -0,0 +1,17 @@
+{
+  "screenshot": {
+    "title": "",
+    "message": ""
+  },
+  "localCorrupt": {
+    "message": ""
+  },
+  "pushError": {
+    "message": "",
+    "description": ""
+  },
+  "shareError": {
+    "imageNotSupported": "",
+    "videoNotSupported": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/screens/accountSelection.json b/src/i18n/eu/screens/accountSelection.json
new file mode 100644
index 00000000..b16795a6
--- /dev/null
+++ b/src/i18n/eu/screens/accountSelection.json
@@ -0,0 +1,6 @@
+{
+  "heading": "",
+  "content": {
+    "select_account": ""
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/screens/announcements.json b/src/i18n/eu/screens/announcements.json
new file mode 100644
index 00000000..95737a45
--- /dev/null
+++ b/src/i18n/eu/screens/announcements.json
@@ -0,0 +1,10 @@
+{
+  "heading": "",
+  "content": {
+    "published": "",
+    "button": {
+      "read": "",
+      "unread": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/screens/compose.json b/src/i18n/eu/screens/compose.json
new file mode 100644
index 00000000..771e39e8
--- /dev/null
+++ b/src/i18n/eu/screens/compose.json
@@ -0,0 +1,171 @@
+{
+  "heading": {
+    "left": {
+      "alert": {
+        "title": "",
+        "buttons": {
+          "save": "",
+          "delete": ""
+        }
+      }
+    },
+    "right": {
+      "button": {
+        "default": "",
+        "conversation": "",
+        "reply": "",
+        "deleteEdit": "",
+        "edit": "",
+        "share": ""
+      },
+      "alert": {
+        "default": {
+          "title": "",
+          "button": ""
+        },
+        "removeReply": {
+          "title": "",
+          "description": "",
+          "confirm": ""
+        }
+      }
+    }
+  },
+  "content": {
+    "root": {
+      "header": {
+        "postingAs": "",
+        "spoilerInput": {
+          "placeholder": ""
+        },
+        "textInput": {
+          "placeholder": "",
+          "keyboardImage": {
+            "exceedMaximum": {
+              "title": ""
+            }
+          }
+        }
+      },
+      "footer": {
+        "attachments": {
+          "sensitive": "",
+          "remove": {
+            "accessibilityLabel": ""
+          },
+          "edit": {
+            "accessibilityLabel": ""
+          },
+          "upload": {
+            "accessibilityLabel": ""
+          }
+        },
+        "emojis": {
+          "accessibilityHint": ""
+        },
+        "poll": {
+          "option": {
+            "placeholder": {
+              "accessibilityLabel": "",
+              "single": "",
+              "multiple": ""
+            }
+          },
+          "quantity": {
+            "reduce": {
+              "accessibilityLabel": "",
+              "accessibilityHint": ""
+            },
+            "increase": {
+              "accessibilityLabel": "",
+              "accessibilityHint": ""
+            }
+          },
+          "multiple": {
+            "heading": "",
+            "options": {
+              "single": "",
+              "multiple": ""
+            }
+          },
+          "expiration": {
+            "heading": "",
+            "options": {
+              "300": "",
+              "1800": "",
+              "3600": "",
+              "21600": "",
+              "86400": "",
+              "259200": "",
+              "604800": ""
+            }
+          }
+        }
+      },
+      "actions": {
+        "attachment": {
+          "accessibilityLabel": "",
+          "accessibilityHint": "",
+          "failed": {
+            "alert": {
+              "title": "",
+              "button": ""
+            }
+          }
+        },
+        "poll": {
+          "accessibilityLabel": "",
+          "accessibilityHint": ""
+        },
+        "visibility": {
+          "accessibilityLabel": "",
+          "title": "",
+          "options": {
+            "public": "",
+            "unlisted": "",
+            "private": "",
+            "direct": ""
+          }
+        },
+        "spoiler": {
+          "accessibilityLabel": ""
+        },
+        "emoji": {
+          "accessibilityLabel": "",
+          "accessibilityHint": ""
+        }
+      },
+      "drafts_one": "",
+      "drafts_other": ""
+    },
+    "editAttachment": {
+      "header": {
+        "title": "",
+        "right": {
+          "accessibilityLabel": "",
+          "failed": {
+            "title": "",
+            "button": ""
+          }
+        }
+      },
+      "content": {
+        "altText": {
+          "heading": "",
+          "placeholder": ""
+        }
+      }
+    },
+    "draftsList": {
+      "header": {
+        "title": ""
+      },
+      "warning": "",
+      "content": {
+        "accessibilityHint": "",
+        "textEmpty": ""
+      },
+      "checkAttachment": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/screens/imageViewer.json b/src/i18n/eu/screens/imageViewer.json
new file mode 100644
index 00000000..17bba91e
--- /dev/null
+++ b/src/i18n/eu/screens/imageViewer.json
@@ -0,0 +1,16 @@
+{
+  "content": {
+    "actions": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    },
+    "options": {
+      "save": "",
+      "share": ""
+    },
+    "save": {
+      "succeed": "",
+      "failed": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/eu/screens/tabs.json b/src/i18n/eu/screens/tabs.json
new file mode 100644
index 00000000..6491ce64
--- /dev/null
+++ b/src/i18n/eu/screens/tabs.json
@@ -0,0 +1,475 @@
+{
+  "tabs": {
+    "local": {
+      "name": "",
+      "options": {
+        "showBoosts": "",
+        "showReplies": ""
+      }
+    },
+    "public": {
+      "segments": {
+        "federated": "",
+        "local": "",
+        "trending": ""
+      }
+    },
+    "notifications": {
+      "name": ""
+    }
+  },
+  "common": {
+    "search": {
+      "accessibilityLabel": "",
+      "accessibilityHint": ""
+    }
+  },
+  "notifications": {
+    "filters": {
+      "accessibilityLabel": "",
+      "accessibilityHint": "",
+      "title": ""
+    }
+  },
+  "me": {
+    "stacks": {
+      "bookmarks": {
+        "name": ""
+      },
+      "conversations": {
+        "name": ""
+      },
+      "favourites": {
+        "name": ""
+      },
+      "followedTags": {
+        "name": ""
+      },
+      "fontSize": {
+        "name": ""
+      },
+      "language": {
+        "name": ""
+      },
+      "list": {
+        "name": ""
+      },
+      "listAccounts": {
+        "name": ""
+      },
+      "listAdd": {
+        "name": ""
+      },
+      "listEdit": {
+        "name": ""
+      },
+      "lists": {
+        "name": ""
+      },
+      "push": {
+        "name": ""
+      },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
+      "profile": {
+        "name": ""
+      },
+      "profileName": {
+        "name": ""
+      },
+      "profileNote": {
+        "name": ""
+      },
+      "profileFields": {
+        "name": ""
+      },
+      "settings": {
+        "name": ""
+      },
+      "switch": {
+        "name": ""
+      }
+    },
+    "fontSize": {
+      "demo": "",
+      "sizes": {
+        "S": "",
+        "M": "",
+        "L": "",
+        "XL": "",
+        "XXL": ""
+      }
+    },
+    "listAccounts": {
+      "heading": "",
+      "error": "",
+      "empty": ""
+    },
+    "listEdit": {
+      "heading": "",
+      "title": "",
+      "repliesPolicy": {
+        "heading": "",
+        "options": {
+          "none": "",
+          "list": "",
+          "followed": ""
+        }
+      }
+    },
+    "listDelete": {
+      "heading": "",
+      "confirm": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
+    "profile": {
+      "feedback": {
+        "succeed": "",
+        "failed": ""
+      },
+      "root": {
+        "name": {
+          "title": ""
+        },
+        "avatar": {
+          "title": "",
+          "description": ""
+        },
+        "header": {
+          "title": "",
+          "description": ""
+        },
+        "note": {
+          "title": ""
+        },
+        "fields": {
+          "title": "",
+          "total_one": "",
+          "total_other": ""
+        },
+        "lock": {
+          "title": "",
+          "description": ""
+        },
+        "bot": {
+          "title": "",
+          "description": ""
+        }
+      },
+      "fields": {
+        "group": "",
+        "label": "",
+        "content": ""
+      },
+      "mediaSelectionFailed": ""
+    },
+    "push": {
+      "notAvailable": "",
+      "enable": {
+        "direct": "",
+        "settings": ""
+      },
+      "missingServerKey": {
+        "message": "",
+        "description": ""
+      },
+      "global": {
+        "heading": "",
+        "description": ""
+      },
+      "decode": {
+        "heading": "",
+        "description": ""
+      },
+      "default": {
+        "heading": ""
+      },
+      "follow": {
+        "heading": ""
+      },
+      "follow_request": {
+        "heading": ""
+      },
+      "favourite": {
+        "heading": ""
+      },
+      "reblog": {
+        "heading": ""
+      },
+      "mention": {
+        "heading": ""
+      },
+      "poll": {
+        "heading": ""
+      },
+      "status": {
+        "heading": ""
+      },
+      "update": {
+        "heading": ""
+      },
+      "admin.sign_up": {
+        "heading": ""
+      },
+      "admin.report": {
+        "heading": ""
+      },
+      "howitworks": ""
+    },
+    "root": {
+      "announcements": {
+        "content": {
+          "unread": "",
+          "read": "",
+          "empty": ""
+        }
+      },
+      "push": {
+        "content_true": "",
+        "content_false": ""
+      },
+      "logout": {
+        "button": "",
+        "alert": {
+          "title": "",
+          "message": "",
+          "buttons": {
+            "logout": ""
+          }
+        }
+      }
+    },
+    "settings": {
+      "theme": {
+        "heading": "",
+        "options": {
+          "auto": "",
+          "light": "",
+          "dark": ""
+        }
+      },
+      "darkTheme": {
+        "heading": "",
+        "options": {
+          "lighter": "",
+          "darker": ""
+        }
+      },
+      "browser": {
+        "heading": "",
+        "options": {
+          "internal": "",
+          "external": ""
+        }
+      },
+      "autoplayGifv": {
+        "heading": ""
+      },
+      "feedback": {
+        "heading": ""
+      },
+      "support": {
+        "heading": ""
+      },
+      "contact": {
+        "heading": ""
+      },
+      "version": "",
+      "instanceVersion": ""
+    },
+    "switch": {
+      "existing": "",
+      "new": ""
+    }
+  },
+  "shared": {
+    "account": {
+      "actions": {
+        "accessibilityLabel": "",
+        "accessibilityHint": ""
+      },
+      "followed_by": "",
+      "moved": "",
+      "created_at": "",
+      "summary": {
+        "statuses_count": ""
+      },
+      "toots": {
+        "default": "",
+        "all": ""
+      },
+      "suspended": ""
+    },
+    "accountInLists": {
+      "name": "",
+      "inLists": "",
+      "notInLists": ""
+    },
+    "attachments": {
+      "name": ""
+    },
+    "filter": {
+      "name": "",
+      "existed": ""
+    },
+    "history": {
+      "name": ""
+    },
+    "report": {
+      "name": "",
+      "report": "",
+      "forward": {
+        "heading": ""
+      },
+      "reasons": {
+        "heading": "",
+        "spam": "",
+        "other": "",
+        "violation": ""
+      },
+      "comment": {
+        "heading": ""
+      },
+      "violatedRules": {
+        "heading": ""
+      }
+    },
+    "search": {
+      "header": {
+        "prefix": "",
+        "placeholder": ""
+      },
+      "empty": {
+        "general": "",
+        "advanced": {
+          "header": "",
+          "example": {
+            "account": "",
+            "hashtag": "",
+            "statusLink": "",
+            "accountLink": ""
+          }
+        },
+        "trending": {
+          "tags": ""
+        }
+      },
+      "sections": {
+        "accounts": "",
+        "hashtags": "",
+        "statuses": ""
+      },
+      "notFound": "",
+      "noResult": ""
+    },
+    "toot": {
+      "name": "",
+      "remoteFetch": {
+        "title": "",
+        "message": ""
+      }
+    },
+    "users": {
+      "accounts": {
+        "following": "",
+        "followers": ""
+      },
+      "statuses": {
+        "reblogged_by": "",
+        "favourited_by": ""
+      },
+      "resultIncomplete": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/i18n/fr/components/contextMenu.json b/src/i18n/fr/components/contextMenu.json
index 18a1794b..c245b9f7 100644
--- a/src/i18n/fr/components/contextMenu.json
+++ b/src/i18n/fr/components/contextMenu.json
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Partager le pouet"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Pouet épinglé",
       "action_true": "Détacher le pouet"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/fr/screens/compose.json b/src/i18n/fr/screens/compose.json
index b4bdb9c0..fdc41943 100644
--- a/src/i18n/fr/screens/compose.json
+++ b/src/i18n/fr/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Décrire cette photo pour les personnes malvoyantes",
           "placeholder": "Vous pouvez ajouter une description, parfois appelée alt-text, à vos médias afin qu'ils soient accessibles à un plus grand nombre de personnes, y compris celles qui sont aveugles ou malvoyantes.\n\nLes bonnes descriptions sont concises, ou présentent ce qui est dans vos médias avec suffisamment de précision pour comprendre leur contexte."
-        },
-        "imageFocus": "Faites glisser le cercle de focus pour mettre à jour le point de focus"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/fr/screens/tabs.json b/src/i18n/fr/screens/tabs.json
index f9eacb10..a46d7e1a 100644
--- a/src/i18n/fr/screens/tabs.json
+++ b/src/i18n/fr/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Push de notification"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "Modifier le profil"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Paramètres de l'application"
       },
-      "webSettings": {
-        "name": "Plus de paramètres de compte"
-      },
       "switch": {
         "name": "Passer sur un autre compte"
       }
@@ -125,6 +134,85 @@
         "message": "Cette action ne peut être annulé."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} mis à jour",
@@ -150,17 +238,6 @@
           "total_one": "Champ {{count}}",
           "total_other": "Champ {{count}}"
         },
-        "visibility": {
-          "title": "Visibilité de la publication",
-          "options": {
-            "public": "Public",
-            "unlisted": "Non listé",
-            "private": "Abonné·e·s uniquement"
-          }
-        },
-        "sensitive": {
-          "title": "Publication de médias sensibles"
-        },
         "lock": {
           "title": "Verrouiller le compte",
           "description": "Nécessite que vous approuviez manuellement chaque abonné·e"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "Média de <0 /><1></1>"
     },
-    "hashtag": {
-      "follow": "Suivre",
-      "unfollow": "Ne plus suivre"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Modifier l'historique"
diff --git a/src/i18n/it/components/contextMenu.json b/src/i18n/it/components/contextMenu.json
index a014798d..92f97969 100644
--- a/src/i18n/it/components/contextMenu.json
+++ b/src/i18n/it/components/contextMenu.json
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Condividi toot"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Fissa toot",
       "action_true": "Togli toot all'alto"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/it/screens/compose.json b/src/i18n/it/screens/compose.json
index 736b7baa..c427690f 100644
--- a/src/i18n/it/screens/compose.json
+++ b/src/i18n/it/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Descrizione media per ipovedenti",
           "placeholder": "Puoi aggiungere una descrizione (anche chiamata alt-text) ai tuoi media, così da renderli accessibili a molte più persone, incluse quelle con disabilità visive.\n\nUna buona descrizione è concisa ma presenta il contenuto del media in modo abbastanza accurato da farne capire il contesto."
-        },
-        "imageFocus": "Trascina il cerchio per modificare il punto focale della foto"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/it/screens/tabs.json b/src/i18n/it/screens/tabs.json
index 868d44e2..3036959c 100644
--- a/src/i18n/it/screens/tabs.json
+++ b/src/i18n/it/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Notifiche push"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "Modifica profilo"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Impostazioni app"
       },
-      "webSettings": {
-        "name": "Altre impostazioni account"
-      },
       "switch": {
         "name": "Cambia account"
       }
@@ -125,6 +134,85 @@
         "message": ""
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} aggiornato",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} campo",
           "total_other": "{{count}} campi"
         },
-        "visibility": {
-          "title": "Privacy dei post predefinita",
-          "options": {
-            "public": "Pubblico",
-            "unlisted": "Non listato",
-            "private": "Solo seguaci"
-          }
-        },
-        "sensitive": {
-          "title": "Segna sempre i media come sensibili"
-        },
         "lock": {
           "title": "Blocca account",
           "description": "Richiede che approvi i seguaci manualmente"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "Media di <0 /><1>\"</1>"
     },
-    "hashtag": {
-      "follow": "Segui",
-      "unfollow": "Smetti di seguire"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Cronologia delle modifiche"
diff --git a/src/i18n/ja/components/contextMenu.json b/src/i18n/ja/components/contextMenu.json
index 987bfbae..9104b410 100644
--- a/src/i18n/ja/components/contextMenu.json
+++ b/src/i18n/ja/components/contextMenu.json
@@ -8,8 +8,8 @@
     },
     "inLists": "",
     "showBoosts": {
-      "action_false": "",
-      "action_true": ""
+      "action_false": "ブーストを表示する",
+      "action_true": "ブーストを非表示にする"
     },
     "mute": {
       "action_false": "ユーザーをミュート",
@@ -17,22 +17,22 @@
     },
     "followAs": {
       "trigger": "",
-      "succeed_default": "",
-      "succeed_locked": "",
-      "failed": ""
+      "succeed_default": "{{source}} として @{{target}} をフォローしました",
+      "succeed_locked": "{{source}} として @{{target}} へのフォロー申請を送りました。現在承認待ちです",
+      "failed": "別ユーザーとしてフォロー"
     },
     "blockReport": "",
     "block": {
       "action_false": "ユーザーをブロック",
       "action_true": "ユーザーのブロックを解除",
       "alert": {
-        "title": ""
+        "title": "@{{username}} をブロックしますか？"
       }
     },
     "reports": {
       "action": "ユーザーの報告とブロック",
       "alert": {
-        "title": ""
+        "title": "@{{username}} を通報し、ブロックしますか？"
       }
     }
   },
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "トゥートを共有"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "トゥートを固定",
       "action_true": "トゥートの固定を解除"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ja/components/instance.json b/src/i18n/ja/components/instance.json
index 08468322..e9ccc627 100644
--- a/src/i18n/ja/components/instance.json
+++ b/src/i18n/ja/components/instance.json
@@ -3,7 +3,7 @@
     "textInput": {
       "placeholder": "インスタンスのドメイン"
     },
-    "whitelisted": "",
+    "whitelisted": "このインスタンスは、ログインせずにデータを取得できない設定になっている可能性があります。",
     "button": "ログイン",
     "information": {
       "name": "名前",
@@ -12,7 +12,7 @@
       "domains": "接続連合数"
     },
     "disclaimer": {
-      "base": "ログインにはシステムのブラウザを使用するため、あなたのアカウント情報は tooot アプリには表示されません。"
+      "base": "あなたのログイン情報の安全のため、ログインはシステムのブラウズを経由して行われます。 tooot アプリにパスワード等は送られません。"
     },
     "terms": {
       "base": "ログインすることで、 tooot の <0>プライバシーポリシー</0> および <1>利用規約</1> に同意したことになります。"
diff --git a/src/i18n/ja/components/timeline.json b/src/i18n/ja/components/timeline.json
index e3e2c2e2..e01c5014 100644
--- a/src/i18n/ja/components/timeline.json
+++ b/src/i18n/ja/components/timeline.json
@@ -32,7 +32,7 @@
       },
       "update": "ブーストしたトゥートが編集されました",
       "admin.sign_up": "{{name}} がインスタンスに参加しました",
-      "admin.report": ""
+      "admin.report": "{{name}} が報告しました:"
     },
     "actions": {
       "reply": {
@@ -55,7 +55,7 @@
         "accessibilityLabel": "このトゥートをブックマークに追加",
         "function": "ブックマークトゥート"
       },
-      "openReport": ""
+      "openReport": "報告を開く"
     },
     "actionsUsers": {
       "reblogged_by": {
@@ -83,7 +83,7 @@
         "text": "読み込みエラー",
         "button": "リモートリンクを試す"
       },
-      "altText": ""
+      "altText": "代替テキスト"
     },
     "avatar": {
       "accessibilityLabel": "{{name}}のアバター",
@@ -93,10 +93,10 @@
       "expandHint": "内容を非表示にする"
     },
     "filtered": {
-      "reveal": "",
-      "match_v1": "",
-      "match_v2_one": "",
-      "match_v2_other": ""
+      "reveal": "表示する",
+      "match_v1": "フィルター: {{phrase}}",
+      "match_v2_one": "フィルター: {{filters}}",
+      "match_v2_other": "フィルター ({{count}}): {{filters}}"
     },
     "fullConversation": "スレッドを読む",
     "translate": {
@@ -116,14 +116,14 @@
             "accessibilityHint": "ユーザーのアカウント名"
           }
         },
-        "application": "",
+        "application": "{{application}} より",
         "edited": {
           "accessibilityLabel": "トゥートが編集されました"
         },
         "muted": {
           "accessibilityLabel": "トゥートがミュートされました"
         },
-        "replies": "",
+        "replies": "返信先: <0 />",
         "visibility": {
           "direct": {
             "accessibilityLabel": "トゥートはダイレクトメッセージです"
diff --git a/src/i18n/ja/screens/compose.json b/src/i18n/ja/screens/compose.json
index 5b903700..c87443ec 100644
--- a/src/i18n/ja/screens/compose.json
+++ b/src/i18n/ja/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "閲覧が難しいユーザーへの説明",
           "placeholder": "目の不自由な人や視覚障がいを持つ人を含むより多くの人がメディアにアクセスできるようになる、代替テキスト(alt-text)とも呼ばれる説明をメディアに追加することができます。\n\n簡潔でありながらも、メディアの文脈を正確に理解できるような表現が良い説明です。"
-        },
-        "imageFocus": "円形の枠をドラッグしてサムネイルの焦点にしたい場所を更新します"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/ja/screens/tabs.json b/src/i18n/ja/screens/tabs.json
index 3367ce7d..9b1139ae 100644
--- a/src/i18n/ja/screens/tabs.json
+++ b/src/i18n/ja/screens/tabs.json
@@ -3,8 +3,8 @@
     "local": {
       "name": "ホーム",
       "options": {
-        "showBoosts": "",
-        "showReplies": ""
+        "showBoosts": "トゥートのブーストも表示する",
+        "showReplies": "他トゥートへの返信も表示する"
       }
     },
     "public": {
@@ -28,7 +28,7 @@
     "filters": {
       "accessibilityLabel": "フィルター",
       "accessibilityHint": "表示される通知の種類をフィルターする",
-      "title": ""
+      "title": "表示する通知"
     }
   },
   "me": {
@@ -43,7 +43,7 @@
         "name": "お気に入り"
       },
       "followedTags": {
-        "name": ""
+        "name": "フォロー中のハッシュタグ"
       },
       "fontSize": {
         "name": "トゥートのフォントサイズ"
@@ -58,7 +58,7 @@
         "name": "リスト {{list}} のユーザー"
       },
       "listAdd": {
-        "name": ""
+        "name": "リストを作成"
       },
       "listEdit": {
         "name": "リストの詳細を編集"
@@ -69,6 +69,18 @@
       "push": {
         "name": "プッシュ通知"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "プロフィールを編集"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "アプリの設定"
       },
-      "webSettings": {
-        "name": "アカウントの設定"
-      },
       "switch": {
         "name": "アカウントを切り替える"
       }
@@ -125,6 +134,85 @@
         "message": "この操作は復元できません。"
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} がアップデートされました",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} つのフィールド",
           "total_other": "{{count}} つのフィールド"
         },
-        "visibility": {
-          "title": "デフォルトの投稿の公開範囲",
-          "options": {
-            "public": "公開",
-            "unlisted": "未収載",
-            "private": "フォロワー限定"
-          }
-        },
-        "sensitive": {
-          "title": "メディアを常に閲覧注意として投稿する"
-        },
         "lock": {
           "title": "承認制アカウント",
           "description": "フォロワーを手動で承認する必要があります"
@@ -184,8 +261,8 @@
         "settings": "設定で有効にする"
       },
       "missingServerKey": {
-        "message": "",
-        "description": ""
+        "message": "このサーバーはプッシュ通知に対応していません",
+        "description": "プッシュ通知機能の有効化についてサーバーの管理者にお問い合わせください"
       },
       "global": {
         "heading": "{{acct}} の通知を有効にする",
@@ -223,10 +300,10 @@
         "heading": "ブーストしたトゥートが編集されました"
       },
       "admin.sign_up": {
-        "heading": ""
+        "heading": "管理者用: 新規登録"
       },
       "admin.report": {
-        "heading": ""
+        "heading": "管理者用: 報告案件"
       },
       "howitworks": "通知到達(routing)のしくみを学ぶ"
     },
@@ -266,7 +343,7 @@
         "heading": "ダークテーマ",
         "options": {
           "lighter": "デフォルト",
-          "darker": ""
+          "darker": "トゥルーブラック"
         }
       },
       "browser": {
@@ -277,7 +354,7 @@
         }
       },
       "autoplayGifv": {
-        "heading": ""
+        "heading": "タイムラインでGIFを自動再生"
       },
       "feedback": {
         "heading": "機能リクエスト"
@@ -322,30 +399,30 @@
     "attachments": {
       "name": "<0 /><1>のメディア</1>"
     },
-    "hashtag": {
-      "follow": "フォロー",
-      "unfollow": "フォロー解除"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "編集履歴"
     },
     "report": {
-      "name": "",
-      "report": "",
+      "name": "{{acct}} の違反報告",
+      "report": "報告",
       "forward": {
-        "heading": ""
+        "heading": "匿名で相手のサーバー {{instance}} にも送る"
       },
       "reasons": {
-        "heading": "",
-        "spam": "",
-        "other": "",
-        "violation": ""
+        "heading": "このアカウントを通報する理由はなんですか？",
+        "spam": "スパムだから",
+        "other": "他の理由があるから",
+        "violation": "サーバー・インスタンスの規則を破っているから"
       },
       "comment": {
-        "heading": ""
+        "heading": "他に何か意見はありますか？"
       },
       "violatedRules": {
-        "heading": ""
+        "heading": "サーバー・インスタンスの規則違反"
       }
     },
     "search": {
@@ -374,13 +451,13 @@
         "statuses": "投稿"
       },
       "notFound": "{{type}} <bold>{{searchTerm}}</bold> は見つかりませんでした",
-      "noResult": ""
+      "noResult": "何も見つかりません。別の検索用語でお試しください。"
     },
     "toot": {
       "name": "スレッド",
       "remoteFetch": {
-        "title": "",
-        "message": ""
+        "title": "外部の内容が含まれます",
+        "message": "ローカルのインスタンスに特定のコンテンツのコピーが無い場合、リモートから直接取得することになります。これらのコンテンツに対しても通常同様の行動ができます。"
       }
     },
     "users": {
@@ -392,7 +469,7 @@
         "reblogged_by": "{{count}} ブースト",
         "favourited_by": "{{count}} お気に入り"
       },
-      "resultIncomplete": ""
+      "resultIncomplete": "リモートインスタンスからの結果は不完全な場合があります"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ko/components/contextMenu.json b/src/i18n/ko/components/contextMenu.json
index 74d93e45..1cc2c541 100644
--- a/src/i18n/ko/components/contextMenu.json
+++ b/src/i18n/ko/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "사용자 팔로우",
       "action_true": "사용자 팔로우 해제"
     },
-    "inLists": "사용자를 포함한 리스트",
+    "inLists": "",
     "showBoosts": {
       "action_false": "사용자의 부스트 보이기",
       "action_true": "사용자의 부스트 숨기기"
@@ -17,9 +17,9 @@
     },
     "followAs": {
       "trigger": "",
-      "succeed_default": "",
-      "succeed_locked": "",
-      "failed": ""
+      "succeed_default": "@{{source}} 계정에서 @{{target}} 계정을 팔로우 했어요.",
+      "succeed_locked": "@{{source}} 계정에서 @{{target}} 계정의 팔로우 승인을 요청했어요.",
+      "failed": "특정 계정에서 팔로우"
     },
     "blockReport": "",
     "block": {
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "툿 공유"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "툿 고정",
       "action_true": "툿 고정 해제"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ko/screens/compose.json b/src/i18n/ko/screens/compose.json
index 2c19f253..cea4473f 100644
--- a/src/i18n/ko/screens/compose.json
+++ b/src/i18n/ko/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "시각장애인을 위한 미디어 설명",
           "placeholder": "미디어에 '대체 텍스트'라고도 하는 설명을 추가하여, 시각 장애가 있는 사람들을 포함해 더 많은 사람들이 접근하도록 할 수 있어요.\n\n좋은 설명은 간결하지만, 미디어의 내용을 정확하게 표현하여 문맥을 파악할 수 있는 것이에요."
-        },
-        "imageFocus": "포커스 원을 드래그하여 포커스 포인트를 업데이트할 수 있어요"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/ko/screens/tabs.json b/src/i18n/ko/screens/tabs.json
index 31f4b0e5..d53fa998 100644
--- a/src/i18n/ko/screens/tabs.json
+++ b/src/i18n/ko/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "푸시 알림"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "프로필 편집"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "앱 설정"
       },
-      "webSettings": {
-        "name": "더 많은 계정 설정"
-      },
       "switch": {
         "name": "계정 전환"
       }
@@ -125,6 +134,85 @@
         "message": "이 작업은 되돌릴 수 없습니다."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} 업데이트됨",
@@ -150,17 +238,6 @@
           "total_one": "{{count}}개 필드",
           "total_other": "{{count}}개 필드"
         },
-        "visibility": {
-          "title": "공개 범위",
-          "options": {
-            "public": "공개",
-            "unlisted": "공개 타임라인에 비표시",
-            "private": "팔로워만"
-          }
-        },
-        "sensitive": {
-          "title": "미디어를 민감함 표시 후 게시"
-        },
         "lock": {
           "title": "계정 잠그기",
           "description": "직접 승인한 사람만 나를 팔로우 할 수 있어요"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>의 미디어</1>"
     },
-    "hashtag": {
-      "follow": "팔로우",
-      "unfollow": "팔로우 해제"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "수정 이력"
@@ -374,7 +451,7 @@
         "statuses": "툿"
       },
       "notFound": "<bold>{{searchTerm}}</bold>와 관련된 {{type}}을 찾을 수 없어요",
-      "noResult": ""
+      "noResult": "검색 결과가 없어요. 다른 검색어로 다시 시도해주세요."
     },
     "toot": {
       "name": "대화",
diff --git a/src/i18n/nl/components/contextMenu.json b/src/i18n/nl/components/contextMenu.json
index f4bbf123..f7dc0202 100644
--- a/src/i18n/nl/components/contextMenu.json
+++ b/src/i18n/nl/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Volg gebruiker",
       "action_true": "Ontvolg"
     },
-    "inLists": "Lijsten waarin gebruiker staat",
+    "inLists": "Lijsten met gebruiker...",
     "showBoosts": {
       "action_false": "Boosts van gebruiker weergeven",
       "action_true": "Boosts van gebruiker verbergen"
@@ -16,12 +16,12 @@
       "action_true": "Dempen opheffen voor gebruiker"
     },
     "followAs": {
-      "trigger": "Volg als...",
+      "trigger": "Volg als ...",
       "succeed_default": "Je volgt nu @{{target}} met @{{source}}",
       "succeed_locked": "Verstuurde het volgverzoek naar @{{target}} met {{source}}, in afwachting van goedkeuring",
       "failed": "Volg als"
     },
-    "blockReport": "Blokkeren en rapporten...",
+    "blockReport": "Blokkeren en rapporten",
     "block": {
       "action_false": "Gebruiker blokkeren",
       "action_true": "Gebruiker deblokkeren",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "Volg",
+      "action_true": "Ontvolg"
+    },
+    "filter": {
+      "action": "Filter hashtag ..."
+    }
+  },
   "share": {
     "status": {
       "action": "Toot delen"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Toot vastzetten",
       "action_true": "Toot losmaken"
+    },
+    "filter": {
+      "action_false": "Filter toot ...",
+      "action_true": "Filters beheren ..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/nl/screens/compose.json b/src/i18n/nl/screens/compose.json
index 8de12f3c..53ce093d 100644
--- a/src/i18n/nl/screens/compose.json
+++ b/src/i18n/nl/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Omschrijf deze media voor mensen met een visuele beperking",
           "placeholder": "Je kan een beschrijving aan je media toevoegen, ook wel bekend als alt-text, zodat deze voor meer mensen toegankelijk wordt. Bijvoorbeeld voor mensen met een visuele beperking.\n\nGoede beschrijvingen zijn beknopt, maar geven nauwkeurig genoeg weer wat er in de media staat om de context ervan te begrijpen."
-        },
-        "imageFocus": "Sleep de focuscirkel om het focuspunt bij te werken"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/nl/screens/tabs.json b/src/i18n/nl/screens/tabs.json
index c4cd88c4..fe81582c 100644
--- a/src/i18n/nl/screens/tabs.json
+++ b/src/i18n/nl/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Push Melding"
       },
+      "preferences": {
+        "name": "Voorkeuren"
+      },
+      "preferencesFilters": {
+        "name": "Alle inhoudsfilters"
+      },
+      "preferencesFilterAdd": {
+        "name": "Filter Maken"
+      },
+      "preferencesFilterEdit": {
+        "name": "Bewerk filter"
+      },
       "profile": {
         "name": "Profiel bewerken"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "App Instellingen"
       },
-      "webSettings": {
-        "name": "Meer Accountinstellingen"
-      },
       "switch": {
         "name": "Account wisselen"
       }
@@ -125,6 +134,85 @@
         "message": "Deze actie kan niet worden hersteld."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Standaard zichtbaarheid van berichten",
+        "options": {
+          "public": "Openbaar",
+          "unlisted": "Niet openbaar",
+          "private": "Alleen volgers"
+        }
+      },
+      "sensitive": {
+        "title": "Media standaard als gevoelig markeren"
+      },
+      "media": {
+        "title": "Mediaweergave",
+        "options": {
+          "default": "Als gevoelig gemarkeerde media verbergen",
+          "show_all": "Media altijd tonen",
+          "hide_all": "Media altijd verbergen"
+        }
+      },
+      "spoilers": {
+        "title": "Altijd toots met tekstwaarschuwingen uitklappen"
+      },
+      "autoplay_gifs": {
+        "title": "GIF automatisch afspelen in toots"
+      },
+      "filters": {
+        "title": "Inhoud Filters",
+        "content": "{{count}} actief"
+      },
+      "web_only": {
+        "title": "Instellingen bijwerken",
+        "description": "Instellingen hieronder kunnen alleen met behulp van de webUI worden bijgewerkt"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Verlopen",
+      "keywords_one": "{{count}} trefwoord",
+      "keywords_other": "{{count}} trefwoorden",
+      "statuses_one": "{{count}} toot",
+      "statuses_other": "{{count}} toots",
+      "context": "Van toepassing in <0 />",
+      "contexts": {
+        "home": "volgend en lijsten",
+        "notifications": "melding",
+        "public": "gefedereerd",
+        "thread": "gesprek",
+        "account": "profiel"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Naam",
+      "expiration": "Vervaldatum",
+      "expirationOptions": {
+        "0": "Nooit",
+        "1800": "Na 30 minuten",
+        "3600": "Na 1 uur",
+        "43200": "Na 12 uur",
+        "86400": "Na 1 dag",
+        "604800": "Na 1 week",
+        "18144000": "Na 1 maand"
+      },
+      "context": "Van toepassing in",
+      "contexts": {
+        "home": "Volgend en lijsten",
+        "notifications": "Melding",
+        "public": "Federale tijdlijn",
+        "thread": "Gesprek weergave",
+        "account": "Profiel weergave"
+      },
+      "action": "Bij een overeenkomst",
+      "actions": {
+        "warn": "Ingeklapt maar kan worden onthuld",
+        "hide": "Volledig verborgen"
+      },
+      "keywords": "Komt overeen met deze trefwoorden",
+      "keyword": "Trefwoord",
+      "statuses": "Komt overeen met deze toots"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} bijgewerkt",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} veld",
           "total_other": "{{count}} velden"
         },
-        "visibility": {
-          "title": "Post zichtbaarheid",
-          "options": {
-            "public": "Openbaar",
-            "unlisted": "Niet openbaar",
-            "private": "Alleen volgers"
-          }
-        },
-        "sensitive": {
-          "title": "Posten van gevoelige media"
-        },
         "lock": {
           "title": "Account vergrendelen",
           "description": "Vereist dat je handmatig volgers goedkeurt"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>'s media</1>"
     },
-    "hashtag": {
-      "follow": "Volg",
-      "unfollow": "Ontvolg"
+    "filter": {
+      "name": "Toevoegen aan filter",
+      "existed": "Bestaat in deze filters"
     },
     "history": {
       "name": "Geschiedenis bewerken"
diff --git a/src/i18n/pl/components/contextMenu.json b/src/i18n/pl/components/contextMenu.json
index d6afc13a..f16d3d47 100644
--- a/src/i18n/pl/components/contextMenu.json
+++ b/src/i18n/pl/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Obserwuj",
       "action_true": "Przestań obserwować"
     },
-    "inLists": "Listy zawierające użytkownika",
+    "inLists": "",
     "showBoosts": {
       "action_false": "Pokaż podbicia użytkownika",
       "action_true": "Ukryj podbicia użytkowników"
@@ -16,12 +16,12 @@
       "action_true": "Wyłącz wyciszenie"
     },
     "followAs": {
-      "trigger": "Obserwuj jako...",
+      "trigger": "",
       "succeed_default": "Teraz obserwujesz @{{target}} z @{{source}}",
       "succeed_locked": "Wysłano prośbę o obserwowanie do @{{target}} z {{source}}, oczekiwanie na zatwierdzenie",
       "failed": "Obserwuj jako"
     },
-    "blockReport": "Zablokuj i zgłoś...",
+    "blockReport": "",
     "block": {
       "action_false": "Zablokuj użytkownika",
       "action_true": "Odblokuj użytkownika",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Udostępnij wpis"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Przypnij wpis",
       "action_true": "Odepnij wpis"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pl/screens/compose.json b/src/i18n/pl/screens/compose.json
index 1f0918f4..5af35b9c 100644
--- a/src/i18n/pl/screens/compose.json
+++ b/src/i18n/pl/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Opis dla niedowidzących",
           "placeholder": "Możesz dodać opis, czasami nazywany tekstem alternatywnym czy alt-text, dla Twoich mediów, dzięki czemu będą one dostępne dla jeszcze większej liczby osób, w tym dla osób niewidomych lub niedowidzących.\n\nDobre opisy są zwięzłe, ale prezentują to, co w twoich mediach jest wystarczająco dokładne, aby zrozumieć ich kontekst."
-        },
-        "imageFocus": "Przeciągnij okrąg ogniskowy, aby zaktualizować punkt ogniskowy"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/pl/screens/tabs.json b/src/i18n/pl/screens/tabs.json
index 8c9f5a78..4c75e193 100644
--- a/src/i18n/pl/screens/tabs.json
+++ b/src/i18n/pl/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Powiadomienia Push"
       },
+      "preferences": {
+        "name": "Preferencje"
+      },
+      "preferencesFilters": {
+        "name": "Wszystkie filtry treści"
+      },
+      "preferencesFilterAdd": {
+        "name": "Utwórz filtr"
+      },
+      "preferencesFilterEdit": {
+        "name": "Edytuj filtr"
+      },
       "profile": {
         "name": "Edytuj profil"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Ustawienia"
       },
-      "webSettings": {
-        "name": "Ustawienia konta"
-      },
       "switch": {
         "name": "Przełącz konto"
       }
@@ -125,6 +134,85 @@
         "message": "Nie będzie można cofnąć tej czynności."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Domyślna widoczność tootów",
+        "options": {
+          "public": "Publiczny",
+          "unlisted": "Niepubliczny",
+          "private": "Tylko obserwujący"
+        }
+      },
+      "sensitive": {
+        "title": "Domyślnie oznacz media jako wrażliwe"
+      },
+      "media": {
+        "title": "Wyświetlanie multimediów",
+        "options": {
+          "default": "Ukryj media oznaczone jako wrażliwe",
+          "show_all": "Zawsze pokazuj media",
+          "hide_all": "Zawsze ukrywaj media"
+        }
+      },
+      "spoilers": {
+        "title": "Automatycznie rozwijaj tooty z ostrzeżeniem o zawartości"
+      },
+      "autoplay_gifs": {
+        "title": "Autoodtwarzanie GIF w tootach"
+      },
+      "filters": {
+        "title": "Filtry treści",
+        "content": "{{count}} aktywnych"
+      },
+      "web_only": {
+        "title": "Ustawienia aktualizacji",
+        "description": "Poniższe ustawienia mogą być aktualizowane tylko przy użyciu interfejsu webowego"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Wygasło",
+      "keywords_one": "{{count}} słowo kluczowe",
+      "keywords_other": "{{count}} słów kluczowych",
+      "statuses_one": "{{count}} toot",
+      "statuses_other": "{{count}} tootów",
+      "context": "Użyto na <0 />",
+      "contexts": {
+        "home": "obserwujący i listy",
+        "notifications": "powiadomienie",
+        "public": "sfederowane",
+        "thread": "rozmowa",
+        "account": "profil"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Nazwa",
+      "expiration": "Wygaśnięcie",
+      "expirationOptions": {
+        "0": "Nigdy",
+        "1800": "Po 30 minutach",
+        "3600": "Po 1 godzinie",
+        "43200": "Po 12 godzinach",
+        "86400": "Po 1 dniu",
+        "604800": "Po tygodniu",
+        "18144000": "Po miesiącu"
+      },
+      "context": "Zastosuje na",
+      "contexts": {
+        "home": "Obserwujący i listy",
+        "notifications": "Powiadomienie",
+        "public": "Sfederowana oś czasu",
+        "thread": "Widok rozmów",
+        "account": "Widok profilu"
+      },
+      "action": "Gdy pasuje",
+      "actions": {
+        "warn": "Zwinięty, ale można go pokazać",
+        "hide": "Całkowicie ukryte"
+      },
+      "keywords": "Pasuje do tych słów kluczowych",
+      "keyword": "Słowo kluczowe",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "Zaktualizowano {{type}}",
@@ -150,17 +238,6 @@
           "total_one": "Pole {{count}}",
           "total_other": "{{count}} pola"
         },
-        "visibility": {
-          "title": "Domyślna widoczność tootków",
-          "options": {
-            "public": "Publiczne",
-            "unlisted": "Niepubliczne",
-            "private": "Tylko dla obserwujących"
-          }
-        },
-        "sensitive": {
-          "title": "Publikuję rzeczy 18+"
-        },
         "lock": {
           "title": "Zablokuj konto",
           "description": "Wymaga ręcznego zatwierdzania obserwujących"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1> multimedia </1>"
     },
-    "hashtag": {
-      "follow": "Obserwuj",
-      "unfollow": "Przestań obserwować"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Historia edycji"
diff --git a/src/i18n/pt_BR/common.json b/src/i18n/pt_BR/common.json
index 2982cba1..65319c2d 100644
--- a/src/i18n/pt_BR/common.json
+++ b/src/i18n/pt_BR/common.json
@@ -6,8 +6,8 @@
     "discard": "Descartar",
     "continue": "Continuar",
     "create": "",
-    "delete": "",
-    "done": "",
+    "delete": "Excluir",
+    "done": "Concluído",
     "confirm": "Confirmar"
   },
   "customEmoji": {
diff --git a/src/i18n/pt_BR/components/contextMenu.json b/src/i18n/pt_BR/components/contextMenu.json
index 399d0f35..37777374 100644
--- a/src/i18n/pt_BR/components/contextMenu.json
+++ b/src/i18n/pt_BR/components/contextMenu.json
@@ -4,7 +4,7 @@
     "title": "Ações do Usuário",
     "following": {
       "action_false": "Seguir usuário",
-      "action_true": ""
+      "action_true": "Deixar de seguir usuário"
     },
     "inLists": "",
     "showBoosts": {
@@ -17,7 +17,7 @@
     },
     "followAs": {
       "trigger": "",
-      "succeed_default": "",
+      "succeed_default": "Agora seguindo @{{target}} com @{{source}}",
       "succeed_locked": "",
       "failed": ""
     },
@@ -26,13 +26,13 @@
       "action_false": "Bloquear usuário",
       "action_true": "Desbloquear usuário",
       "alert": {
-        "title": ""
+        "title": "Confirmar o bloqueio do usuário @{{username}} ?"
       }
     },
     "reports": {
-      "action": "",
+      "action": "Denunciar e bloquear usuário",
       "alert": {
-        "title": ""
+        "title": "Confirmar denúncia e bloqueio do usuário @{{username}} ?"
       }
     }
   },
@@ -41,7 +41,7 @@
     "public": ""
   },
   "copy": {
-    "action": "",
+    "action": "Copiar toot",
     "succeed": "Copiado"
   },
   "instance": {
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Compartilhar toot"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Toot fixado",
       "action_true": "Desafixar toot"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pt_BR/components/mediaSelector.json b/src/i18n/pt_BR/components/mediaSelector.json
index 62fa2f29..04e514dc 100644
--- a/src/i18n/pt_BR/components/mediaSelector.json
+++ b/src/i18n/pt_BR/components/mediaSelector.json
@@ -1,6 +1,6 @@
 {
   "title": "Selecionar fonte de mídia",
-  "message": "",
+  "message": "Os dados EXIF ​​de mídia não são enviados",
   "options": {
     "image": "Enviar fotos",
     "image_max": "Carregar fotos (máx. {{max}})",
diff --git a/src/i18n/pt_BR/components/parse.json b/src/i18n/pt_BR/components/parse.json
index 38f63a43..105cd8de 100644
--- a/src/i18n/pt_BR/components/parse.json
+++ b/src/i18n/pt_BR/components/parse.json
@@ -3,6 +3,6 @@
     "accessibilityHint": "Toque para expandir ou recolher conteúdo",
     "expanded": "{{hint}}{{moreLines}}",
     "moreLines": "",
-    "defaultHint": ""
+    "defaultHint": "Toot longo"
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pt_BR/components/timeline.json b/src/i18n/pt_BR/components/timeline.json
index 0cd1894e..44b25dd0 100644
--- a/src/i18n/pt_BR/components/timeline.json
+++ b/src/i18n/pt_BR/components/timeline.json
@@ -42,9 +42,9 @@
         "accessibilityLabel": "Boost este toot",
         "function": "Boost toot",
         "options": {
-          "title": "",
-          "public": "",
-          "unlisted": ""
+          "title": "Escolha a visibilidade do boost",
+          "public": "Boost público",
+          "unlisted": "Boost não-listado"
         }
       },
       "favourited": {
@@ -83,7 +83,7 @@
         "text": "Erro ao carregar",
         "button": "Experimente o link remoto"
       },
-      "altText": ""
+      "altText": "Texto Alternativo"
     },
     "avatar": {
       "accessibilityLabel": "Avatar de {{name}}",
@@ -93,10 +93,10 @@
       "expandHint": "Conteúdo oculto"
     },
     "filtered": {
-      "reveal": "",
-      "match_v1": "",
-      "match_v2_one": "",
-      "match_v2_other": ""
+      "reveal": "Exibir mesmo assim",
+      "match_v1": "Filtrado: {{phrase}}.",
+      "match_v2_one": "Filtrado por {{filters}}.",
+      "match_v2_other": "Filtrado por {{count}} filtros, {{filters}}."
     },
     "fullConversation": "Ler conversas",
     "translate": {
@@ -123,7 +123,7 @@
         "muted": {
           "accessibilityLabel": "Toot silenciado"
         },
-        "replies": "",
+        "replies": "Respostas <0 />",
         "visibility": {
           "direct": {
             "accessibilityLabel": "Enviar uma mensagem direta"
diff --git a/src/i18n/pt_BR/screens/compose.json b/src/i18n/pt_BR/screens/compose.json
index 53949837..e0f75c7a 100644
--- a/src/i18n/pt_BR/screens/compose.json
+++ b/src/i18n/pt_BR/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Descrever mídia para deficientes visuais",
           "placeholder": "Você pode adicionar uma descrição, às vezes chamada texto alternativo aos seus meios de comunicação social, assim eles estão acessíveis a ainda mais pessoas, incluindo as que são cegos ou deficientes visuais.\n\nAs boas descrições são concisas, mas apresentam o que está em sua mídia com precisão o suficiente para entender seu contexto."
-        },
-        "imageFocus": "Arraste o círculo de foco para atualizar o ponto de foco"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/pt_BR/screens/tabs.json b/src/i18n/pt_BR/screens/tabs.json
index 8a885df2..bb7bb0be 100644
--- a/src/i18n/pt_BR/screens/tabs.json
+++ b/src/i18n/pt_BR/screens/tabs.json
@@ -3,15 +3,15 @@
     "local": {
       "name": "Seguindo",
       "options": {
-        "showBoosts": "",
-        "showReplies": ""
+        "showBoosts": "Mostrar boosts",
+        "showReplies": "Mostrar respostas"
       }
     },
     "public": {
       "segments": {
         "federated": "Global",
         "local": "Local",
-        "trending": ""
+        "trending": "Em alta"
       }
     },
     "notifications": {
@@ -28,7 +28,7 @@
     "filters": {
       "accessibilityLabel": "Filtro",
       "accessibilityHint": "Filtrar notificações por tipos",
-      "title": ""
+      "title": "Mostrar notificações"
     }
   },
   "me": {
@@ -43,7 +43,7 @@
         "name": "Favoritos"
       },
       "followedTags": {
-        "name": ""
+        "name": "Hashtags seguidas"
       },
       "fontSize": {
         "name": "Tamanho da fonte do Toot"
@@ -55,10 +55,10 @@
         "name": "Lista: {{list}}"
       },
       "listAccounts": {
-        "name": ""
+        "name": "Usuários na lista: {{list}}"
       },
       "listAdd": {
-        "name": ""
+        "name": "Criar uma lista"
       },
       "listEdit": {
         "name": ""
@@ -69,6 +69,18 @@
       "push": {
         "name": "Notificação"
       },
+      "preferences": {
+        "name": "Preferências"
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": "Criar um Filtro"
+      },
+      "preferencesFilterEdit": {
+        "name": "Editar Filtro"
+      },
       "profile": {
         "name": "Editar Perfil"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Configurações do Aplicativo"
       },
-      "webSettings": {
-        "name": "Mais configurações"
-      },
       "switch": {
         "name": "Alterar Conta"
       }
@@ -102,29 +111,108 @@
       }
     },
     "listAccounts": {
-      "heading": "",
-      "error": "",
-      "empty": ""
+      "heading": "Gerenciar usuários",
+      "error": "Excluir usuário da lista",
+      "empty": "Nenhum usuário adicionado a esta lista"
     },
     "listEdit": {
       "heading": "",
-      "title": "",
+      "title": "Título",
       "repliesPolicy": {
-        "heading": "",
+        "heading": "Mostrar respostas para:",
         "options": {
-          "none": "",
-          "list": "",
-          "followed": ""
+          "none": "Ninguém",
+          "list": "Membros da lista",
+          "followed": "Qualquer usuário seguido"
         }
       }
     },
     "listDelete": {
-      "heading": "",
+      "heading": "Excluir lista",
       "confirm": {
-        "title": "",
-        "message": ""
+        "title": "Excluir lista \"{{list}}\"?",
+        "message": "Esta ação não é reversível."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Visibilidade padrão de postagem",
+        "options": {
+          "public": "Público",
+          "unlisted": "Não-listado",
+          "private": "Apenas seguidores"
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "Ocultar mídia marcada como sensível",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": "Expandir automaticamente toots com Aviso de Conteúdo"
+      },
+      "autoplay_gifs": {
+        "title": "Reproduzir GIF automaticamente nos toots"
+      },
+      "filters": {
+        "title": "Filtros de conteúdo",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "Nome",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "Nunca",
+        "1800": "Após 30 minutos",
+        "3600": "Após 1 hora",
+        "43200": "Após 12 horas",
+        "86400": "Após 1 dia",
+        "604800": "Após 1 semana",
+        "18144000": "Após 1 mês"
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} atualizado",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} campo",
           "total_other": "{{count}} campos"
         },
-        "visibility": {
-          "title": "Visibilidade da Postagem",
-          "options": {
-            "public": "Público",
-            "unlisted": "Não listado",
-            "private": "Apenas seguidores"
-          }
-        },
-        "sensitive": {
-          "title": "Publicação de Mídia Sensiva"
-        },
         "lock": {
           "title": "Trancar conta",
           "description": "Requer que você aprove manualmente seguidores"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>\"s mídia</1>"
     },
-    "hashtag": {
-      "follow": "Seguir",
-      "unfollow": "Deixar de seguir"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Histórico de Edição"
diff --git a/src/i18n/ru/components/contextMenu.json b/src/i18n/ru/components/contextMenu.json
index 19cd5f9e..6306d3a7 100644
--- a/src/i18n/ru/components/contextMenu.json
+++ b/src/i18n/ru/components/contextMenu.json
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": ""
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "",
       "action_true": ""
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/ru/screens/compose.json b/src/i18n/ru/screens/compose.json
index 1d188b30..678cf8ec 100644
--- a/src/i18n/ru/screens/compose.json
+++ b/src/i18n/ru/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "",
           "placeholder": ""
-        },
-        "imageFocus": ""
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/ru/screens/tabs.json b/src/i18n/ru/screens/tabs.json
index 9e11e10a..79a462e8 100644
--- a/src/i18n/ru/screens/tabs.json
+++ b/src/i18n/ru/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": ""
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": ""
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": ""
       },
-      "webSettings": {
-        "name": ""
-      },
       "switch": {
         "name": ""
       }
@@ -125,6 +134,85 @@
         "message": ""
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "",
@@ -150,17 +238,6 @@
           "total_one": "",
           "total_other": ""
         },
-        "visibility": {
-          "title": "",
-          "options": {
-            "public": "",
-            "unlisted": "",
-            "private": ""
-          }
-        },
-        "sensitive": {
-          "title": ""
-        },
         "lock": {
           "title": "",
           "description": ""
@@ -322,9 +399,9 @@
     "attachments": {
       "name": ""
     },
-    "hashtag": {
-      "follow": "",
-      "unfollow": ""
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": ""
diff --git a/src/i18n/sv/components/contextMenu.json b/src/i18n/sv/components/contextMenu.json
index 588e2ca4..e6b6033b 100644
--- a/src/i18n/sv/components/contextMenu.json
+++ b/src/i18n/sv/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Följ användare",
       "action_true": "Avfölj användaren"
     },
-    "inLists": "Listor som innehåller användaren",
+    "inLists": "",
     "showBoosts": {
       "action_false": "Visa användarens boostar",
       "action_true": "Göm användarens boostar"
@@ -17,9 +17,9 @@
     },
     "followAs": {
       "trigger": "",
-      "succeed_default": "",
-      "succeed_locked": "",
-      "failed": ""
+      "succeed_default": "Följer nu @{{target}} med @{{source}}",
+      "succeed_locked": "Följförfrågan skickades till @{{target}} med {{source}}, väntar på godkännande",
+      "failed": "Följ som"
     },
     "blockReport": "",
     "block": {
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Dela inlägg"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Fäst inlägg",
       "action_true": "Avfäst inlägg"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/sv/screens/compose.json b/src/i18n/sv/screens/compose.json
index 9f840f0f..6c26abb1 100644
--- a/src/i18n/sv/screens/compose.json
+++ b/src/i18n/sv/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Beskriv media för synskadade",
           "placeholder": "Du kan lägga till en beskrivning, som ibland kallas alternativtext, till dina medier så att de är tillgängliga för ännu fler, inklusive dem som är blinda eller synskadade.\n\nBra beskrivningar är kortfattade men presenterar vad som finns i dina medier tillräckligt noggrant för att beskriva deras sammanhang."
-        },
-        "imageFocus": "Dra i fokuscirkeln för att uppdatera fokuspunkten"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/sv/screens/tabs.json b/src/i18n/sv/screens/tabs.json
index dc9529d9..e2b2c285 100644
--- a/src/i18n/sv/screens/tabs.json
+++ b/src/i18n/sv/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Pushnotiser"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "Redigera profil"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Appinställningar"
       },
-      "webSettings": {
-        "name": "Fler kontoinställningar"
-      },
       "switch": {
         "name": "Byt konto"
       }
@@ -125,6 +134,85 @@
         "message": "Denna åtgärd kan inte ångras."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} uppdaterades",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} fält",
           "total_other": "{{count}} fält"
         },
-        "visibility": {
-          "title": "Inläggssynlighet",
-          "options": {
-            "public": "Offentlig",
-            "unlisted": "Olistad",
-            "private": "Endast följare"
-          }
-        },
-        "sensitive": {
-          "title": "Publicerar känslig media"
-        },
         "lock": {
           "title": "Lås konto",
           "description": "Kräver att du godkänner följare manuellt"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>s media</1>"
     },
-    "hashtag": {
-      "follow": "Följ",
-      "unfollow": "Sluta följ"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Redigeringshistorik"
@@ -374,7 +451,7 @@
         "statuses": "Inlägg"
       },
       "notFound": "Kan inte hitta <bold>{{searchTerm}}</bold>-relaterade {{type}}",
-      "noResult": ""
+      "noResult": "Kan inte hitta något, försök med en annan sökning"
     },
     "toot": {
       "name": "Diskussioner",
diff --git a/src/i18n/uk/components/contextMenu.json b/src/i18n/uk/components/contextMenu.json
index d56fd2df..8658de70 100644
--- a/src/i18n/uk/components/contextMenu.json
+++ b/src/i18n/uk/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Підписатися на користувача",
       "action_true": "Відписатися від користувача"
     },
-    "inLists": "Списки, в яких є користувач",
+    "inLists": "Списки, в яких є користувач ...",
     "showBoosts": {
       "action_false": "Показати передмухи користувача",
       "action_true": "Приховати передмухи користувача"
@@ -16,12 +16,12 @@
       "action_true": "Зняти заглушення з користувача"
     },
     "followAs": {
-      "trigger": "Стежити як...",
+      "trigger": "Стежити як ...",
       "succeed_default": "Тепер ви стежите за @{{target}} з @{{source}}",
       "succeed_locked": "Запит на стеження за @{{target}} з {{source}} надіслано, очікується затвердження",
       "failed": "Стежити як"
     },
-    "blockReport": "Заблокувати й поскаржитися...",
+    "blockReport": "Заблокувати й поскаржитися",
     "block": {
       "action_false": "Заблокувати користувача",
       "action_true": "Розблокувати користувача",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "Підписатися",
+      "action_true": "Відписатися"
+    },
+    "filter": {
+      "action": "Фільтрувати хештеґ ..."
+    }
+  },
   "share": {
     "status": {
       "action": "Поділитися дмухом"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Прикріпити дмух",
       "action_true": "Відкріпити дмух"
+    },
+    "filter": {
+      "action_false": "Фільтрувати дмух ...",
+      "action_true": "Керувати фільтрами ..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/uk/screens/compose.json b/src/i18n/uk/screens/compose.json
index 123ad846..4412b21e 100644
--- a/src/i18n/uk/screens/compose.json
+++ b/src/i18n/uk/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Охарактеризуйте медіа для людей з вадами зору",
           "placeholder": "Ви можете додавати опис, іноді так званий alt-текст, вашим медіа, таким чином, вони доступні ще більшій кількості людей, включаючи тих, хто сліпий, чи має проблеми з зором.\n\nХороші описи - це лаконічно, але представте що є у ваших медіа досить точним, щоб зрозуміти їх контекст."
-        },
-        "imageFocus": "Перетягніть круг для оновлення точки фокусу"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/uk/screens/tabs.json b/src/i18n/uk/screens/tabs.json
index 6f7c1906..4ebe4e0d 100644
--- a/src/i18n/uk/screens/tabs.json
+++ b/src/i18n/uk/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Push-сповіщення"
       },
+      "preferences": {
+        "name": "Параметри"
+      },
+      "preferencesFilters": {
+        "name": "Усі фільтри вмісту"
+      },
+      "preferencesFilterAdd": {
+        "name": "Створити фільтр"
+      },
+      "preferencesFilterEdit": {
+        "name": "Змінити фільтр"
+      },
       "profile": {
         "name": "Редагувати профіль"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Налаштування застосунку"
       },
-      "webSettings": {
-        "name": "Додаткові налаштування акаунта"
-      },
       "switch": {
         "name": "Переключити аккаунт"
       }
@@ -125,6 +134,85 @@
         "message": "Цю дію не можна скасувати."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "Типова видимість дописів",
+        "options": {
+          "public": "Загальнодоступні",
+          "unlisted": "Приватні",
+          "private": "Лише для підписників"
+        }
+      },
+      "sensitive": {
+        "title": "Типово позначити медіа делікатними"
+      },
+      "media": {
+        "title": "Показ медіа",
+        "options": {
+          "default": "Приховувати медіа, позначені делікатними",
+          "show_all": "Завжди показувати медіа",
+          "hide_all": "Завжди приховувати медіа"
+        }
+      },
+      "spoilers": {
+        "title": "Автоматично розгортати дмухи із попередженням про вміст"
+      },
+      "autoplay_gifs": {
+        "title": "Автовідтворення GIF у дмухах"
+      },
+      "filters": {
+        "title": "Фільтри вмісту",
+        "content": "{{count}} активний"
+      },
+      "web_only": {
+        "title": "Оновити налаштування",
+        "description": "Налаштування можна оновити лише за допомогою вебінтерфейсу"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "Термін дії минув",
+      "keywords_one": "{{count}} ключове слово",
+      "keywords_other": "{{count}} ключових слів",
+      "statuses_one": "{{count}} дмух",
+      "statuses_other": "{{count}} дмухів",
+      "context": "Застосовується в <0 />",
+      "contexts": {
+        "home": "підписки й списки",
+        "notifications": "сповіщення",
+        "public": "федеративні",
+        "thread": "розмова",
+        "account": "профіль"
+      }
+    },
+    "preferencesFilter": {
+      "name": "Ім’я",
+      "expiration": "Закінчується",
+      "expirationOptions": {
+        "0": "Ніколи",
+        "1800": "За 30 хвилин",
+        "3600": "За 1 годину",
+        "43200": "За 12 годин",
+        "86400": "За 1 день",
+        "604800": "За 1 тиждень",
+        "18144000": "За 1 місяць"
+      },
+      "context": "Застосовується в",
+      "contexts": {
+        "home": "Підписки та списки",
+        "notifications": "Сповіщення",
+        "public": "Федеративна стрічка",
+        "thread": "Перегляд бесід",
+        "account": "Перегляд профілю"
+      },
+      "action": "За збігу",
+      "actions": {
+        "warn": "Згорнуто, але можна виявити",
+        "hide": "Приховано повністю"
+      },
+      "keywords": "Збіг із цими ключовими словами",
+      "keyword": "Ключове слово",
+      "statuses": "Збігається з цими дмухами"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} оновлено",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} поле",
           "total_other": "{{count}} полей"
         },
-        "visibility": {
-          "title": "Видимість дмухів",
-          "options": {
-            "public": "Публічний",
-            "unlisted": "Приватний",
-            "private": "Тільки для підписників"
-          }
-        },
-        "sensitive": {
-          "title": "Розміщення чутливої інформації"
-        },
         "lock": {
           "title": "Закрити акаунт",
           "description": "Потребує вас вручну затвердити підписників"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1> медіа</1>"
     },
-    "hashtag": {
-      "follow": "Підписатися",
-      "unfollow": "Відписатися"
+    "filter": {
+      "name": "Додати фільтр",
+      "existed": "Існує в цих фільтрах"
     },
     "history": {
       "name": "Редагувати історію"
diff --git a/src/i18n/vi/components/contextMenu.json b/src/i18n/vi/components/contextMenu.json
index a2ba82ef..e50ec09d 100644
--- a/src/i18n/vi/components/contextMenu.json
+++ b/src/i18n/vi/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "Theo dõi người này",
       "action_true": "Ngưng theo dõi người này"
     },
-    "inLists": "Danh sách người",
+    "inLists": "",
     "showBoosts": {
       "action_false": "Hiển lượt đăng lại",
       "action_true": "Ẩn lượt đăng lại"
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "",
+      "action_true": ""
+    },
+    "filter": {
+      "action": ""
+    }
+  },
   "share": {
     "status": {
       "action": "Đăng lại"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "Tút ghim",
       "action_true": "Bỏ ghim tút"
+    },
+    "filter": {
+      "action_false": "",
+      "action_true": ""
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/vi/screens/compose.json b/src/i18n/vi/screens/compose.json
index 5b6b6e79..96548839 100644
--- a/src/i18n/vi/screens/compose.json
+++ b/src/i18n/vi/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "Mô tả cho người khiếm thị",
           "placeholder": "Bạn có thể thêm mô tả hay còn gọi là văn bản thay thế cho media, để những người mù hoặc khiếm thị có thể tiếp cận dễ dàng hơn.\n\nBạn có thể giới thiệu tóm tắt hoặc mô tả bối cảnh của nội dung media mà bạn sắp tải lên."
-        },
-        "imageFocus": "Kéo thả vòng tròn để chọn phần hiển thị trên hình thu nhỏ"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/vi/screens/tabs.json b/src/i18n/vi/screens/tabs.json
index c2e0c9da..6f7e029f 100644
--- a/src/i18n/vi/screens/tabs.json
+++ b/src/i18n/vi/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "Thông báo đẩy"
       },
+      "preferences": {
+        "name": ""
+      },
+      "preferencesFilters": {
+        "name": ""
+      },
+      "preferencesFilterAdd": {
+        "name": ""
+      },
+      "preferencesFilterEdit": {
+        "name": ""
+      },
       "profile": {
         "name": "Sửa hồ sơ"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "Thiết lập"
       },
-      "webSettings": {
-        "name": "Nâng cao"
-      },
       "switch": {
         "name": "Chuyển đổi tài khoản"
       }
@@ -125,6 +134,85 @@
         "message": "Hành phục này không thể khôi phục được."
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "",
+        "options": {
+          "public": "",
+          "unlisted": "",
+          "private": ""
+        }
+      },
+      "sensitive": {
+        "title": ""
+      },
+      "media": {
+        "title": "",
+        "options": {
+          "default": "",
+          "show_all": "",
+          "hide_all": ""
+        }
+      },
+      "spoilers": {
+        "title": ""
+      },
+      "autoplay_gifs": {
+        "title": ""
+      },
+      "filters": {
+        "title": "",
+        "content": ""
+      },
+      "web_only": {
+        "title": "",
+        "description": ""
+      }
+    },
+    "preferencesFilters": {
+      "expired": "",
+      "keywords_one": "",
+      "keywords_other": "",
+      "statuses_one": "",
+      "statuses_other": "",
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      }
+    },
+    "preferencesFilter": {
+      "name": "",
+      "expiration": "",
+      "expirationOptions": {
+        "0": "",
+        "1800": "",
+        "3600": "",
+        "43200": "",
+        "86400": "",
+        "604800": "",
+        "18144000": ""
+      },
+      "context": "",
+      "contexts": {
+        "home": "",
+        "notifications": "",
+        "public": "",
+        "thread": "",
+        "account": ""
+      },
+      "action": "",
+      "actions": {
+        "warn": "",
+        "hide": ""
+      },
+      "keywords": "",
+      "keyword": "",
+      "statuses": ""
+    },
     "profile": {
       "feedback": {
         "succeed": "Đã cập nhật {{type}}",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} mục",
           "total_other": "{{count}} mục"
         },
-        "visibility": {
-          "title": "Kiểu tút mặc định",
-          "options": {
-            "public": "Công khai",
-            "unlisted": "Hạn chế",
-            "private": "Riêng tư"
-          }
-        },
-        "sensitive": {
-          "title": "Đây là tài khoản NSFW"
-        },
         "lock": {
           "title": "Đây là tài khoản riêng tư",
           "description": "Tự bạn sẽ phê duyệt người theo dõi"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>'s media</1>"
     },
-    "hashtag": {
-      "follow": "Theo dõi",
-      "unfollow": "Ngưng theo dõi"
+    "filter": {
+      "name": "",
+      "existed": ""
     },
     "history": {
       "name": "Lịch sử chỉnh sửa"
diff --git a/src/i18n/zh-Hans/components/contextMenu.json b/src/i18n/zh-Hans/components/contextMenu.json
index 7a75c3d9..80c83a48 100644
--- a/src/i18n/zh-Hans/components/contextMenu.json
+++ b/src/i18n/zh-Hans/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "关注用户",
       "action_true": "取消关注用户"
     },
-    "inLists": "包含用户的列表",
+    "inLists": "包含用户的列表 …",
     "showBoosts": {
       "action_false": "显示用户的转嘟",
       "action_true": "隐藏用户的转嘟"
@@ -16,12 +16,12 @@
       "action_true": "取消静音用户"
     },
     "followAs": {
-      "trigger": "关注…",
+      "trigger": "用其它账户关注 …",
       "succeed_default": "@{{source}} 正在关注 @{{target}}",
       "succeed_locked": "已从 @{{source}} 发送关注请求至 @{{target}}，等待通过",
       "failed": "用其它账户关注"
     },
-    "blockReport": "屏蔽与举报…",
+    "blockReport": "屏蔽与举报",
     "block": {
       "action_false": "屏蔽用户",
       "action_true": "取消屏蔽用户",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "关注",
+      "action_true": "取消关注"
+    },
+    "filter": {
+      "action": "过滤话题标签 …"
+    }
+  },
   "share": {
     "status": {
       "action": "分享嘟文"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "置顶嘟文",
       "action_true": "取消置顶嘟文"
+    },
+    "filter": {
+      "action_false": "过滤此嘟文 …",
+      "action_true": "管理过滤器 …"
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hans/screens/compose.json b/src/i18n/zh-Hans/screens/compose.json
index 4e7df734..87d60e0c 100644
--- a/src/i18n/zh-Hans/screens/compose.json
+++ b/src/i18n/zh-Hans/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "为附件添加文字说明",
           "placeholder": "你可以为附件添加文字说明，以便更多人可以查看他们（包括视力障碍或视力受损人士）。\n\n优质的描述应该简洁明了，但要准确地描述照片中的内容，以便用户理解其含义。"
-        },
-        "imageFocus": "在预览图上拖动圆圈，以选择缩略图的焦点"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/zh-Hans/screens/tabs.json b/src/i18n/zh-Hans/screens/tabs.json
index c7e6e9f8..a2015648 100644
--- a/src/i18n/zh-Hans/screens/tabs.json
+++ b/src/i18n/zh-Hans/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "推送通知"
       },
+      "preferences": {
+        "name": "首选项"
+      },
+      "preferencesFilters": {
+        "name": "所有内容过滤器"
+      },
+      "preferencesFilterAdd": {
+        "name": "创建过滤器"
+      },
+      "preferencesFilterEdit": {
+        "name": "编辑过滤器"
+      },
       "profile": {
         "name": "修改个人资料"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "应用设置"
       },
-      "webSettings": {
-        "name": "更多账户设置"
-      },
       "switch": {
         "name": "切换账号"
       }
@@ -125,6 +134,85 @@
         "message": "此操作不可恢复。"
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "默认发嘟可见性",
+        "options": {
+          "public": "公开",
+          "unlisted": "不公开",
+          "private": "仅关注者"
+        }
+      },
+      "sensitive": {
+        "title": "默认标记媒体为敏感内容"
+      },
+      "media": {
+        "title": "媒体显示",
+        "options": {
+          "default": "隐藏被标记为敏感的媒体",
+          "show_all": "总是显示所有媒体",
+          "hide_all": "总是隐藏所有媒体"
+        }
+      },
+      "spoilers": {
+        "title": "自动展开带内容警告的嘟文"
+      },
+      "autoplay_gifs": {
+        "title": "嘟文中自动播放GIF"
+      },
+      "filters": {
+        "title": "内容过滤器",
+        "content": "{{count}} 生效中"
+      },
+      "web_only": {
+        "title": "更新设置",
+        "description": "以下的设置仅可通过网页更新"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "已过期",
+      "keywords_one": "{{count}} 关键词",
+      "keywords_other": "{{count}} 关键词",
+      "statuses_one": "{{count}} 条嘟文",
+      "statuses_other": "{{count}} 条嘟文",
+      "context": "应用于<0 />",
+      "contexts": {
+        "home": "关注和列表",
+        "notifications": "通知",
+        "public": "跨站时间轴",
+        "thread": "对话",
+        "account": "个人资料"
+      }
+    },
+    "preferencesFilter": {
+      "name": "名称",
+      "expiration": "过期于",
+      "expirationOptions": {
+        "0": "从不",
+        "1800": "30分钟后",
+        "3600": "1小时后",
+        "43200": "12小时后",
+        "86400": "1天后",
+        "604800": "1周后",
+        "18144000": "1个月后"
+      },
+      "context": "应用于",
+      "contexts": {
+        "home": "关注和列表",
+        "notifications": "通知",
+        "public": "跨站时间轴",
+        "thread": "对话页面",
+        "account": "个人资料页面"
+      },
+      "action": "当匹配时",
+      "actions": {
+        "warn": "仅折叠，但可点击显示",
+        "hide": "完全隐藏"
+      },
+      "keywords": "匹配这些关键字",
+      "keyword": "关键字",
+      "statuses": "匹配这些嘟文"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}}已更新",
@@ -150,17 +238,6 @@
           "total_one": "{{count}}项",
           "total_other": "{{count}}项"
         },
-        "visibility": {
-          "title": "嘟文默认可见范围",
-          "options": {
-            "public": "公开",
-            "unlisted": "不公开",
-            "private": "仅关注者"
-          }
-        },
-        "sensitive": {
-          "title": "媒体默认设为敏感"
-        },
         "lock": {
           "title": "锁嘟",
           "description": "你需要手动审核所有关注请求"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>的媒体</1>"
     },
-    "hashtag": {
-      "follow": "关注",
-      "unfollow": "取消关注"
+    "filter": {
+      "name": "添加至过滤器",
+      "existed": "已被过滤"
     },
     "history": {
       "name": "编辑历史"
diff --git a/src/i18n/zh-Hant/components/contextMenu.json b/src/i18n/zh-Hant/components/contextMenu.json
index 2b107c69..d38546d0 100644
--- a/src/i18n/zh-Hant/components/contextMenu.json
+++ b/src/i18n/zh-Hant/components/contextMenu.json
@@ -6,7 +6,7 @@
       "action_false": "跟隨使用者",
       "action_true": "取消跟隨使用者"
     },
-    "inLists": "包含使用者的列表",
+    "inLists": "包含使用者的列表 ...",
     "showBoosts": {
       "action_false": "顯示使用者的轉嘟",
       "action_true": "隱藏使用者的轉嘟"
@@ -16,12 +16,12 @@
       "action_true": "解除靜音使用者"
     },
     "followAs": {
-      "trigger": "跟隨...",
+      "trigger": "用其它帳號跟隨 ...",
       "succeed_default": "@{{source}} 正在跟隨 @{{target}}",
       "succeed_locked": "已從 {{source}} 發送跟隨請求至 @{{target}}，等待同意",
       "failed": "用其它帳號跟隨"
     },
-    "blockReport": "封鎖並檢舉…",
+    "blockReport": "封鎖並檢舉",
     "block": {
       "action_false": "封鎖使用者",
       "action_true": "解除封鎖使用者",
@@ -54,6 +54,15 @@
       }
     }
   },
+  "hashtag": {
+    "follow": {
+      "action_false": "跟隨",
+      "action_true": "取消跟隨"
+    },
+    "filter": {
+      "action": "過濾主題標籤 ..."
+    }
+  },
   "share": {
     "status": {
       "action": "分享嘟文"
@@ -88,6 +97,10 @@
     "pin": {
       "action_false": "釘選嘟文",
       "action_true": "取消釘選嘟文"
+    },
+    "filter": {
+      "action_false": "過濾嘟文 ...",
+      "action_true": "管理過濾器 ..."
     }
   }
 }
\ No newline at end of file
diff --git a/src/i18n/zh-Hant/screens/compose.json b/src/i18n/zh-Hant/screens/compose.json
index 899b92a6..25eb1327 100644
--- a/src/i18n/zh-Hant/screens/compose.json
+++ b/src/i18n/zh-Hant/screens/compose.json
@@ -153,8 +153,7 @@
         "altText": {
           "heading": "為附件增加文字說明",
           "placeholder": "你可以為附件增加文字說明，以便更多人可以查看他們（包括視力障礙或視力受損人士）。\n\n優質的描述應該簡潔明瞭，但要準確地描述照片中的內容，以便使用者理解其含義。"
-        },
-        "imageFocus": "在預覽圖上拖動圓圈，以選擇縮略圖的焦點"
+        }
       }
     },
     "draftsList": {
diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json
index 8f992b34..991362e2 100644
--- a/src/i18n/zh-Hant/screens/tabs.json
+++ b/src/i18n/zh-Hant/screens/tabs.json
@@ -69,6 +69,18 @@
       "push": {
         "name": "推播通知"
       },
+      "preferences": {
+        "name": "偏好設定"
+      },
+      "preferencesFilters": {
+        "name": "所有內容過濾器"
+      },
+      "preferencesFilterAdd": {
+        "name": "建立過濾器"
+      },
+      "preferencesFilterEdit": {
+        "name": "編輯過濾器"
+      },
       "profile": {
         "name": "編輯個人檔案"
       },
@@ -84,9 +96,6 @@
       "settings": {
         "name": "App 設定"
       },
-      "webSettings": {
-        "name": "更多帳號設定"
-      },
       "switch": {
         "name": "切換帳號"
       }
@@ -125,6 +134,85 @@
         "message": "此操作無法還原。"
       }
     },
+    "preferences": {
+      "visibility": {
+        "title": "預設發嘟範圍",
+        "options": {
+          "public": "公開",
+          "unlisted": "不公開",
+          "private": "僅限跟隨者"
+        }
+      },
+      "sensitive": {
+        "title": "預設標記媒體為敏感內容"
+      },
+      "media": {
+        "title": "媒體顯示",
+        "options": {
+          "default": "隱藏被標記為敏感內容的媒體",
+          "show_all": "總是顯示媒體",
+          "hide_all": "總是隱藏媒體"
+        }
+      },
+      "spoilers": {
+        "title": "自動展開含有警告訊息的嘟文"
+      },
+      "autoplay_gifs": {
+        "title": "在嘟文中自動播放 GIF"
+      },
+      "filters": {
+        "title": "內容過濾器",
+        "content": "{{count}} 生效中"
+      },
+      "web_only": {
+        "title": "更新設定",
+        "description": "以下的設定只能通過網頁更新"
+      }
+    },
+    "preferencesFilters": {
+      "expired": "已過期",
+      "keywords_one": "{{count}} 關鍵字",
+      "keywords_other": "{{count}} 關鍵字",
+      "statuses_one": "{{count}} 條嘟文",
+      "statuses_other": "{{count}} 條嘟文",
+      "context": "使用於 <0 />",
+      "contexts": {
+        "home": "跟隨和列表",
+        "notifications": "通知",
+        "public": "聯邦",
+        "thread": "對話",
+        "account": "個人資料"
+      }
+    },
+    "preferencesFilter": {
+      "name": "名稱",
+      "expiration": "截止於",
+      "expirationOptions": {
+        "0": "從不",
+        "1800": "30 分鐘後",
+        "3600": "1 小時後",
+        "43200": "12 小時後",
+        "86400": "1 天後",
+        "604800": "1 週後",
+        "18144000": "1 個月後"
+      },
+      "context": "使用於",
+      "contexts": {
+        "home": "跟隨和列表",
+        "notifications": "通知",
+        "public": "聯邦時間軸",
+        "thread": "對話頁面",
+        "account": "個人資料頁面"
+      },
+      "action": "當符合時",
+      "actions": {
+        "warn": "僅折疊，但可點擊顯示",
+        "hide": "完全隱藏"
+      },
+      "keywords": "符合這些關鍵字",
+      "keyword": "關鍵字",
+      "statuses": "符合這些嘟文"
+    },
     "profile": {
       "feedback": {
         "succeed": "{{type}} 已更新",
@@ -150,17 +238,6 @@
           "total_one": "{{count}} 項",
           "total_other": "{{count}} 項"
         },
-        "visibility": {
-          "title": "嘟文預設公開範圍",
-          "options": {
-            "public": "公開",
-            "unlisted": "不公開",
-            "private": "僅限跟隨者"
-          }
-        },
-        "sensitive": {
-          "title": "媒體預設標為敏感"
-        },
         "lock": {
           "title": "鎖定帳號",
           "description": "需要您手動批准跟隨請求"
@@ -322,9 +399,9 @@
     "attachments": {
       "name": "<0 /><1>的媒體</1>"
     },
-    "hashtag": {
-      "follow": "跟隨",
-      "unfollow": "取消跟隨"
+    "filter": {
+      "name": "新增至過濾器",
+      "existed": "已被過濾"
     },
     "history": {
       "name": "編輯歷史"
diff --git a/src/screens/Compose/DraftsList.tsx b/src/screens/Compose/DraftsList.tsx
index b515b0d9..f00144e1 100644
--- a/src/screens/Compose/DraftsList.tsx
+++ b/src/screens/Compose/DraftsList.tsx
@@ -1,6 +1,6 @@
 import { HeaderLeft } from '@components/Header'
 import Icon from '@components/Icon'
-import ComponentSeparator from '@components/Separator'
+import { SwipeToActions } from '@components/SwipeToActions'
 import CustomText from '@components/Text'
 import HeaderSharedCreated from '@components/Timeline/Shared/HeaderShared/Created'
 import apiInstance from '@utils/api/instance'
@@ -10,10 +10,8 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Dimensions, Modal, Platform, Pressable, View } from 'react-native'
+import { Dimensions, Modal, Pressable, View } from 'react-native'
 import FastImage from 'react-native-fast-image'
-import { PanGestureHandler } from 'react-native-gesture-handler'
-import { SwipeListView } from 'react-native-swipe-list-view'
 import ComposeContext from './utils/createContext'
 import { formatText } from './utils/processText'
 import { ComposeStateDraft, ExtendedAttachment } from './utils/types'
@@ -39,9 +37,7 @@ const ComposeDraftsList: React.FC<ScreenComposeStackScreenProps<'Screen-Compose-
   useEffect(() => {
     navigation.setOptions({
       title: t('content.draftsList.header.title'),
-      headerLeft: () => (
-        <HeaderLeft type='icon' content='ChevronDown' onPress={() => navigation.goBack()} />
-      )
+      headerLeft: () => <HeaderLeft content='chevron-down' onPress={() => navigation.goBack()} />
     })
   }, [])
 
@@ -49,8 +45,6 @@ const ComposeDraftsList: React.FC<ScreenComposeStackScreenProps<'Screen-Compose-
   const [drafts] = useAccountStorage.object('drafts')
   const [checkingAttachments, setCheckingAttachments] = useState(false)
 
-  const actionWidth = StyleConstants.Font.Size.L + StyleConstants.Spacing.Global.PagePadding * 4
-
   return (
     <>
       <View
@@ -61,11 +55,12 @@ const ComposeDraftsList: React.FC<ScreenComposeStackScreenProps<'Screen-Compose-
           padding: StyleConstants.Spacing.S,
           borderColor: colors.border,
           borderWidth: 1,
-          borderRadius: StyleConstants.Spacing.S
+          borderRadius: StyleConstants.Spacing.S,
+          marginBottom: StyleConstants.Spacing.S
         }}
       >
         <Icon
-          name='AlertTriangle'
+          name='alert-triangle'
           color={colors.secondary}
           size={StyleConstants.Font.Size.M}
           style={{ marginRight: StyleConstants.Spacing.S }}
@@ -74,135 +69,104 @@ const ComposeDraftsList: React.FC<ScreenComposeStackScreenProps<'Screen-Compose-
           {t('content.draftsList.warning')}
         </CustomText>
       </View>
-      <PanGestureHandler enabled={Platform.OS === 'ios'}>
-        <SwipeListView
-          data={drafts.filter(draft => draft.timestamp !== timestamp)}
-          renderItem={({ item }: { item: ComposeStateDraft }) => {
-            return (
-              <Pressable
-                accessibilityHint={t('content.draftsList.content.accessibilityHint')}
-                style={{
-                  flex: 1,
-                  padding: StyleConstants.Spacing.Global.PagePadding,
-                  backgroundColor: colors.backgroundDefault
-                }}
-                onPress={async () => {
-                  setCheckingAttachments(true)
-                  let tempDraft = item
-                  let tempUploads: ExtendedAttachment[] = []
-                  if (item.attachments && item.attachments.uploads.length) {
-                    for (const attachment of item.attachments.uploads) {
-                      await apiInstance<Mastodon.Attachment>({
-                        method: 'get',
-                        url: `media/${attachment.remote?.id}`
-                      })
-                        .then(res => {
-                          if (res.body.id === attachment.remote?.id) {
-                            tempUploads.push(attachment)
-                          }
-                        })
-                        .catch(() => {})
-                    }
-                    tempDraft = {
-                      ...tempDraft,
-                      attachments: { ...item.attachments, uploads: tempUploads }
-                    }
-                  }
-
-                  tempDraft.spoiler?.length &&
-                    formatText({ textInput: 'text', composeDispatch, content: tempDraft.spoiler })
-                  tempDraft.text?.length &&
-                    formatText({ textInput: 'text', composeDispatch, content: tempDraft.text })
-                  composeDispatch({
-                    type: 'loadDraft',
-                    payload: tempDraft
-                  })
-                  removeDraft(item.timestamp)
-                  navigation.goBack()
-                }}
-              >
-                <View style={{ flex: 1 }}>
-                  <HeaderSharedCreated created_at={item.timestamp} />
-                  <CustomText
-                    fontStyle='M'
-                    numberOfLines={2}
-                    style={{
-                      marginTop: StyleConstants.Spacing.XS,
-                      color: colors.primaryDefault
-                    }}
-                  >
-                    {item.text || item.spoiler || t('content.draftsList.content.textEmpty')}
-                  </CustomText>
-                  {item.attachments?.uploads.length ? (
-                    <View
-                      style={{
-                        flex: 1,
-                        flexDirection: 'row',
-                        marginTop: StyleConstants.Spacing.S
-                      }}
-                    >
-                      {item.attachments.uploads.map((attachment, index) => (
-                        <FastImage
-                          key={index}
-                          style={{
-                            width:
-                              (Dimensions.get('window').width -
-                                StyleConstants.Spacing.Global.PagePadding * 2 -
-                                StyleConstants.Spacing.S * 3) /
-                              4,
-                            height:
-                              (Dimensions.get('window').width -
-                                StyleConstants.Spacing.Global.PagePadding * 2 -
-                                StyleConstants.Spacing.S * 3) /
-                              4,
-                            marginLeft: index !== 0 ? StyleConstants.Spacing.S : 0
-                          }}
-                          source={{
-                            uri: attachment.local?.thumbnail || attachment.remote?.preview_url
-                          }}
-                        />
-                      ))}
-                    </View>
-                  ) : null}
-                </View>
-              </Pressable>
-            )
-          }}
-          renderHiddenItem={({ item }) => (
+      <SwipeToActions
+        actions={[
+          { onPress: ({ item }) => removeDraft(item.timestamp), color: colors.red, icon: 'trash' }
+        ]}
+        data={drafts.filter(draft => draft.timestamp !== timestamp)}
+        renderItem={({ item }: { item: ComposeStateDraft }) => {
+          return (
             <Pressable
+              accessibilityHint={t('content.draftsList.content.accessibilityHint')}
               style={{
                 flex: 1,
-                flexDirection: 'row',
-                justifyContent: 'flex-end',
-                backgroundColor: colors.red
+                padding: StyleConstants.Spacing.Global.PagePadding,
+                backgroundColor: colors.backgroundDefault
               }}
-              onPress={() => removeDraft(item.timestamp)}
-              children={
-                <View
-                  style={{
-                    flexBasis:
-                      StyleConstants.Font.Size.L + StyleConstants.Spacing.Global.PagePadding * 4,
-                    justifyContent: 'center',
-                    alignItems: 'center'
-                  }}
-                  children={
-                    <Icon
-                      name='Trash'
-                      size={StyleConstants.Font.Size.L}
-                      color={colors.primaryOverlay}
-                    />
+              onPress={async () => {
+                setCheckingAttachments(true)
+                let tempDraft = item
+                let tempUploads: ExtendedAttachment[] = []
+                if (item.attachments && item.attachments.uploads.length) {
+                  for (const attachment of item.attachments.uploads) {
+                    await apiInstance<Mastodon.Attachment>({
+                      method: 'get',
+                      url: `media/${attachment.remote?.id}`
+                    })
+                      .then(res => {
+                        if (res.body.id === attachment.remote?.id) {
+                          tempUploads.push(attachment)
+                        }
+                      })
+                      .catch(() => {})
                   }
-                />
-              }
-            />
-          )}
-          disableRightSwipe={true}
-          rightOpenValue={-actionWidth}
-          previewOpenValue={-actionWidth / 2}
-          ItemSeparatorComponent={ComponentSeparator}
-          keyExtractor={item => item.timestamp?.toString()}
-        />
-      </PanGestureHandler>
+                  tempDraft = {
+                    ...tempDraft,
+                    attachments: { ...item.attachments, uploads: tempUploads }
+                  }
+                }
+
+                tempDraft.spoiler?.length &&
+                  formatText({ textInput: 'text', composeDispatch, content: tempDraft.spoiler })
+                tempDraft.text?.length &&
+                  formatText({ textInput: 'text', composeDispatch, content: tempDraft.text })
+                composeDispatch({
+                  type: 'loadDraft',
+                  payload: tempDraft
+                })
+                removeDraft(item.timestamp)
+                navigation.goBack()
+              }}
+            >
+              <View style={{ flex: 1 }}>
+                <HeaderSharedCreated created_at={item.timestamp} />
+                <CustomText
+                  fontStyle='M'
+                  numberOfLines={2}
+                  style={{
+                    marginTop: StyleConstants.Spacing.XS,
+                    color: colors.primaryDefault
+                  }}
+                >
+                  {item.text || item.spoiler || t('content.draftsList.content.textEmpty')}
+                </CustomText>
+                {item.attachments?.uploads.length ? (
+                  <View
+                    style={{
+                      flex: 1,
+                      flexDirection: 'row',
+                      marginTop: StyleConstants.Spacing.S
+                    }}
+                  >
+                    {item.attachments.uploads.map((attachment, index) => (
+                      <FastImage
+                        key={index}
+                        style={{
+                          width:
+                            (Dimensions.get('window').width -
+                              StyleConstants.Spacing.Global.PagePadding * 2 -
+                              StyleConstants.Spacing.S * 3) /
+                            4,
+                          height:
+                            (Dimensions.get('window').width -
+                              StyleConstants.Spacing.Global.PagePadding * 2 -
+                              StyleConstants.Spacing.S * 3) /
+                            4,
+                          marginLeft: index !== 0 ? StyleConstants.Spacing.S : 0
+                        }}
+                        source={{
+                          uri: attachment.local?.thumbnail || attachment.remote?.preview_url
+                        }}
+                      />
+                    ))}
+                  </View>
+                ) : null}
+              </View>
+            </Pressable>
+          )
+        }}
+        keyExtractor={item => item.timestamp?.toString()}
+      />
       <Modal
         transparent
         animationType='fade'
diff --git a/src/screens/Compose/EditAttachment.tsx b/src/screens/Compose/EditAttachment.tsx
index 4f6ea3b0..6e10574a 100644
--- a/src/screens/Compose/EditAttachment.tsx
+++ b/src/screens/Compose/EditAttachment.tsx
@@ -1,12 +1,14 @@
 import haptics from '@components/haptics'
 import { HeaderLeft, HeaderRight } from '@components/Header'
+import { ModalScrollView } from '@components/ModalScrollView'
+import CustomText from '@components/Text'
 import apiInstance from '@utils/api/instance'
 import { ScreenComposeStackScreenProps } from '@utils/navigation/navigators'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Alert, KeyboardAvoidingView, Platform } from 'react-native'
-import { SafeAreaView } from 'react-native-safe-area-context'
-import ComposeEditAttachmentRoot from './EditAttachment/Root'
+import { Alert, TextInput } from 'react-native'
 import ComposeContext from './utils/createContext'
 
 const ComposeEditAttachment: React.FC<
@@ -17,26 +19,34 @@ const ComposeEditAttachment: React.FC<
     params: { index }
   }
 }) => {
+  const { colors } = useTheme()
   const { t } = useTranslation('screenCompose')
 
-  const { composeState } = useContext(ComposeContext)
+  const { composeState, composeDispatch } = useContext(ComposeContext)
   const [isSubmitting, setIsSubmitting] = useState(false)
 
-  const theAttachment = composeState.attachments.uploads[index].remote!
+  const theAttachment = composeState.attachments.uploads[index].remote
+  if (!theAttachment) {
+    navigation.goBack()
+    return null
+  }
 
   useEffect(() => {
     navigation.setOptions({
       title: t('content.editAttachment.header.title'),
-      headerLeft: () => (
-        <HeaderLeft type='icon' content='ChevronDown' onPress={() => navigation.goBack()} />
-      ),
+      headerLeft: () => <HeaderLeft content='chevron-down' onPress={() => navigation.goBack()} />,
       headerRight: () => (
         <HeaderRight
           accessibilityLabel={t('content.editAttachment.header.right.accessibilityLabel')}
-          type='icon'
-          content='Save'
+          content='save'
           loading={isSubmitting}
           onPress={() => {
+            if (composeState.type === 'edit') {
+              composeDispatch({ type: 'attachment/edit', payload: { ...theAttachment } })
+              navigation.goBack()
+              return
+            }
+
             setIsSubmitting(true)
             const formData = new FormData()
             if (theAttachment.description) {
@@ -76,14 +86,48 @@ const ComposeEditAttachment: React.FC<
   }, [theAttachment])
 
   return (
-    <KeyboardAvoidingView
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      style={{ flex: 1 }}
-    >
-      <SafeAreaView style={{ flex: 1 }} edges={['left', 'right', 'bottom']}>
-        <ComposeEditAttachmentRoot index={index} />
-      </SafeAreaView>
-    </KeyboardAvoidingView>
+    <ModalScrollView>
+      <CustomText fontStyle='M' style={{ color: colors.primaryDefault }} fontWeight='Bold'>
+        {t('content.editAttachment.content.altText.heading')}
+      </CustomText>
+      <TextInput
+        style={{
+          height: StyleConstants.Font.Size.M * 11 + StyleConstants.Spacing.Global.PagePadding * 2,
+          ...StyleConstants.FontStyle.M,
+          marginTop: StyleConstants.Spacing.M,
+          marginBottom: StyleConstants.Spacing.S,
+          padding: StyleConstants.Spacing.Global.PagePadding,
+          borderWidth: 1,
+          borderColor: colors.border,
+          color: colors.primaryDefault
+        }}
+        maxLength={1500}
+        multiline
+        onChangeText={e =>
+          composeDispatch({
+            type: 'attachment/edit',
+            payload: {
+              ...theAttachment,
+              description: e
+            }
+          })
+        }
+        placeholder={t('content.editAttachment.content.altText.placeholder')}
+        placeholderTextColor={colors.secondary}
+        value={theAttachment.description}
+      />
+      <CustomText
+        fontStyle='S'
+        style={{
+          textAlign: 'right',
+          marginRight: StyleConstants.Spacing.S,
+          marginBottom: StyleConstants.Spacing.M,
+          color: colors.secondary
+        }}
+      >
+        {theAttachment.description?.length || 0} / 1500
+      </CustomText>
+    </ModalScrollView>
   )
 }
 
diff --git a/src/screens/Compose/EditAttachment/Image.tsx b/src/screens/Compose/EditAttachment/Image.tsx
deleted file mode 100644
index f8b1e118..00000000
--- a/src/screens/Compose/EditAttachment/Image.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import CustomText from '@components/Text'
-import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useContext } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Dimensions, Image, View } from 'react-native'
-import { Gesture, GestureDetector } from 'react-native-gesture-handler'
-import Animated, {
-  Extrapolate,
-  interpolate,
-  runOnJS,
-  useAnimatedStyle,
-  useSharedValue
-} from 'react-native-reanimated'
-import ComposeContext from '../utils/createContext'
-
-export interface Props {
-  index: number
-}
-
-const ComposeEditAttachmentImage: React.FC<Props> = ({ index }) => {
-  const { t } = useTranslation('screenCompose')
-  const { colors } = useTheme()
-  const { screenReaderEnabled } = useAccessibility()
-
-  const { composeState, composeDispatch } = useContext(ComposeContext)
-  const theAttachmentRemote = composeState.attachments.uploads[index].remote!
-  const theAttachmentLocal = composeState.attachments.uploads[index].local
-
-  const windowWidth = Dimensions.get('window').width
-
-  const imageWidthBase =
-    theAttachmentRemote?.meta?.original?.aspect < 1
-      ? windowWidth * theAttachmentRemote?.meta?.original?.aspect
-      : windowWidth
-  const imageDimensions = {
-    width: imageWidthBase,
-    height:
-      imageWidthBase /
-      ((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.original?.aspect || 1)
-  }
-
-  const updateFocus = ({ x, y }: { x: number; y: number }) => {
-    composeDispatch({
-      type: 'attachment/edit',
-      payload: {
-        ...theAttachmentRemote,
-        meta: {
-          ...theAttachmentRemote.meta,
-          focus: {
-            x: x > 1 ? 1 : x,
-            y: y > 1 ? 1 : y
-          }
-        }
-      }
-    })
-  }
-
-  const pan = useSharedValue({
-    x:
-      (((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.focus?.x || 0) *
-        imageDimensions.width) /
-      2,
-    y:
-      (((theAttachmentRemote as Mastodon.AttachmentImage)?.meta?.focus?.y || 0) *
-        imageDimensions.height) /
-      2
-  })
-  const start = useSharedValue({ x: 0, y: 0 })
-  const gesture = Gesture.Pan()
-    .onBegin(() => {
-      start.value = pan.value
-    })
-    .onUpdate(e => {
-      pan.value = {
-        x: e.translationX + start.value.x,
-        y: e.translationY + start.value.y
-      }
-    })
-    .onEnd(() => {
-      runOnJS(updateFocus)({
-        x: pan.value.x / (imageDimensions.width / 2),
-        y: pan.value.y / (imageDimensions.height / 2)
-      })
-    })
-    .onFinalize(() => {
-      start.value = pan.value
-    })
-  const styleTransform = useAnimatedStyle(() => {
-    return {
-      transform: [
-        {
-          translateX: interpolate(
-            pan.value.x,
-            [-imageDimensions.width / 2, imageDimensions.width / 2],
-            [-imageDimensions.width / 2, imageDimensions.width / 2],
-            Extrapolate.CLAMP
-          )
-        },
-        {
-          translateY: interpolate(
-            pan.value.y,
-            [-imageDimensions.height / 2, imageDimensions.height / 2],
-            [-imageDimensions.height / 2, imageDimensions.height / 2],
-            Extrapolate.CLAMP
-          )
-        }
-      ]
-    }
-  })
-
-  return (
-    <>
-      <CustomText
-        fontStyle='M'
-        style={{
-          color: colors.primaryDefault,
-          padding: StyleConstants.Spacing.Global.PagePadding,
-          paddingTop: 0
-        }}
-        fontWeight='Bold'
-      >
-        {t('content.editAttachment.content.imageFocus')}
-      </CustomText>
-      <View style={{ overflow: 'hidden', flex: 1, alignItems: 'center' }}>
-        <Image
-          style={{
-            width: imageDimensions.width,
-            height: imageDimensions.height
-          }}
-          source={{
-            uri: theAttachmentLocal?.uri ? theAttachmentLocal.uri : theAttachmentRemote?.preview_url
-          }}
-        />
-        <GestureDetector gesture={gesture}>
-          <Animated.View
-            style={[
-              styleTransform,
-              {
-                width: windowWidth * 2,
-                height: imageDimensions.height * 2,
-                position: 'absolute',
-                left: -windowWidth / 2,
-                top: -imageDimensions.height / 2,
-                backgroundColor: colors.backgroundOverlayInvert,
-                flexDirection: 'row',
-                alignItems: 'center',
-                justifyContent: 'center'
-              }
-            ]}
-            children={
-              <View
-                style={{
-                  width: 48,
-                  height: 48,
-                  borderRadius: 24,
-                  borderWidth: 2,
-                  borderColor: colors.primaryOverlay,
-                  flexDirection: 'row',
-                  alignItems: 'center',
-                  justifyContent: 'center'
-                }}
-              />
-            }
-          />
-        </GestureDetector>
-      </View>
-    </>
-  )
-}
-
-export default ComposeEditAttachmentImage
diff --git a/src/screens/Compose/EditAttachment/Root.tsx b/src/screens/Compose/EditAttachment/Root.tsx
deleted file mode 100644
index db48d07d..00000000
--- a/src/screens/Compose/EditAttachment/Root.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import CustomText from '@components/Text'
-import AttachmentVideo from '@components/Timeline/Shared/Attachment/Video'
-import { StyleConstants } from '@utils/styles/constants'
-import { useTheme } from '@utils/styles/ThemeManager'
-import React, { useContext } from 'react'
-import { useTranslation } from 'react-i18next'
-import { ScrollView, StyleSheet, TextInput, View } from 'react-native'
-import ComposeContext from '../utils/createContext'
-import ComposeEditAttachmentImage from './Image'
-
-export interface Props {
-  index: number
-}
-
-const ComposeEditAttachmentRoot: React.FC<Props> = ({ index }) => {
-  const { t } = useTranslation('screenCompose')
-  const { colors, mode } = useTheme()
-  const { composeState, composeDispatch } = useContext(ComposeContext)
-  const theAttachment = composeState.attachments.uploads[index].remote!
-
-  const mediaDisplay = () => {
-    if (theAttachment) {
-      switch (theAttachment.type) {
-        case 'image':
-          return <ComposeEditAttachmentImage index={index} />
-        case 'video':
-        case 'gifv':
-          const video = composeState.attachments.uploads[index]
-          return (
-            <AttachmentVideo
-              total={1}
-              index={0}
-              sensitiveShown={false}
-              video={
-                video.local
-                  ? ({
-                      url: video.local.uri,
-                      preview_url: video.local.thumbnail,
-                      blurhash: video.remote?.blurhash
-                    } as Mastodon.AttachmentVideo)
-                  : (video.remote as Mastodon.AttachmentVideo)
-              }
-            />
-          )
-      }
-    }
-    return null
-  }
-
-  return (
-    <ScrollView>
-      <View style={{ padding: StyleConstants.Spacing.Global.PagePadding, paddingBottom: 0 }}>
-        <CustomText fontStyle='M' style={{ color: colors.primaryDefault }} fontWeight='Bold'>
-          {t('content.editAttachment.content.altText.heading')}
-        </CustomText>
-        <TextInput
-          style={{
-            height: StyleConstants.Font.Size.M * 11 + StyleConstants.Spacing.Global.PagePadding * 2,
-            ...StyleConstants.FontStyle.M,
-            marginTop: StyleConstants.Spacing.M,
-            marginBottom: StyleConstants.Spacing.S,
-            padding: StyleConstants.Spacing.Global.PagePadding,
-            borderWidth: StyleSheet.hairlineWidth,
-            borderColor: colors.border,
-            color: colors.primaryDefault
-          }}
-          maxLength={1500}
-          multiline
-          onChangeText={e =>
-            composeDispatch({
-              type: 'attachment/edit',
-              payload: {
-                ...theAttachment,
-                description: e
-              }
-            })
-          }
-          placeholder={t('content.editAttachment.content.altText.placeholder')}
-          placeholderTextColor={colors.secondary}
-          value={theAttachment.description}
-          keyboardAppearance={mode}
-        />
-        <CustomText
-          fontStyle='S'
-          style={{
-            textAlign: 'right',
-            marginRight: StyleConstants.Spacing.S,
-            marginBottom: StyleConstants.Spacing.M,
-            color: colors.secondary
-          }}
-        >
-          {theAttachment.description?.length || 0} / 1500
-        </CustomText>
-      </View>
-      {mediaDisplay()}
-    </ScrollView>
-  )
-}
-
-export default ComposeEditAttachmentRoot
diff --git a/src/screens/Compose/Root/Actions.tsx b/src/screens/Compose/Root/Actions.tsx
index b9ef7459..f6e49237 100644
--- a/src/screens/Compose/Root/Actions.tsx
+++ b/src/screens/Compose/Root/Actions.tsx
@@ -60,13 +60,13 @@ const ComposeActions: React.FC = () => {
   const visibilityIcon = () => {
     switch (composeState.visibility) {
       case 'public':
-        return 'Globe'
+        return 'globe'
       case 'unlisted':
-        return 'Unlock'
+        return 'unlock'
       case 'private':
-        return 'Lock'
+        return 'lock'
       case 'direct':
-        return 'Mail'
+        return 'mail'
     }
   }
   const visibilityOnPress = () => {
@@ -162,7 +162,7 @@ const ComposeActions: React.FC = () => {
         }}
         style={styles.button}
         onPress={attachmentOnPress}
-        children={<Icon name='Camera' size={24} color={attachmentColor()} />}
+        children={<Icon name='camera' size={24} color={attachmentColor()} />}
       />
       <Pressable
         accessibilityRole='button'
@@ -174,7 +174,7 @@ const ComposeActions: React.FC = () => {
         }}
         style={styles.button}
         onPress={pollOnPress}
-        children={<Icon name='BarChart2' size={24} color={pollColor()} />}
+        children={<Icon name='bar-chart-2' size={24} color={pollColor()} />}
       />
       <Pressable
         accessibilityRole='button'
@@ -200,7 +200,7 @@ const ComposeActions: React.FC = () => {
         onPress={spoilerOnPress}
         children={
           <Icon
-            name='AlertTriangle'
+            name='alert-triangle'
             size={24}
             color={composeState.spoiler.active ? colors.primaryDefault : colors.secondary}
           />
@@ -216,7 +216,7 @@ const ComposeActions: React.FC = () => {
         }}
         style={styles.button}
         onPress={emojiOnPress}
-        children={<Icon name='Smile' size={24} color={emojiColor()} />}
+        children={<Icon name='smile' size={24} color={emojiColor()} />}
       />
     </View>
   )
diff --git a/src/screens/Compose/Root/Footer/Attachments.tsx b/src/screens/Compose/Root/Footer/Attachments.tsx
index 008345c6..0853d5e3 100644
--- a/src/screens/Compose/Root/Footer/Attachments.tsx
+++ b/src/screens/Compose/Root/Footer/Attachments.tsx
@@ -6,6 +6,7 @@ import { MAX_MEDIA_ATTACHMENTS } from '@components/mediaSelector'
 import CustomText from '@components/Text'
 import { useActionSheet } from '@expo/react-native-action-sheet'
 import { useNavigation } from '@react-navigation/native'
+import { featureCheck } from '@utils/helpers/featureCheck'
 import { StyleConstants } from '@utils/styles/constants'
 import layoutAnimation from '@utils/styles/layoutAnimation'
 import { useTheme } from '@utils/styles/ThemeManager'
@@ -104,9 +105,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
       >
         <FastImage
           style={{ width: '100%', height: '100%' }}
-          source={{
-            uri: item.local?.thumbnail || item.remote?.preview_url
-          }}
+          source={{ uri: item.local?.thumbnail || item.remote?.preview_url }}
         />
         {item.remote?.meta?.original?.duration ? (
           <CustomText
@@ -152,7 +151,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
                 attachment: index + 1
               })}
               type='icon'
-              content='X'
+              content='x'
               spacing='M'
               round
               overlay
@@ -165,21 +164,17 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
                 haptics('Success')
               }}
             />
-            {!composeState.attachments.disallowEditing ? (
+            {composeState.type === 'edit' && featureCheck('edit_media_details') ? (
               <Button
                 accessibilityLabel={t('content.root.footer.attachments.edit.accessibilityLabel', {
                   attachment: index + 1
                 })}
                 type='icon'
-                content='Edit'
+                content='edit'
                 spacing='M'
                 round
                 overlay
-                onPress={() => {
-                  navigation.navigate('Screen-Compose-EditAttachment', {
-                    index
-                  })
-                }}
+                onPress={() => navigation.navigate('Screen-Compose-EditAttachment', { index })}
               />
             ) : null}
           </View>
@@ -208,7 +203,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
         onPress={sensitiveOnPress}
       >
         <Icon
-          name={composeState.attachments.sensitive ? 'CheckCircle' : 'Circle'}
+          name={composeState.attachments.sensitive ? 'check-circle' : 'circle'}
           size={StyleConstants.Font.Size.L}
           color={colors.primaryDefault}
         />
@@ -256,7 +251,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
             >
               <Button
                 type='icon'
-                content='UploadCloud'
+                content='upload-cloud'
                 spacing='M'
                 round
                 overlay
diff --git a/src/screens/Compose/Root/Footer/Poll.tsx b/src/screens/Compose/Root/Footer/Poll.tsx
index 94b5f8f7..0c03d9fe 100644
--- a/src/screens/Compose/Root/Footer/Poll.tsx
+++ b/src/screens/Compose/Root/Footer/Poll.tsx
@@ -50,21 +50,12 @@ const ComposePoll: React.FC = () => {
           marginBottom: StyleConstants.Spacing.S
         }}
       >
-        {[...Array(total)].map((e, i) => {
-          const restOptions = Object.keys(options).filter(
-            o => parseInt(o) !== i && parseInt(o) < total
-          )
-          let hasConflict = false
-          restOptions.forEach(o => {
-            // @ts-ignore
-            if (options[o] === options[i]) {
-              hasConflict = true
-            }
-          })
+        {[...Array(total)].map((_, i) => {
+          const hasConflict = options.filter((_, ii) => ii !== i && ii < total).includes(options[i])
           return (
             <View key={i} style={styles.option}>
               <Icon
-                name={multiple ? 'Square' : 'Circle'}
+                name={multiple ? 'square' : 'circle'}
                 size={StyleConstants.Font.Size.L}
                 color={colors.secondary}
               />
@@ -92,14 +83,15 @@ const ComposePoll: React.FC = () => {
                 }
                 placeholderTextColor={colors.disabled}
                 maxLength={MAX_CHARS_PER_OPTION}
-                // @ts-ignore
                 value={options[i]}
-                onChangeText={e =>
+                onChangeText={e => {
+                  const newOptions = [...options]
+                  newOptions[i] = e
                   composeDispatch({
                     type: 'poll',
-                    payload: { options: { ...options, [i]: e } }
+                    payload: { options: [...newOptions] }
                   })
-                }
+                }}
               />
             </View>
           )
@@ -136,7 +128,7 @@ const ComposePoll: React.FC = () => {
               })
           }}
           type='icon'
-          content='Minus'
+          content='minus'
           round
           disabled={!(total > 2)}
         />
@@ -170,7 +162,7 @@ const ComposePoll: React.FC = () => {
               })
           }}
           type='icon'
-          content='Plus'
+          content='plus'
           round
           disabled={!(total < MAX_OPTIONS)}
         />
@@ -204,7 +196,7 @@ const ComposePoll: React.FC = () => {
               }
             )
           }
-          iconBack='ChevronRight'
+          iconBack='chevron-right'
         />
         <MenuRow
           title={t('screenCompose:content.root.footer.poll.expiration.heading')}
@@ -244,7 +236,7 @@ const ComposePoll: React.FC = () => {
               }
             )
           }}
-          iconBack='ChevronRight'
+          iconBack='chevron-right'
         />
       </View>
     </View>
diff --git a/src/screens/Compose/Root/Suggestions.tsx b/src/screens/Compose/Root/Suggestions.tsx
index f1d5cb84..7469e444 100644
--- a/src/screens/Compose/Root/Suggestions.tsx
+++ b/src/screens/Compose/Root/Suggestions.tsx
@@ -93,7 +93,7 @@ const ComposeRootSuggestions: React.FC = () => {
                     props={{ onPress: () => onPress(`@${account.acct}`) }}
                     children={
                       <Icon
-                        name='Plus'
+                        name='plus'
                         size={StyleConstants.Font.Size.L}
                         color={colors.secondary}
                         style={{ marginLeft: 8 }}
diff --git a/src/screens/Compose/Root/index.tsx b/src/screens/Compose/Root/index.tsx
index dc459320..5b2b20e7 100644
--- a/src/screens/Compose/Root/index.tsx
+++ b/src/screens/Compose/Root/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react'
-import { AccessibilityInfo, findNodeHandle, ScrollView, View } from 'react-native'
+import { AccessibilityInfo, findNodeHandle, ScrollView } from 'react-native'
 import ComposePosting from '../Posting'
 import ComposeActions from './Actions'
 import ComposeDrafts from './Drafts'
diff --git a/src/screens/Compose/index.tsx b/src/screens/Compose/index.tsx
index 351dddf5..d5453df1 100644
--- a/src/screens/Compose/index.tsx
+++ b/src/screens/Compose/index.tsx
@@ -416,12 +416,12 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
           <Stack.Screen
             name='Screen-Compose-DraftsList'
             component={ComposeDraftsList}
-            options={{ presentation: 'modal' }}
+            options={{ presentation: 'modal', headerShadowVisible: false }}
           />
           <Stack.Screen
             name='Screen-Compose-EditAttachment'
             component={ComposeEditAttachment}
-            options={{ presentation: 'modal' }}
+            options={{ presentation: 'modal', headerShadowVisible: false }}
           />
         </Stack.Navigator>
       </ComposeContext.Provider>
diff --git a/src/screens/Compose/utils/initialState.ts b/src/screens/Compose/utils/initialState.ts
index 7de3b18d..190979a7 100644
--- a/src/screens/Compose/utils/initialState.ts
+++ b/src/screens/Compose/utils/initialState.ts
@@ -2,6 +2,7 @@ import { createRef } from 'react'
 import { ComposeState } from './types'
 
 const composeInitialState: Omit<ComposeState, 'timestamp'> = {
+  type: undefined,
   dirty: false,
   posting: false,
   spoiler: {
@@ -21,12 +22,7 @@ const composeInitialState: Omit<ComposeState, 'timestamp'> = {
   poll: {
     active: false,
     total: 2,
-    options: {
-      '0': undefined,
-      '1': undefined,
-      '2': undefined,
-      '3': undefined
-    },
+    options: [],
     multiple: false,
     expire: '86400'
   },
diff --git a/src/screens/Compose/utils/parseState.ts b/src/screens/Compose/utils/parseState.ts
index 3998ea08..2f2ff4cd 100644
--- a/src/screens/Compose/utils/parseState.ts
+++ b/src/screens/Compose/utils/parseState.ts
@@ -36,11 +36,12 @@ const composeParseState = (
 ): ComposeState => {
   switch (params.type) {
     case 'share':
-      return { ...composeInitialState, dirty: true, timestamp: Date.now() }
+      return { ...composeInitialState, type: params.type, dirty: true, timestamp: Date.now() }
     case 'edit':
     case 'deleteEdit':
       return {
         ...composeInitialState,
+        type: params.type,
         dirty: true,
         timestamp: Date.now(),
         ...(params.incomingStatus.spoiler_text && {
@@ -50,19 +51,13 @@ const composeParseState = (
           poll: {
             active: true,
             total: params.incomingStatus.poll.options.length,
-            options: {
-              '0': params.incomingStatus.poll.options[0]?.title || undefined,
-              '1': params.incomingStatus.poll.options[1]?.title || undefined,
-              '2': params.incomingStatus.poll.options[2]?.title || undefined,
-              '3': params.incomingStatus.poll.options[3]?.title || undefined
-            },
+            options: params.incomingStatus.poll.options.map(option => option.title),
             multiple: params.incomingStatus.poll.multiple,
             expire: '86400' // !!!
           }
         }),
         ...(params.incomingStatus.media_attachments && {
           attachments: {
-            ...(params.type === 'edit' && { disallowEditing: true }),
             sensitive: params.incomingStatus.sensitive,
             uploads: params.incomingStatus.media_attachments.map(media => ({
               remote: media
@@ -77,6 +72,7 @@ const composeParseState = (
       const actualStatus = params.incomingStatus.reblog || params.incomingStatus
       return {
         ...composeInitialState,
+        type: params.type,
         dirty: true,
         timestamp: Date.now(),
         ...(actualStatus.spoiler_text && {
@@ -88,6 +84,7 @@ const composeParseState = (
     case 'conversation':
       return {
         ...composeInitialState,
+        type: params.type,
         dirty: true,
         timestamp: Date.now(),
         ...assignVisibility(params.visibility || 'direct')
diff --git a/src/screens/Compose/utils/post.ts b/src/screens/Compose/utils/post.ts
index b32e5ec4..e1425b24 100644
--- a/src/screens/Compose/utils/post.ts
+++ b/src/screens/Compose/utils/post.ts
@@ -9,13 +9,27 @@ const composePost = async (
   params: RootStackParamList['Screen-Compose'],
   composeState: ComposeState
 ): Promise<Mastodon.Status> => {
-  const formData = new FormData()
+  const body: {
+    language?: string
+    in_reply_to_id?: string
+    spoiler_text?: string
+    status: string
+    visibility: ComposeState['visibility']
+    sensitive?: boolean
+    media_ids?: string[]
+    media_attributes?: { id: string; description?: string }[]
+    poll?: {
+      expires_in: string
+      multiple: boolean
+      options: (string | undefined)[]
+    }
+  } = { status: composeState.text.raw, visibility: composeState.visibility }
 
   const detectedLanguage = await detectLanguage(
     getPureContent([composeState.spoiler.raw, composeState.text.raw].join('\n\n'))
   )
   if (detectedLanguage) {
-    formData.append('language', detectedLanguage.language)
+    body.language = detectedLanguage.language
   }
 
   if (composeState.replyToStatus) {
@@ -29,29 +43,44 @@ const composePost = async (
         return Promise.reject({ removeReply: true })
       }
     }
-    formData.append('in_reply_to_id', composeState.replyToStatus.id)
+    body.in_reply_to_id = composeState.replyToStatus.id
   }
 
   if (composeState.spoiler.active) {
-    formData.append('spoiler_text', composeState.spoiler.raw)
+    body.spoiler_text = composeState.spoiler.raw
   }
 
-  formData.append('status', composeState.text.raw)
-
   if (composeState.poll.active) {
-    Object.values(composeState.poll.options).forEach(
-      e => e && e.length && formData.append('poll[options][]', e)
-    )
-    formData.append('poll[expires_in]', composeState.poll.expire)
-    formData.append('poll[multiple]', composeState.poll.multiple?.toString())
+    body.poll = {
+      expires_in: composeState.poll.expire,
+      multiple: composeState.poll.multiple,
+      options: composeState.poll.options.filter(option => !!option)
+    }
   }
 
   if (composeState.attachments.uploads.filter(upload => upload.remote && upload.remote.id).length) {
-    formData.append('sensitive', composeState.attachments.sensitive?.toString())
-    composeState.attachments.uploads.forEach(e => formData.append('media_ids[]', e.remote!.id!))
-  }
+    body.sensitive = composeState.attachments.sensitive
+    body.media_ids = []
+    if (params?.type === 'edit') {
+      body.media_attributes = []
+    }
 
-  formData.append('visibility', composeState.visibility)
+    composeState.attachments.uploads.forEach((attachment, index) => {
+      body.media_ids?.push(attachment.remote!.id)
+
+      if (params?.type === 'edit') {
+        if (
+          attachment.remote?.description !==
+          params.incomingStatus.media_attachments[index].description
+        ) {
+          body.media_attributes?.push({
+            id: attachment.remote!.id,
+            description: attachment.remote!.description
+          })
+        }
+      }
+    })
+  }
 
   return apiInstance<Mastodon.Status>({
     method: params?.type === 'edit' ? 'put' : 'post',
@@ -73,7 +102,7 @@ const composePost = async (
           (params?.type === 'edit' || params?.type === 'deleteEdit' ? Math.random().toString() : '')
       )
     },
-    body: formData
+    body
   }).then(res => res.body)
 }
 
diff --git a/src/screens/Compose/utils/types.d.ts b/src/screens/Compose/utils/types.d.ts
index 20198ece..6bf7f6a8 100644
--- a/src/screens/Compose/utils/types.d.ts
+++ b/src/screens/Compose/utils/types.d.ts
@@ -1,3 +1,4 @@
+import type { RootStackParamList } from '@utils/navigation/navigators'
 import { RefObject } from 'react'
 import { Asset } from 'react-native-image-picker'
 
@@ -19,6 +20,7 @@ export type ComposeStateDraft = {
 }
 
 export type ComposeState = {
+  type: NonNullable<RootStackParamList['Screen-Compose']>['type'] | undefined
   dirty: boolean
   timestamp: number
   posting: boolean
@@ -44,14 +46,11 @@ export type ComposeState = {
   poll: {
     active: boolean
     total: number
-    options: {
-      [key: string]: string | undefined
-    }
+    options: (string | undefined)[]
     multiple: boolean
     expire: '300' | '1800' | '3600' | '21600' | '86400' | '259200' | '604800'
   }
   attachments: {
-    disallowEditing?: boolean // https://github.com/mastodon/mastodon/pull/20878
     sensitive: boolean
     uploads: ExtendedAttachment[]
   }
diff --git a/src/screens/ImageViewer/index.tsx b/src/screens/ImageViewer/index.tsx
index 28d3e9f6..0c20d95f 100644
--- a/src/screens/ImageViewer/index.tsx
+++ b/src/screens/ImageViewer/index.tsx
@@ -71,14 +71,14 @@ const ScreenImagesViewer = ({
           zIndex: 999
         }}
       >
-        <HeaderLeft content='X' native={false} background onPress={() => navigation.goBack()} />
+        <HeaderLeft content='x' native={false} background onPress={() => navigation.goBack()} />
         {!hideCounter ? (
           <HeaderCenter inverted content={`${currentIndex + 1} / ${imageUrls.length}`} />
         ) : null}
         <HeaderRight
           accessibilityLabel={t('screenImageViewer:content.actions.accessibilityLabel')}
           accessibilityHint={t('screenImageViewer:content.actions.accessibilityHint')}
-          content='MoreHorizontal'
+          content='more-horizontal'
           native={false}
           background
           onPress={() =>
diff --git a/src/screens/Tabs/Local/Root.tsx b/src/screens/Tabs/Local/Root.tsx
index 50eeea19..432811dd 100644
--- a/src/screens/Tabs/Local/Root.tsx
+++ b/src/screens/Tabs/Local/Root.tsx
@@ -38,7 +38,7 @@ const Root: React.FC<NativeStackScreenProps<TabLocalStackParamList, 'Tab-Local-R
             <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               {page.page === 'List' ? (
                 <Icon
-                  name='List'
+                  name='list'
                   size={StyleConstants.Font.Size.M}
                   color={colors.primaryDefault}
                   style={{ marginRight: StyleConstants.Spacing.S }}
@@ -57,7 +57,7 @@ const Root: React.FC<NativeStackScreenProps<TabLocalStackParamList, 'Tab-Local-R
               />
               {page.page === 'Following' && !pageLocal?.showBoosts ? (
                 <Icon
-                  name='Repeat'
+                  name='repeat'
                   size={StyleConstants.Font.Size.M}
                   color={colors.red}
                   style={{ marginLeft: StyleConstants.Spacing.S }}
@@ -66,7 +66,7 @@ const Root: React.FC<NativeStackScreenProps<TabLocalStackParamList, 'Tab-Local-R
               ) : null}
               {page.page === 'Following' && !pageLocal?.showReplies ? (
                 <Icon
-                  name='MessageCircle'
+                  name='message-circle'
                   size={StyleConstants.Font.Size.M}
                   color={colors.red}
                   style={{ marginLeft: StyleConstants.Spacing.S }}
@@ -74,7 +74,7 @@ const Root: React.FC<NativeStackScreenProps<TabLocalStackParamList, 'Tab-Local-R
                 />
               ) : null}
               <Icon
-                name='ChevronDown'
+                name='chevron-down'
                 size={StyleConstants.Font.Size.M}
                 color={colors.primaryDefault}
                 style={{ marginLeft: StyleConstants.Spacing.S }}
@@ -169,7 +169,7 @@ const Root: React.FC<NativeStackScreenProps<TabLocalStackParamList, 'Tab-Local-R
         <HeaderRight
           accessibilityLabel={t('common.search.accessibilityLabel')}
           accessibilityHint={t('common.search.accessibilityHint')}
-          content='Search'
+          content='search'
           onPress={() => navigation.navigate('Tab-Shared-Search')}
         />
       )
diff --git a/src/screens/Tabs/Me/FollowedTags.tsx b/src/screens/Tabs/Me/FollowedTags.tsx
index c97c9c99..928a8d37 100644
--- a/src/screens/Tabs/Me/FollowedTags.tsx
+++ b/src/screens/Tabs/Me/FollowedTags.tsx
@@ -4,7 +4,7 @@ import ComponentHashtag from '@components/Hashtag'
 import { displayMessage } from '@components/Message'
 import ComponentSeparator from '@components/Separator'
 import { TabMeStackScreenProps } from '@utils/navigation/navigators'
-import { useFollowedTagsQuery, useTagsMutation } from '@utils/queryHooks/tags'
+import { useFollowedTagsQuery, useTagMutation } from '@utils/queryHooks/tags'
 import { flattenPages } from '@utils/queryHooks/utils'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -13,7 +13,7 @@ import { FlatList } from 'react-native-gesture-handler'
 const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>> = ({
   navigation
 }) => {
-  const { t } = useTranslation(['common', 'screenTabs'])
+  const { t } = useTranslation(['common', 'screenTabs', 'componentContextMenu'])
 
   const { data, fetchNextPage, refetch } = useFollowedTagsQuery()
   const flattenData = flattenPages(data)
@@ -24,7 +24,7 @@ const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>>
     }
   }, [flattenData.length])
 
-  const mutation = useTagsMutation({
+  const mutation = useTagMutation({
     onSuccess: () => {
       haptics('Light')
       refetch()
@@ -33,9 +33,10 @@ const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>>
       displayMessage({
         type: 'error',
         message: t('common:message.error.message', {
-          function: to
-            ? t('screenTabs:shared.hashtag.follow')
-            : t('screenTabs:shared.hashtag.unfollow')
+          function: t('componentContextMenu:hashtag.follow.action', {
+            defaultValue: 'false',
+            context: to.toString()
+          })
         }),
         ...(err.status &&
           typeof err.status === 'number' &&
@@ -58,8 +59,11 @@ const TabMeFollowedTags: React.FC<TabMeStackScreenProps<'Tab-Me-FollowedTags'>>
           children={
             <Button
               type='text'
-              content={t('screenTabs:shared.hashtag.unfollow')}
-              onPress={() => mutation.mutate({ tag: item.name, to: !item.following })}
+              content={t('componentContextMenu:hashtag.follow.action', {
+                defaultValue: 'fase',
+                context: 'false'
+              })}
+              onPress={() => mutation.mutate({ tag_name: item.name, to: !item.following })}
             />
           }
         />
diff --git a/src/screens/Tabs/Me/List/Accounts.tsx b/src/screens/Tabs/Me/List/Accounts.tsx
index a49624d4..9d555f13 100644
--- a/src/screens/Tabs/Me/List/Accounts.tsx
+++ b/src/screens/Tabs/Me/List/Accounts.tsx
@@ -50,7 +50,7 @@ const TabMeListAccounts: React.FC<TabMeStackScreenProps<'Tab-Me-List-Accounts'>>
           children={
             <Button
               type='icon'
-              content='X'
+              content='x'
               round
               onPress={() =>
                 mutation.mutate({ type: 'delete', payload: { id: params.id, accounts: [item.id] } })
diff --git a/src/screens/Tabs/Me/List/Edit.tsx b/src/screens/Tabs/Me/List/Edit.tsx
index 86e8e7fd..2dc750b5 100644
--- a/src/screens/Tabs/Me/List/Edit.tsx
+++ b/src/screens/Tabs/Me/List/Edit.tsx
@@ -19,7 +19,7 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
   navigation,
   route: { params }
 }) => {
-  const { colors, theme } = useTheme()
+  const { colors } = useTheme()
   const { t } = useTranslation(['common', 'screenTabs'])
 
   const messageRef = useRef(null)
@@ -90,7 +90,7 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
           : t('screenTabs:me.stacks.listEdit.name'),
       headerLeft: () => (
         <HeaderLeft
-          content='X'
+          content='x'
           onPress={() => {
             if (params.type === 'edit' ? params.payload.title !== title : title.length) {
               Alert.alert(t('common:discard.title'), t('common:discard.message'), [
@@ -112,7 +112,7 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
       ),
       headerRight: () => (
         <HeaderRight
-          content='Save'
+          content='save'
           disabled={!title.length}
           loading={mutation.isLoading}
           onPress={() => {
@@ -147,18 +147,11 @@ const TabMeListEdit: React.FC<TabMeStackScreenProps<'Tab-Me-List-Edit'>> = ({
     <ScrollView style={{ paddingHorizontal: StyleConstants.Spacing.Global.PagePadding }}>
       <ComponentInput {...inputProps} autoFocus title={t('screenTabs:me.listEdit.title')} />
 
-      <CustomText
-        fontStyle='M'
-        fontWeight='Bold'
-        style={{
-          color: colors.primaryDefault,
-          marginBottom: StyleConstants.Spacing.XS,
-          marginTop: StyleConstants.Spacing.M
-        }}
-      >
-        {t('screenTabs:me.listEdit.repliesPolicy.heading')}
-      </CustomText>
-      <Selections options={options} setOptions={setOptions} />
+      <Selections
+        title={t('screenTabs:me.listEdit.repliesPolicy.heading')}
+        options={options}
+        setOptions={setOptions}
+      />
 
       <Message ref={messageRef} />
     </ScrollView>
diff --git a/src/screens/Tabs/Me/List/List.tsx b/src/screens/Tabs/Me/List/List.tsx
index 450937e0..2c204471 100644
--- a/src/screens/Tabs/Me/List/List.tsx
+++ b/src/screens/Tabs/Me/List/List.tsx
@@ -26,8 +26,8 @@ const TabMeListList: React.FC<TabMeStackScreenProps<'Tab-Me-List-List'>> = ({ na
       {data?.map((list, index) => (
         <MenuRow
           key={index}
-          iconFront='List'
-          iconBack='ChevronRight'
+          iconFront='list'
+          iconBack='chevron-right'
           title={list.title}
           onPress={() => navigation.navigate('Tab-Me-List', { list })}
         />
diff --git a/src/screens/Tabs/Me/List/index.tsx b/src/screens/Tabs/Me/List/index.tsx
index 71b59b4b..f1b552a4 100644
--- a/src/screens/Tabs/Me/List/index.tsx
+++ b/src/screens/Tabs/Me/List/index.tsx
@@ -51,7 +51,7 @@ const TabMeList: React.FC<NativeStackScreenProps<TabMeStackParamList, 'Tab-Me-Li
         <DropdownMenu.Root>
           <DropdownMenu.Trigger>
             <Icon
-              name='MoreHorizontal'
+              name='more-horizontal'
               size={StyleConstants.Spacing.M * 1.25}
               color={colors.primaryDefault}
             />
diff --git a/src/screens/Tabs/Me/Preferences/Filter.tsx b/src/screens/Tabs/Me/Preferences/Filter.tsx
new file mode 100644
index 00000000..cf98bee7
--- /dev/null
+++ b/src/screens/Tabs/Me/Preferences/Filter.tsx
@@ -0,0 +1,340 @@
+import Button from '@components/Button'
+import haptics from '@components/haptics'
+import { HeaderLeft, HeaderRight } from '@components/Header'
+import Hr from '@components/Hr'
+import ComponentInput from '@components/Input'
+import { MenuRow } from '@components/Menu'
+import { ModalScrollView } from '@components/ModalScrollView'
+import Selections from '@components/Selections'
+import CustomText from '@components/Text'
+import { useActionSheet } from '@expo/react-native-action-sheet'
+import apiInstance from '@utils/api/instance'
+import { androidActionSheetStyles } from '@utils/helpers/androidActionSheetStyles'
+import browserPackage from '@utils/helpers/browserPackage'
+import { TabMePreferencesStackScreenProps } from '@utils/navigation/navigators'
+import { queryClient } from '@utils/queryHooks'
+import { QueryKeyFilters } from '@utils/queryHooks/filters'
+import { getAccountStorage } from '@utils/storage/actions'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import * as WebBrowser from 'expo-web-browser'
+import React, { RefObject, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { ScrollView, View } from 'react-native'
+import FlashMessage from 'react-native-flash-message'
+
+const TabMePreferencesFilter: React.FC<
+  TabMePreferencesStackScreenProps<'Tab-Me-Preferences-Filter'> & {
+    messageRef: RefObject<FlashMessage>
+  }
+> = ({ navigation, route: { params } }) => {
+  const { colors } = useTheme()
+  const { t } = useTranslation(['common', 'screenTabs'])
+
+  const { showActionSheetWithOptions } = useActionSheet()
+
+  useEffect(() => {
+    navigation.setOptions({
+      title:
+        params.type === 'add'
+          ? t('screenTabs:me.stacks.preferencesFilterAdd.name')
+          : t('screenTabs:me.stacks.preferencesFilterEdit.name'),
+      headerLeft: () => (
+        <HeaderLeft
+          content='chevron-left'
+          onPress={() => navigation.navigate('Tab-Me-Preferences-Filters')}
+        />
+      )
+    })
+  }, [])
+
+  const titleState = useState(params.type === 'edit' ? params.filter.title : '')
+
+  const expirations = ['0', '1800', '3600', '43200', '86400', '604800', '18144000'] as const
+  const [expiration, setExpiration] = useState<typeof expirations[number]>('0')
+
+  const [contexts, setContexts] = useState<
+    {
+      selected: boolean
+      content: string
+      type: 'home' | 'notifications' | 'public' | 'thread' | 'account'
+    }[]
+  >([
+    {
+      selected: params.type === 'edit' ? params.filter.context.includes('home') : true,
+      content: t('screenTabs:me.preferencesFilter.contexts.home'),
+      type: 'home'
+    },
+    {
+      selected: params.type === 'edit' ? params.filter.context.includes('notifications') : false,
+      content: t('screenTabs:me.preferencesFilter.contexts.notifications'),
+      type: 'notifications'
+    },
+    {
+      selected: params.type === 'edit' ? params.filter.context.includes('public') : false,
+      content: t('screenTabs:me.preferencesFilter.contexts.public'),
+      type: 'public'
+    },
+    {
+      selected: params.type === 'edit' ? params.filter.context.includes('thread') : false,
+      content: t('screenTabs:me.preferencesFilter.contexts.thread'),
+      type: 'thread'
+    },
+    {
+      selected: params.type === 'edit' ? params.filter.context.includes('account') : false,
+      content: t('screenTabs:me.preferencesFilter.contexts.account'),
+      type: 'account'
+    }
+  ])
+
+  const [actions, setActions] = useState<
+    { selected: boolean; content: string; type: 'warn' | 'hide' }[]
+  >([
+    {
+      selected: params.type === 'edit' ? params.filter.filter_action === 'warn' : true,
+      content: t('screenTabs:me.preferencesFilter.actions.warn'),
+      type: 'warn'
+    },
+    {
+      selected: params.type === 'edit' ? params.filter.filter_action === 'hide' : false,
+      content: t('screenTabs:me.preferencesFilter.actions.hide'),
+      type: 'hide'
+    }
+  ])
+
+  const [keywords, setKeywords] = useState<string[]>(
+    params.type === 'edit'
+      ? params.filter.keywords.length
+        ? params.filter.keywords.map(({ keyword }) => keyword)
+        : ['']
+      : ['']
+  )
+
+  useEffect(() => {
+    let isLoading = false
+    navigation.setOptions({
+      headerRight: () => (
+        <HeaderRight
+          content='save'
+          loading={isLoading}
+          onPress={async () => {
+            if (!titleState[0].length || !contexts.filter(context => context.selected).length)
+              return
+
+            switch (params.type) {
+              case 'add':
+                isLoading = true
+                await apiInstance({
+                  method: 'post',
+                  version: 'v2',
+                  url: 'filters',
+                  body: {
+                    title: titleState[0],
+                    context: contexts
+                      .filter(context => context.selected)
+                      .map(context => context.type),
+                    filter_action: actions.filter(
+                      action => action.type === 'hide' && action.selected
+                    ).length
+                      ? 'hide'
+                      : 'warn',
+                    ...(parseInt(expiration) && { expires_in: parseInt(expiration) }),
+                    ...(keywords.filter(keyword => keyword.length).length && {
+                      keywords_attributes: keywords
+                        .filter(keyword => keyword.length)
+                        .map(keyword => ({ keyword, whole_word: true }))
+                    })
+                  }
+                })
+                  .then(() => {
+                    isLoading = false
+                    const queryKey: QueryKeyFilters = ['Filters', { version: 'v2' }]
+                    queryClient.refetchQueries(queryKey)
+                    navigation.navigate('Tab-Me-Preferences-Filters')
+                  })
+                  .catch(() => {
+                    isLoading = false
+                    haptics('Error')
+                  })
+                break
+              case 'edit':
+                isLoading = true
+                await apiInstance({
+                  method: 'put',
+                  version: 'v2',
+                  url: `filters/${params.filter.id}`,
+                  body: {
+                    title: titleState[0],
+                    context: contexts
+                      .filter(context => context.selected)
+                      .map(context => context.type),
+                    filter_action: actions.filter(
+                      action => action.type === 'hide' && action.selected
+                    ).length
+                      ? 'hide'
+                      : 'warn',
+                    ...(parseInt(expiration) && {
+                      expires_in: parseInt(expiration)
+                    }),
+                    ...(keywords.filter(keyword => keyword.length).length
+                      ? {
+                          keywords_attributes: keywords
+                            .filter(keyword => keyword.length)
+                            .map(keyword => ({ keyword, whole_word: true }))
+                        }
+                      : params.filter.keywords.length && {
+                          keywords_attributes: params.filter.keywords.map(keyword => ({
+                            ...keyword,
+                            _destroy: true
+                          }))
+                        })
+                  }
+                })
+                  .then(() => {
+                    isLoading = false
+                    const queryKey: QueryKeyFilters = ['Filters', { version: 'v2' }]
+                    queryClient.refetchQueries(queryKey)
+                    navigation.navigate('Tab-Me-Preferences-Filters')
+                  })
+                  .catch(() => {
+                    isLoading = false
+                    haptics('Error')
+                  })
+                break
+            }
+          }}
+        />
+      )
+    })
+  }, [titleState[0], expiration, contexts, actions, keywords])
+
+  const scrollViewRef = useRef<ScrollView>(null)
+
+  return (
+    <ModalScrollView ref={scrollViewRef}>
+      <ComponentInput title={t('screenTabs:me.preferencesFilter.name')} value={titleState} />
+      <MenuRow
+        title={t('screenTabs:me.preferencesFilter.expiration')}
+        content={t(`screenTabs:me.preferencesFilter.expirationOptions.${expiration}`)}
+        iconBack='chevron-right'
+        onPress={() =>
+          showActionSheetWithOptions(
+            {
+              title: t('screenTabs:me.preferencesFilter.expiration'),
+              options: [
+                ...expirations.map(opt =>
+                  t(`screenTabs:me.preferencesFilter.expirationOptions.${opt}`)
+                ),
+                t('common:buttons.cancel')
+              ],
+              cancelButtonIndex: expirations.length,
+              ...androidActionSheetStyles(colors)
+            },
+            (selectedIndex: number) => {
+              selectedIndex < expirations.length && setExpiration(expirations[selectedIndex])
+            }
+          )
+        }
+      />
+      <Hr />
+
+      <Selections
+        title={t('screenTabs:me.preferencesFilter.context')}
+        multiple
+        invalid={!contexts.filter(context => context.selected).length}
+        options={contexts}
+        setOptions={setContexts}
+      />
+      <Selections
+        title={t('screenTabs:me.preferencesFilter.action')}
+        options={actions}
+        setOptions={setActions}
+      />
+      <Hr style={{ marginVertical: StyleConstants.Spacing.M }} />
+
+      <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
+        <CustomText
+          fontStyle='M'
+          children={t('screenTabs:me.preferencesFilter.keywords')}
+          style={{ color: colors.primaryDefault }}
+        />
+        <CustomText
+          style={{ marginHorizontal: StyleConstants.Spacing.M, color: colors.secondary }}
+          children={t('screenTabs:me.preferencesFilters.keywords', { count: keywords.length })}
+        />
+      </View>
+      <View
+        style={{
+          marginTop: StyleConstants.Spacing.M,
+          marginBottom: StyleConstants.Spacing.S
+        }}
+      >
+        {[...Array(keywords.length)].map((_, i) => (
+          <ComponentInput
+            key={i}
+            title={t('screenTabs:me.preferencesFilter.keyword')}
+            value={[
+              keywords[i],
+              k => setKeywords(keywords.map((curr, ii) => (i === ii ? k : curr)))
+            ]}
+          />
+        ))}
+      </View>
+      <View
+        style={{
+          flex: 1,
+          flexDirection: 'row',
+          alignItems: 'center',
+          justifyContent: 'flex-end',
+          marginRight: StyleConstants.Spacing.M
+        }}
+      >
+        <Button
+          onPress={() => setKeywords(keywords.slice(0, keywords.length - 1))}
+          type='icon'
+          content='minus'
+          round
+          disabled={keywords.length < 1}
+          style={{ marginRight: StyleConstants.Spacing.M }}
+        />
+        <Button
+          onPress={() => {
+            setKeywords([...keywords, ''])
+            setTimeout(() => scrollViewRef.current?.scrollToEnd(), 50)
+          }}
+          type='icon'
+          content='plus'
+          round
+        />
+      </View>
+
+      {params.type === 'edit' && params.filter.statuses?.length ? (
+        <>
+          <Hr style={{ marginVertical: StyleConstants.Spacing.M }} />
+          <MenuRow
+            title={t('screenTabs:me.preferencesFilter.statuses')}
+            content={t('screenTabs:me.preferencesFilters.statuses', {
+              count: params.filter.statuses.length
+            })}
+            iconBack='external-link'
+            onPress={async () =>
+              WebBrowser.openAuthSessionAsync(
+                `https://${getAccountStorage.string('auth.domain')}/filters/${
+                  params.filter.id
+                }/statuses`,
+                'tooot://tooot',
+                {
+                  ...(await browserPackage()),
+                  dismissButtonStyle: 'done',
+                  readerMode: false
+                }
+              )
+            }
+          />
+        </>
+      ) : null}
+    </ModalScrollView>
+  )
+}
+
+export default TabMePreferencesFilter
diff --git a/src/screens/Tabs/Me/Preferences/Filters.tsx b/src/screens/Tabs/Me/Preferences/Filters.tsx
new file mode 100644
index 00000000..4af1099e
--- /dev/null
+++ b/src/screens/Tabs/Me/Preferences/Filters.tsx
@@ -0,0 +1,65 @@
+import { Filter } from '@components/Filter'
+import { HeaderLeft, HeaderRight } from '@components/Header'
+import { SwipeToActions } from '@components/SwipeToActions'
+import apiInstance from '@utils/api/instance'
+import { TabMePreferencesStackScreenProps } from '@utils/navigation/navigators'
+import { useFiltersQuery } from '@utils/queryHooks/filters'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useEffect } from 'react'
+
+const TabMePreferencesFilters: React.FC<
+  TabMePreferencesStackScreenProps<'Tab-Me-Preferences-Filters'>
+> = ({ navigation }) => {
+  const { colors } = useTheme()
+
+  useEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => (
+        <HeaderLeft
+          content='chevron-left'
+          onPress={() => navigation.navigate('Tab-Me-Preferences-Root')}
+        />
+      ),
+      headerRight: () => (
+        <HeaderRight
+          content='plus'
+          onPress={() => navigation.navigate('Tab-Me-Preferences-Filter', { type: 'add' })}
+        />
+      )
+    })
+  }, [])
+
+  const { data, refetch } = useFiltersQuery<'v2'>({ version: 'v2' })
+
+  return (
+    <SwipeToActions
+      actions={[
+        {
+          onPress: ({ item }) => {
+            apiInstance({ method: 'delete', version: 'v2', url: `filters/${item.id}` }).then(() =>
+              refetch()
+            )
+          },
+          color: colors.red,
+          icon: 'trash'
+        }
+      ]}
+      data={data?.sort(filter =>
+        filter.expires_at ? new Date().getTime() - new Date(filter.expires_at).getTime() : 1
+      )}
+      renderItem={({ item: filter }) => (
+        <Filter
+          style={{
+            padding: StyleConstants.Spacing.Global.PagePadding,
+            paddingVertical: StyleConstants.Spacing.M
+          }}
+          filter={filter}
+          onPress={() => navigation.navigate('Tab-Me-Preferences-Filter', { type: 'edit', filter })}
+        />
+      )}
+    />
+  )
+}
+
+export default TabMePreferencesFilters
diff --git a/src/screens/Tabs/Me/Preferences/Root.tsx b/src/screens/Tabs/Me/Preferences/Root.tsx
new file mode 100644
index 00000000..4aeb2214
--- /dev/null
+++ b/src/screens/Tabs/Me/Preferences/Root.tsx
@@ -0,0 +1,176 @@
+import { MenuContainer, MenuRow } from '@components/Menu'
+import { useActionSheet } from '@expo/react-native-action-sheet'
+import { androidActionSheetStyles } from '@utils/helpers/androidActionSheetStyles'
+import browserPackage from '@utils/helpers/browserPackage'
+import { featureCheck } from '@utils/helpers/featureCheck'
+import { TabMePreferencesStackScreenProps } from '@utils/navigation/navigators'
+import { useFiltersQuery } from '@utils/queryHooks/filters'
+import { usePreferencesQuery } from '@utils/queryHooks/preferences'
+import { useProfileMutation } from '@utils/queryHooks/profile'
+import { getAccountStorage } from '@utils/storage/actions'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import * as WebBrowser from 'expo-web-browser'
+import React, { RefObject } from 'react'
+import { useTranslation } from 'react-i18next'
+import FlashMessage from 'react-native-flash-message'
+import { ScrollView } from 'react-native-gesture-handler'
+
+const TabMePreferencesRoot: React.FC<
+  TabMePreferencesStackScreenProps<'Tab-Me-Preferences-Root'> & {
+    messageRef: RefObject<FlashMessage>
+  }
+> = ({ navigation, messageRef }) => {
+  const { colors } = useTheme()
+  const { t } = useTranslation(['common', 'screenTabs'])
+
+  const { showActionSheetWithOptions } = useActionSheet()
+
+  const { mutateAsync } = useProfileMutation()
+
+  const { data, isFetching, refetch } = usePreferencesQuery()
+
+  const { data: filters, isFetching: filtersIsFetching } = useFiltersQuery<'v2'>({ version: 'v2' })
+
+  return (
+    <ScrollView>
+      <MenuContainer>
+        {data?.['posting:default:visibility'] !== 'direct' ? (
+          <MenuRow
+            title={t('screenTabs:me.preferences.visibility.title')}
+            content={
+              data?.['posting:default:visibility']
+                ? t(
+                    `screenTabs:me.preferences.visibility.options.${data['posting:default:visibility']}`
+                  )
+                : undefined
+            }
+            loading={isFetching}
+            iconBack='chevron-right'
+            onPress={() =>
+              showActionSheetWithOptions(
+                {
+                  title: t('screenTabs:me.preferences.visibility.title'),
+                  options: [
+                    t('screenTabs:me.preferences.visibility.options.public'),
+                    t('screenTabs:me.preferences.visibility.options.unlisted'),
+                    t('screenTabs:me.preferences.visibility.options.private'),
+                    t('common:buttons.cancel')
+                  ],
+                  cancelButtonIndex: 3,
+                  ...androidActionSheetStyles(colors)
+                },
+                async buttonIndex => {
+                  switch (buttonIndex) {
+                    case 0:
+                    case 1:
+                    case 2:
+                      const indexVisibilityMapping = ['public', 'unlisted', 'private'] as [
+                        'public',
+                        'unlisted',
+                        'private'
+                      ]
+                      if (
+                        data?.['posting:default:visibility'] &&
+                        data['posting:default:visibility'] !== indexVisibilityMapping[buttonIndex]
+                      ) {
+                        mutateAsync({
+                          messageRef,
+                          message: {
+                            text: 'me.profile.root.visibility.title',
+                            succeed: false,
+                            failed: true
+                          },
+                          type: 'source[privacy]',
+                          data: indexVisibilityMapping[buttonIndex]
+                        }).then(() => refetch())
+                      }
+                      break
+                  }
+                }
+              )
+            }
+          />
+        ) : null}
+        <MenuRow
+          title={t('screenTabs:me.preferences.sensitive.title')}
+          switchValue={data?.['posting:default:sensitive']}
+          switchOnValueChange={() =>
+            mutateAsync({
+              messageRef,
+              message: {
+                text: 'me.profile.root.sensitive.title',
+                succeed: false,
+                failed: true
+              },
+              type: 'source[sensitive]',
+              data:
+                data?.['posting:default:sensitive'] === undefined
+                  ? true
+                  : !data['posting:default:sensitive']
+            }).then(() => refetch())
+          }
+          loading={isFetching}
+        />
+      </MenuContainer>
+      <MenuContainer style={{ marginTop: StyleConstants.Spacing.L }}>
+        <MenuRow
+          iconBack='external-link'
+          title={t('screenTabs:me.preferences.web_only.title')}
+          description={t('screenTabs:me.preferences.web_only.description')}
+          onPress={async () =>
+            WebBrowser.openAuthSessionAsync(
+              `https://${getAccountStorage.string('auth.domain')}/settings/preferences`,
+              'tooot://tooot',
+              {
+                ...(await browserPackage()),
+                dismissButtonStyle: 'done',
+                readerMode: false
+              }
+            ).then(() => refetch())
+          }
+        />
+        <MenuRow
+          title={t('screenTabs:me.preferences.media.title')}
+          content={
+            data?.['reading:expand:media']
+              ? t(`screenTabs:me.preferences.media.options.${data['reading:expand:media']}`)
+              : undefined
+          }
+          loading={isFetching}
+        />
+        <MenuRow
+          title={t('screenTabs:me.preferences.spoilers.title')}
+          switchValue={data?.['reading:expand:spoilers'] || false}
+          switchDisabled={true}
+          loading={isFetching}
+        />
+        {data?.['reading:autoplay:gifs'] !== undefined ? (
+          <MenuRow
+            title={t('screenTabs:me.preferences.autoplay_gifs.title')}
+            switchValue={data['reading:autoplay:gifs'] || false}
+            switchDisabled={true}
+            loading={isFetching}
+          />
+        ) : null}
+      </MenuContainer>
+      {featureCheck('filter_server_side') ? (
+        <MenuContainer>
+          <MenuRow
+            title={t('screenTabs:me.preferences.filters.title')}
+            content={t('screenTabs:me.preferences.filters.content', {
+              count: filters?.filter(filter =>
+                filter.expires_at ? new Date(filter.expires_at) > new Date() : true
+              ).length
+            })}
+            loading={filtersIsFetching}
+            iconBack='chevron-right'
+            onPress={() => navigation.navigate('Tab-Me-Preferences-Filters')}
+          />
+        </MenuContainer>
+      ) : null}
+    </ScrollView>
+  )
+}
+
+export default TabMePreferencesRoot
diff --git a/src/screens/Tabs/Me/Preferences/index.tsx b/src/screens/Tabs/Me/Preferences/index.tsx
new file mode 100644
index 00000000..1022be31
--- /dev/null
+++ b/src/screens/Tabs/Me/Preferences/index.tsx
@@ -0,0 +1,59 @@
+import { HeaderLeft } from '@components/Header'
+import { Message } from '@components/Message'
+import { useNavigationState } from '@react-navigation/native'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
+import { TabMePreferencesStackParamList, TabMeStackScreenProps } from '@utils/navigation/navigators'
+import React, { useEffect, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+import FlashMessage from 'react-native-flash-message'
+import TabMePreferencesFilter from './Filter'
+import TabMePreferencesFilters from './Filters'
+import TabMePreferencesRoot from './Root'
+
+const Stack = createNativeStackNavigator<TabMePreferencesStackParamList>()
+
+const TabMePreferences: React.FC<TabMeStackScreenProps<'Tab-Me-Preferences'>> = ({
+  navigation
+}) => {
+  const { t } = useTranslation('screenTabs')
+  const messageRef = useRef<FlashMessage>(null)
+
+  const isNested =
+    (useNavigationState(
+      state => state.routes.find(route => route.name === 'Tab-Me-Preferences')?.state?.routes.length
+    ) || 0) > 1
+
+  useEffect(() => {
+    navigation.setOptions({ gestureEnabled: !isNested })
+  }, [isNested])
+
+  return (
+    <>
+      <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
+        <Stack.Screen
+          name='Tab-Me-Preferences-Root'
+          options={{
+            title: t('me.stacks.preferences.name'),
+            headerLeft: () => (
+              <HeaderLeft content='chevron-down' onPress={() => navigation.goBack()} />
+            )
+          }}
+        >
+          {props => <TabMePreferencesRoot messageRef={messageRef} {...props} />}
+        </Stack.Screen>
+        <Stack.Screen
+          name='Tab-Me-Preferences-Filters'
+          component={TabMePreferencesFilters}
+          options={{ title: t('me.stacks.preferencesFilters.name') }}
+        />
+        <Stack.Screen name='Tab-Me-Preferences-Filter'>
+          {props => <TabMePreferencesFilter messageRef={messageRef} {...props} />}
+        </Stack.Screen>
+      </Stack.Navigator>
+
+      <Message ref={messageRef} />
+    </>
+  )
+}
+
+export default TabMePreferences
diff --git a/src/screens/Tabs/Me/Profile/Fields.tsx b/src/screens/Tabs/Me/Profile/Fields.tsx
index 62150e13..4ea66d80 100644
--- a/src/screens/Tabs/Me/Profile/Fields.tsx
+++ b/src/screens/Tabs/Me/Profile/Fields.tsx
@@ -90,7 +90,7 @@ const TabMeProfileFields: React.FC<
     navigation.setOptions({
       headerLeft: () => (
         <HeaderLeft
-          content='X'
+          content='chevron-left'
           onPress={() => {
             if (dirty) {
               Alert.alert(t('common:discard.title'), t('common:discard.message'), [
@@ -114,7 +114,7 @@ const TabMeProfileFields: React.FC<
         <HeaderRight
           disabled={!dirty}
           loading={status === 'loading'}
-          content='Save'
+          content='save'
           onPress={async () => {
             mutateAsync({
               messageRef,
diff --git a/src/screens/Tabs/Me/Profile/Name.tsx b/src/screens/Tabs/Me/Profile/Name.tsx
index 28d7677e..c978ca92 100644
--- a/src/screens/Tabs/Me/Profile/Name.tsx
+++ b/src/screens/Tabs/Me/Profile/Name.tsx
@@ -44,7 +44,7 @@ const TabMeProfileName: React.FC<
     navigation.setOptions({
       headerLeft: () => (
         <HeaderLeft
-          content='X'
+          content='chevron-left'
           onPress={() => {
             if (dirty) {
               Alert.alert(t('common:discard.title'), t('common:discard.message'), [
@@ -68,7 +68,7 @@ const TabMeProfileName: React.FC<
         <HeaderRight
           disabled={!dirty}
           loading={status === 'loading'}
-          content='Save'
+          content='save'
           onPress={async () => {
             mutateAsync({
               messageRef,
diff --git a/src/screens/Tabs/Me/Profile/Note.tsx b/src/screens/Tabs/Me/Profile/Note.tsx
index f21abb1c..12071660 100644
--- a/src/screens/Tabs/Me/Profile/Note.tsx
+++ b/src/screens/Tabs/Me/Profile/Note.tsx
@@ -44,7 +44,7 @@ const TabMeProfileNote: React.FC<
     navigation.setOptions({
       headerLeft: () => (
         <HeaderLeft
-          content='X'
+          content='chevron-left'
           onPress={() => {
             if (dirty) {
               Alert.alert(t('common:discard.title'), t('common:discard.message'), [
@@ -68,7 +68,7 @@ const TabMeProfileNote: React.FC<
         <HeaderRight
           disabled={!dirty}
           loading={status === 'loading'}
-          content='Save'
+          content='save'
           onPress={async () => {
             mutateAsync({
               messageRef,
diff --git a/src/screens/Tabs/Me/Profile/Root.tsx b/src/screens/Tabs/Me/Profile/Root.tsx
index 0bb095f2..07f6abf3 100644
--- a/src/screens/Tabs/Me/Profile/Root.tsx
+++ b/src/screens/Tabs/Me/Profile/Root.tsx
@@ -1,11 +1,6 @@
 import { MenuContainer, MenuRow } from '@components/Menu'
-import { useActionSheet } from '@expo/react-native-action-sheet'
-import { androidActionSheetStyles } from '@utils/helpers/androidActionSheetStyles'
 import { TabMeProfileStackScreenProps } from '@utils/navigation/navigators'
-import { queryClient } from '@utils/queryHooks'
-import { QueryKeyPreferences } from '@utils/queryHooks/preferences'
 import { useProfileMutation, useProfileQuery } from '@utils/queryHooks/profile'
-import { useTheme } from '@utils/styles/ThemeManager'
 import React, { RefObject } from 'react'
 import { useTranslation } from 'react-i18next'
 import FlashMessage from 'react-native-flash-message'
@@ -17,19 +12,11 @@ const TabMeProfileRoot: React.FC<
     messageRef: RefObject<FlashMessage>
   }
 > = ({ messageRef, navigation }) => {
-  const { colors } = useTheme()
   const { t } = useTranslation(['common', 'screenTabs'])
 
-  const { showActionSheetWithOptions } = useActionSheet()
-
   const { data, isFetching } = useProfileQuery()
   const { mutateAsync } = useProfileMutation()
 
-  const refetchPreferences = () => {
-    const queryKeyPreferences: QueryKeyPreferences = ['Preferences']
-    queryClient.refetchQueries(queryKeyPreferences)
-  }
-
   return (
     <ScrollView>
       <MenuContainer>
@@ -37,7 +24,7 @@ const TabMeProfileRoot: React.FC<
           title={t('screenTabs:me.profile.root.name.title')}
           content={data?.display_name}
           loading={isFetching}
-          iconBack='ChevronRight'
+          iconBack='chevron-right'
           onPress={() => {
             data &&
               navigation.navigate('Tab-Me-Profile-Name', {
@@ -51,7 +38,7 @@ const TabMeProfileRoot: React.FC<
           title={t('screenTabs:me.profile.root.note.title')}
           content={data?.source?.note}
           loading={isFetching}
-          iconBack='ChevronRight'
+          iconBack='chevron-right'
           onPress={() => {
             data &&
               navigation.navigate('Tab-Me-Profile-Note', {
@@ -69,7 +56,7 @@ const TabMeProfileRoot: React.FC<
               : undefined
           }
           loading={isFetching}
-          iconBack='ChevronRight'
+          iconBack='chevron-right'
           onPress={() => {
             navigation.navigate('Tab-Me-Profile-Fields', {
               fields: data?.source.fields
@@ -77,77 +64,6 @@ const TabMeProfileRoot: React.FC<
           }}
         />
       </MenuContainer>
-      <MenuContainer>
-        {data?.source.privacy !== 'direct' ? (
-          <MenuRow
-            title={t('screenTabs:me.profile.root.visibility.title')}
-            content={
-              data?.source.privacy
-                ? t(`screenTabs:me.profile.root.visibility.options.${data.source.privacy}`)
-                : undefined
-            }
-            loading={isFetching}
-            iconBack='ChevronRight'
-            onPress={() =>
-              showActionSheetWithOptions(
-                {
-                  title: t('screenTabs:me.profile.root.visibility.title'),
-                  options: [
-                    t('screenTabs:me.profile.root.visibility.options.public'),
-                    t('screenTabs:me.profile.root.visibility.options.unlisted'),
-                    t('screenTabs:me.profile.root.visibility.options.private'),
-                    t('common:buttons.cancel')
-                  ],
-                  cancelButtonIndex: 3,
-                  ...androidActionSheetStyles(colors)
-                },
-                async buttonIndex => {
-                  switch (buttonIndex) {
-                    case 0:
-                    case 1:
-                    case 2:
-                      const indexVisibilityMapping = ['public', 'unlisted', 'private'] as [
-                        'public',
-                        'unlisted',
-                        'private'
-                      ]
-                      if (data?.source.privacy !== indexVisibilityMapping[buttonIndex]) {
-                        mutateAsync({
-                          messageRef,
-                          message: {
-                            text: 'me.profile.root.visibility.title',
-                            succeed: false,
-                            failed: true
-                          },
-                          type: 'source[privacy]',
-                          data: indexVisibilityMapping[buttonIndex]
-                        }).then(() => refetchPreferences())
-                      }
-                      break
-                  }
-                }
-              )
-            }
-          />
-        ) : null}
-        <MenuRow
-          title={t('screenTabs:me.profile.root.sensitive.title')}
-          switchValue={data?.source.sensitive}
-          switchOnValueChange={() =>
-            mutateAsync({
-              messageRef,
-              message: {
-                text: 'me.profile.root.sensitive.title',
-                succeed: false,
-                failed: true
-              },
-              type: 'source[sensitive]',
-              data: data?.source.sensitive === undefined ? true : !data.source.sensitive
-            }).then(() => refetchPreferences())
-          }
-          loading={isFetching}
-        />
-      </MenuContainer>
       <MenuContainer>
         <MenuRow
           title={t('screenTabs:me.profile.root.lock.title')}
diff --git a/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx b/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
index 7d95d7a7..e51b2ceb 100644
--- a/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
+++ b/src/screens/Tabs/Me/Profile/Root/AvatarHeader.tsx
@@ -25,7 +25,7 @@ const ProfileAvatarHeader: React.FC<Props> = ({ type, messageRef }) => {
       title={t(`screenTabs:me.profile.root.${type}.title`)}
       description={t(`screenTabs:me.profile.root.${type}.description`)}
       loading={query.isFetching || mutation.isLoading}
-      iconBack='ChevronRight'
+      iconBack='chevron-right'
       onPress={async () => {
         const image = await mediaSelector({
           mediaType: 'photo',
diff --git a/src/screens/Tabs/Me/Profile/index.tsx b/src/screens/Tabs/Me/Profile/index.tsx
index 8e351e4b..b2f336a5 100644
--- a/src/screens/Tabs/Me/Profile/index.tsx
+++ b/src/screens/Tabs/Me/Profile/index.tsx
@@ -4,7 +4,6 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import { TabMeProfileStackParamList, TabMeStackScreenProps } from '@utils/navigation/navigators'
 import React, { useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { KeyboardAvoidingView, Platform } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
 import TabMeProfileFields from './Fields'
 import TabMeProfileName from './Name'
@@ -18,52 +17,41 @@ const TabMeProfile: React.FC<TabMeStackScreenProps<'Tab-Me-Switch'>> = ({ naviga
   const messageRef = useRef<FlashMessage>(null)
 
   return (
-    <KeyboardAvoidingView
-      style={{ flex: 1 }}
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-    >
+    <>
       <Stack.Navigator screenOptions={{ headerShadowVisible: false }}>
         <Stack.Screen
           name='Tab-Me-Profile-Root'
           options={{
             title: t('me.stacks.profile.name'),
             headerLeft: () => (
-              <HeaderLeft content='ChevronDown' onPress={() => navigation.goBack()} />
+              <HeaderLeft content='chevron-down' onPress={() => navigation.goBack()} />
             )
           }}
         >
-          {({ route, navigation }) => (
-            <TabMeProfileRoot messageRef={messageRef} route={route} navigation={navigation} />
-          )}
+          {props => <TabMeProfileRoot messageRef={messageRef} {...props} />}
         </Stack.Screen>
         <Stack.Screen
           name='Tab-Me-Profile-Name'
           options={{ title: t('me.stacks.profileName.name') }}
         >
-          {({ route, navigation }) => (
-            <TabMeProfileName messageRef={messageRef} route={route} navigation={navigation} />
-          )}
+          {props => <TabMeProfileName messageRef={messageRef} {...props} />}
         </Stack.Screen>
         <Stack.Screen
           name='Tab-Me-Profile-Note'
           options={{ title: t('me.stacks.profileNote.name') }}
         >
-          {({ route, navigation }) => (
-            <TabMeProfileNote messageRef={messageRef} route={route} navigation={navigation} />
-          )}
+          {props => <TabMeProfileNote messageRef={messageRef} {...props} />}
         </Stack.Screen>
         <Stack.Screen
           name='Tab-Me-Profile-Fields'
           options={{ title: t('me.stacks.profileFields.name') }}
         >
-          {({ route, navigation }) => (
-            <TabMeProfileFields messageRef={messageRef} route={route} navigation={navigation} />
-          )}
+          {props => <TabMeProfileFields messageRef={messageRef} {...props} />}
         </Stack.Screen>
       </Stack.Navigator>
 
       <Message ref={messageRef} />
-    </KeyboardAvoidingView>
+    </>
   )
 }
 
diff --git a/src/screens/Tabs/Me/Push.tsx b/src/screens/Tabs/Me/Push.tsx
index cf21c506..158c0ad1 100644
--- a/src/screens/Tabs/Me/Push.tsx
+++ b/src/screens/Tabs/Me/Push.tsx
@@ -265,7 +265,7 @@ const TabMePush: React.FC = () => {
                 />
                 <MenuRow
                   title={t('me.push.howitworks')}
-                  iconBack='ExternalLink'
+                  iconBack='external-link'
                   onPress={async () =>
                     WebBrowser.openBrowserAsync('https://tooot.app/how-push-works', {
                       ...(await browserPackage())
@@ -286,7 +286,7 @@ const TabMePush: React.FC = () => {
                 paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
               }}
             >
-              <Icon name='Frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
+              <Icon name='frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
               <CustomText
                 fontStyle='M'
                 style={{
@@ -310,7 +310,7 @@ const TabMePush: React.FC = () => {
             paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
           }}
         >
-          <Icon name='Frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
+          <Icon name='frown' size={StyleConstants.Font.Size.L} color={colors.primaryDefault} />
           <CustomText
             fontStyle='M'
             style={{
diff --git a/src/screens/Tabs/Me/Root/Collections.tsx b/src/screens/Tabs/Me/Root/Collections.tsx
index ffe0e532..1e181b9e 100644
--- a/src/screens/Tabs/Me/Root/Collections.tsx
+++ b/src/screens/Tabs/Me/Root/Collections.tsx
@@ -43,43 +43,43 @@ const Collections: React.FC = () => {
   return (
     <MenuContainer>
       <MenuRow
-        iconFront='Mail'
-        iconBack='ChevronRight'
+        iconFront='mail'
+        iconBack='chevron-right'
         title={t('screenTabs:me.stacks.conversations.name')}
         onPress={() => navigation.navigate('Tab-Me-Conversations')}
       />
       <MenuRow
-        iconFront='Bookmark'
-        iconBack='ChevronRight'
+        iconFront='bookmark'
+        iconBack='chevron-right'
         title={t('screenTabs:me.stacks.bookmarks.name')}
         onPress={() => navigation.navigate('Tab-Me-Bookmarks')}
       />
       <MenuRow
-        iconFront='Heart'
-        iconBack='ChevronRight'
+        iconFront='heart'
+        iconBack='chevron-right'
         title={t('screenTabs:me.stacks.favourites.name')}
         onPress={() => navigation.navigate('Tab-Me-Favourites')}
       />
       {pageMe?.lists?.shown ? (
         <MenuRow
-          iconFront='List'
-          iconBack='ChevronRight'
+          iconFront='list'
+          iconBack='chevron-right'
           title={t('screenTabs:me.stacks.lists.name')}
           onPress={() => navigation.navigate('Tab-Me-List-List')}
         />
       ) : null}
       {pageMe?.followedTags?.shown ? (
         <MenuRow
-          iconFront='Hash'
-          iconBack='ChevronRight'
+          iconFront='hash'
+          iconBack='chevron-right'
           title={t('screenTabs:me.stacks.followedTags.name')}
           onPress={() => navigation.navigate('Tab-Me-FollowedTags')}
         />
       ) : null}
       {pageMe?.announcements?.shown ? (
         <MenuRow
-          iconFront='Clipboard'
-          iconBack='ChevronRight'
+          iconFront='clipboard'
+          iconBack='chevron-right'
           title={t('screenAnnouncements:heading')}
           content={
             pageMe.announcements.unread
@@ -92,8 +92,8 @@ const Collections: React.FC = () => {
         />
       ) : null}
       <MenuRow
-        iconFront={instancePush ? 'Bell' : 'BellOff'}
-        iconBack='ChevronRight'
+        iconFront={instancePush ? 'bell' : 'bell-off'}
+        iconBack='chevron-right'
         title={t('screenTabs:me.stacks.push.name')}
         content={
           typeof instancePush.global === 'boolean'
diff --git a/src/screens/Tabs/Me/Root/Settings.tsx b/src/screens/Tabs/Me/Root/Settings.tsx
index d644470c..fd0b2203 100644
--- a/src/screens/Tabs/Me/Root/Settings.tsx
+++ b/src/screens/Tabs/Me/Root/Settings.tsx
@@ -1,8 +1,5 @@
 import { MenuContainer, MenuRow } from '@components/Menu'
 import { useNavigation } from '@react-navigation/native'
-import browserPackage from '@utils/helpers/browserPackage'
-import { getAccountStorage, useGlobalStorage } from '@utils/storage/actions'
-import * as WebBrowser from 'expo-web-browser'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -10,34 +7,14 @@ const Settings: React.FC = () => {
   const { t } = useTranslation('screenTabs')
   const navigation = useNavigation<any>()
 
-  const [accountActive] = useGlobalStorage.string('account.active')
-
   return (
     <MenuContainer>
       <MenuRow
-        iconFront='Settings'
-        iconBack='ChevronRight'
+        iconFront='settings'
+        iconBack='chevron-right'
         title={t('me.stacks.settings.name')}
         onPress={() => navigation.navigate('Tab-Me-Settings')}
       />
-      {accountActive ? (
-        <MenuRow
-          iconFront='Sliders'
-          iconBack='ExternalLink'
-          title={t('me.stacks.webSettings.name')}
-          onPress={async () =>
-            WebBrowser.openAuthSessionAsync(
-              `https://${getAccountStorage.string('auth.domain')}/settings/preferences`,
-              'tooot://tooot',
-              {
-                ...(await browserPackage()),
-                dismissButtonStyle: 'done',
-                readerMode: false
-              }
-            )
-          }
-        />
-      ) : null}
     </MenuContainer>
   )
 }
diff --git a/src/screens/Tabs/Me/Settings/App.tsx b/src/screens/Tabs/Me/Settings/App.tsx
index 55040f35..e73da3d5 100644
--- a/src/screens/Tabs/Me/Settings/App.tsx
+++ b/src/screens/Tabs/Me/Settings/App.tsx
@@ -29,7 +29,7 @@ const SettingsApp: React.FC = () => {
       <MenuRow
         title={t('screenTabs:me.stacks.fontSize.name')}
         content={t(`screenTabs:me.fontSize.sizes.${mapFontsizeToName(fontSize || 0)}`)}
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() => navigation.navigate('Tab-Me-Settings-Fontsize')}
       />
       <MenuRow
@@ -42,7 +42,7 @@ const SettingsApp: React.FC = () => {
               : i18n.language.toLowerCase()
           ]
         }
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() =>
           Platform.OS === 'ios'
             ? Linking.openSettings()
@@ -52,7 +52,7 @@ const SettingsApp: React.FC = () => {
       <MenuRow
         title={t('screenTabs:me.settings.theme.heading')}
         content={t(`screenTabs:me.settings.theme.options.${theme || 'auto'}`)}
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() =>
           showActionSheetWithOptions(
             {
@@ -88,7 +88,7 @@ const SettingsApp: React.FC = () => {
       <MenuRow
         title={t('screenTabs:me.settings.darkTheme.heading')}
         content={t(`screenTabs:me.settings.darkTheme.options.${themeDark || 'lighter'}`)}
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() =>
           showActionSheetWithOptions(
             {
@@ -119,7 +119,7 @@ const SettingsApp: React.FC = () => {
       <MenuRow
         title={t('screenTabs:me.settings.browser.heading')}
         content={t(`screenTabs:me.settings.browser.options.${browser || 'internal'}`)}
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() =>
           showActionSheetWithOptions(
             {
diff --git a/src/screens/Tabs/Me/Settings/Dev.tsx b/src/screens/Tabs/Me/Settings/Dev.tsx
index 2e91b354..4ea81e24 100644
--- a/src/screens/Tabs/Me/Settings/Dev.tsx
+++ b/src/screens/Tabs/Me/Settings/Dev.tsx
@@ -27,7 +27,7 @@ const SettingsDev: React.FC = () => {
       <MenuRow
         title={'Saved local instances'}
         content={accounts?.length.toString()}
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() =>
           showActionSheetWithOptions(
             {
diff --git a/src/screens/Tabs/Me/Settings/Tooot.tsx b/src/screens/Tabs/Me/Settings/Tooot.tsx
index 063d5c51..a1d071e3 100644
--- a/src/screens/Tabs/Me/Settings/Tooot.tsx
+++ b/src/screens/Tabs/Me/Settings/Tooot.tsx
@@ -24,22 +24,22 @@ const SettingsTooot: React.FC = () => {
     <MenuContainer>
       <MenuRow
         title={t('me.settings.support.heading')}
-        content={<Icon name='Heart' size={StyleConstants.Font.Size.M} color={colors.red} />}
-        iconBack='ChevronRight'
+        content={<Icon name='heart' size={StyleConstants.Font.Size.M} color={colors.red} />}
+        iconBack='chevron-right'
         onPress={() => Linking.openURL('https://www.buymeacoffee.com/xmflsct')}
       />
       <MenuRow
         title={t('me.settings.feedback.heading')}
         content={
-          <Icon name='MessageSquare' size={StyleConstants.Font.Size.M} color={colors.secondary} />
+          <Icon name='message-square' size={StyleConstants.Font.Size.M} color={colors.secondary} />
         }
-        iconBack='ChevronRight'
+        iconBack='chevron-right'
         onPress={() => Linking.openURL('https://feedback.tooot.app/feature-requests')}
       />
       <MenuRow
         title={t('me.settings.contact.heading')}
-        content={<Icon name='Mail' size={StyleConstants.Font.Size.M} color={colors.secondary} />}
-        iconBack='ChevronRight'
+        content={<Icon name='mail' size={StyleConstants.Font.Size.M} color={colors.secondary} />}
+        iconBack='chevron-right'
         onPress={async () => {
           if (accountActive) {
             navigation.navigate('Screen-Compose', {
diff --git a/src/screens/Tabs/Me/SettingsFontsize.tsx b/src/screens/Tabs/Me/SettingsFontsize.tsx
index 87e733f8..dcc47439 100644
--- a/src/screens/Tabs/Me/SettingsFontsize.tsx
+++ b/src/screens/Tabs/Me/SettingsFontsize.tsx
@@ -114,7 +114,7 @@ const TabMeSettingsFontsize: React.FC<TabMeStackScreenProps<'Tab-Me-Settings-Fon
             }
           }}
           type='icon'
-          content='Minus'
+          content='minus'
           round
           disabled={(fontSize || 0) <= -1}
           style={{ marginHorizontal: StyleConstants.Spacing.S }}
@@ -128,7 +128,7 @@ const TabMeSettingsFontsize: React.FC<TabMeStackScreenProps<'Tab-Me-Settings-Fon
             }
           }}
           type='icon'
-          content='Plus'
+          content='plus'
           round
           disabled={(fontSize || 0) >= 3}
           style={{ marginHorizontal: StyleConstants.Spacing.S }}
diff --git a/src/screens/Tabs/Me/SettingsLanguage.tsx b/src/screens/Tabs/Me/SettingsLanguage.tsx
index a6e6d1c2..01520ea6 100644
--- a/src/screens/Tabs/Me/SettingsLanguage.tsx
+++ b/src/screens/Tabs/Me/SettingsLanguage.tsx
@@ -41,7 +41,7 @@ const TabMeSettingsLanguage: React.FC<TabMeStackScreenProps<'Tab-Me-Settings-Lan
           <MenuRow
             key={item[0]}
             title={item[1]}
-            iconBack={item[0] === i18n.language ? 'Check' : undefined}
+            iconBack={item[0] === i18n.language ? 'check' : undefined}
             iconBackColor={'blue'}
             onPress={() => item[0] !== i18n.language && change(item[0])}
           />
diff --git a/src/screens/Tabs/Me/Switch.tsx b/src/screens/Tabs/Me/Switch.tsx
index efa38aa6..e87af9bb 100644
--- a/src/screens/Tabs/Me/Switch.tsx
+++ b/src/screens/Tabs/Me/Switch.tsx
@@ -1,12 +1,13 @@
 import AccountButton from '@components/AccountButton'
 import ComponentInstance from '@components/Instance'
+import { ModalScrollView } from '@components/ModalScrollView'
 import CustomText from '@components/Text'
 import { getReadableAccounts } from '@utils/storage/actions'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { KeyboardAvoidingView, Platform, View } from 'react-native'
+import { View } from 'react-native'
 import { ScrollView } from 'react-native-gesture-handler'
 
 const TabMeSwitch: React.FC = () => {
@@ -20,63 +21,53 @@ const TabMeSwitch: React.FC = () => {
   }, [scrollViewRef.current])
 
   return (
-    <KeyboardAvoidingView
-      style={{ flex: 1 }}
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-    >
-      <ScrollView
-        ref={scrollViewRef}
-        style={{ marginBottom: StyleConstants.Spacing.L * 2 }}
-        keyboardShouldPersistTaps='always'
-      >
-        <View>
-          <CustomText
-            fontStyle='M'
-            style={{
-              textAlign: 'center',
-              paddingVertical: StyleConstants.Spacing.S,
-              color: colors.primaryDefault
-            }}
-          >
-            {t('me.switch.new')}
-          </CustomText>
-          <ComponentInstance scrollViewRef={scrollViewRef} disableHeaderImage goBack />
-        </View>
-
-        <View
+    <ModalScrollView>
+      <View>
+        <CustomText
+          fontStyle='M'
           style={{
-            marginTop: StyleConstants.Spacing.S,
-            paddingTop: StyleConstants.Spacing.M,
-            marginHorizontal: StyleConstants.Spacing.Global.PagePadding,
-            borderTopWidth: 1,
-            borderTopColor: colors.border
+            textAlign: 'center',
+            paddingVertical: StyleConstants.Spacing.S,
+            color: colors.primaryDefault
           }}
         >
-          <CustomText
-            fontStyle='M'
-            style={{
-              textAlign: 'center',
-              paddingVertical: StyleConstants.Spacing.S,
-              color: colors.primaryDefault
-            }}
-          >
-            {t('me.switch.existing')}
-          </CustomText>
-          <View
-            style={{
-              flex: 1,
-              flexDirection: 'row',
-              flexWrap: 'wrap',
-              marginTop: StyleConstants.Spacing.M
-            }}
-          >
-            {accounts.map((account, index) => {
-              return <AccountButton key={index} account={account} />
-            })}
-          </View>
+          {t('me.switch.new')}
+        </CustomText>
+        <ComponentInstance scrollViewRef={scrollViewRef} disableHeaderImage goBack />
+      </View>
+
+      <View
+        style={{
+          marginTop: StyleConstants.Spacing.S,
+          paddingTop: StyleConstants.Spacing.M,
+          borderTopWidth: 1,
+          borderTopColor: colors.border
+        }}
+      >
+        <CustomText
+          fontStyle='M'
+          style={{
+            textAlign: 'center',
+            paddingVertical: StyleConstants.Spacing.S,
+            color: colors.primaryDefault
+          }}
+        >
+          {t('me.switch.existing')}
+        </CustomText>
+        <View
+          style={{
+            flex: 1,
+            flexDirection: 'row',
+            flexWrap: 'wrap',
+            marginTop: StyleConstants.Spacing.M
+          }}
+        >
+          {accounts.map((account, index) => {
+            return <AccountButton key={index} account={account} />
+          })}
         </View>
-      </ScrollView>
-    </KeyboardAvoidingView>
+      </View>
+    </ModalScrollView>
   )
 }
 
diff --git a/src/screens/Tabs/Me/index.tsx b/src/screens/Tabs/Me/index.tsx
index abe30908..bd10f706 100644
--- a/src/screens/Tabs/Me/index.tsx
+++ b/src/screens/Tabs/Me/index.tsx
@@ -12,6 +12,7 @@ import TabMeList from './List'
 import TabMeListAccounts from './List/Accounts'
 import TabMeListEdit from './List/Edit'
 import TabMeListList from './List/List'
+import TabMePreferences from './Preferences'
 import TabMeProfile from './Profile'
 import TabMePush from './Push'
 import TabMeRoot from './Root'
@@ -100,13 +101,15 @@ const TabMe: React.FC = () => {
           headerLeft: () => <HeaderLeft onPress={() => navigation.pop(1)} />
         })}
       />
+      <Stack.Screen
+        name='Tab-Me-Preferences'
+        component={TabMePreferences}
+        options={{ headerShown: false, presentation: 'modal' }}
+      />
       <Stack.Screen
         name='Tab-Me-Profile'
         component={TabMeProfile}
-        options={{
-          headerShown: false,
-          presentation: 'modal'
-        }}
+        options={{ headerShown: false, presentation: 'modal' }}
       />
       <Stack.Screen
         name='Tab-Me-Push'
@@ -147,7 +150,9 @@ const TabMe: React.FC = () => {
           presentation: 'modal',
           headerShown: true,
           title: t('me.stacks.switch.name'),
-          headerLeft: () => <HeaderLeft content='ChevronDown' onPress={() => navigation.goBack()} />
+          headerLeft: () => (
+            <HeaderLeft content='chevron-down' onPress={() => navigation.goBack()} />
+          )
         })}
       />
 
diff --git a/src/screens/Tabs/Notifications/Filters.tsx b/src/screens/Tabs/Notifications/Filters.tsx
index acd62db6..fb80a7e0 100644
--- a/src/screens/Tabs/Notifications/Filters.tsx
+++ b/src/screens/Tabs/Notifications/Filters.tsx
@@ -26,7 +26,7 @@ const TabNotificationsFilters: React.FC<
       title: t('screenTabs:notifications.filters.title'),
       headerLeft: () => (
         <HeaderLeft
-          content='ChevronDown'
+          content='chevron-down'
           onPress={() => {
             if (changed) {
               Alert.alert(t('common:discard.title'), t('common:discard.message'), [
diff --git a/src/screens/Tabs/Notifications/index.tsx b/src/screens/Tabs/Notifications/index.tsx
index 06d1688b..a3b93d09 100644
--- a/src/screens/Tabs/Notifications/index.tsx
+++ b/src/screens/Tabs/Notifications/index.tsx
@@ -25,7 +25,7 @@ const Root: React.FC<
         <HeaderRight
           accessibilityLabel={t('notifications.filters.accessibilityLabel')}
           accessibilityHint={t('notifications.filters.accessibilityHint')}
-          content='Filter'
+          content='filter'
           onPress={() => navigation.navigate('Tab-Notifications-Filters')}
         />
       )
diff --git a/src/screens/Tabs/Public/Root.tsx b/src/screens/Tabs/Public/Root.tsx
index b24929c6..77339868 100644
--- a/src/screens/Tabs/Public/Root.tsx
+++ b/src/screens/Tabs/Public/Root.tsx
@@ -64,7 +64,7 @@ const Root: React.FC<NativeStackScreenProps<TabPublicStackParamList, 'Tab-Public
         <HeaderRight
           accessibilityLabel={t('common.search.accessibilityLabel')}
           accessibilityHint={t('common.search.accessibilityHint')}
-          content='Search'
+          content='search'
           onPress={() => navigation.navigate('Tab-Shared-Search')}
         />
       )
diff --git a/src/screens/Tabs/Shared/Account/Attachments.tsx b/src/screens/Tabs/Shared/Account/Attachments.tsx
index 7387ffe0..42313cda 100644
--- a/src/screens/Tabs/Shared/Account/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Account/Attachments.tsx
@@ -70,7 +70,7 @@ const AccountAttachments: React.FC = () => {
                     }}
                     children={
                       <Icon
-                        name='MoreHorizontal'
+                        name='more-horizontal'
                         color={colors.primaryOverlay}
                         size={StyleConstants.Font.Size.L * 1.5}
                       />
diff --git a/src/screens/Tabs/Shared/Account/Information/Account.tsx b/src/screens/Tabs/Shared/Account/Information/Account.tsx
index 1f8c191f..a101008d 100644
--- a/src/screens/Tabs/Shared/Account/Information/Account.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Account.tsx
@@ -50,7 +50,7 @@ const AccountInformationAccount: React.FC = () => {
         </CustomText>
         {account?.locked ? (
           <Icon
-            name='Lock'
+            name='lock'
             style={{ marginLeft: StyleConstants.Spacing.S }}
             color={colors.secondary}
             size={StyleConstants.Font.Size.M}
@@ -58,7 +58,7 @@ const AccountInformationAccount: React.FC = () => {
         ) : null}
         {account?.bot ? (
           <Icon
-            name='HardDrive'
+            name='hard-drive'
             style={{ marginLeft: StyleConstants.Spacing.S }}
             color={colors.secondary}
             size={StyleConstants.Font.Size.M}
diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
index c1109ddf..4291cfeb 100644
--- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
@@ -42,6 +42,16 @@ const AccountInformationActions: React.FC = () => {
           content={t('me.stacks.profile.name')}
           onPress={() => navigation.navigate('Tab-Me-Profile')}
         />
+        <Button
+          round
+          type='icon'
+          disabled={account === undefined}
+          content='sliders'
+          style={{ marginLeft: StyleConstants.Spacing.S }}
+          onPress={() =>
+            navigation.navigate('Tab-Me-Preferences', { screen: 'Tab-Me-Preferences-Root' })
+          }
+        />
       </View>
     )
   }
@@ -60,8 +70,8 @@ const AccountInformationActions: React.FC = () => {
               <Button
                 round
                 type='icon'
-                content='AtSign'
-                style={{ marginRight: StyleConstants.Spacing.S }}
+                content='at-sign'
+                style={{ flex: 1, marginRight: StyleConstants.Spacing.S }}
                 onPress={() => {}}
               />
             </DropdownMenu.Trigger>
@@ -119,7 +129,7 @@ const styles = StyleSheet.create({
   base: {
     alignSelf: 'flex-end',
     flexDirection: 'row',
-    alignItems: 'center'
+    alignItems: 'stretch'
   }
 })
 
diff --git a/src/screens/Tabs/Shared/Account/Information/Created.tsx b/src/screens/Tabs/Shared/Account/Information/Created.tsx
index 5ecaeff0..ad63e9f0 100644
--- a/src/screens/Tabs/Shared/Account/Information/Created.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Created.tsx
@@ -30,7 +30,7 @@ const AccountInformationCreated: React.FC = () => {
         }}
       >
         <Icon
-          name='Calendar'
+          name='calendar'
           size={StyleConstants.Font.Size.S}
           color={colors.secondary}
           style={{ marginRight: StyleConstants.Spacing.XS }}
diff --git a/src/screens/Tabs/Shared/Account/index.tsx b/src/screens/Tabs/Shared/Account/index.tsx
index 15d8bb89..1e5f542d 100644
--- a/src/screens/Tabs/Shared/Account/index.tsx
+++ b/src/screens/Tabs/Shared/Account/index.tsx
@@ -87,7 +87,7 @@ const TabSharedAccount: React.FC<TabSharedStackScreenProps<'Tab-Shared-Account'>
                   user: account.acct
                 })}
                 accessibilityHint={t('shared.account.actions.accessibilityHint')}
-                content='MoreHorizontal'
+                content='more-horizontal'
                 onPress={() => {}}
                 background
               />
diff --git a/src/screens/Tabs/Shared/AccountInLists.tsx b/src/screens/Tabs/Shared/AccountInLists.tsx
index 87cc427c..7e93c110 100644
--- a/src/screens/Tabs/Shared/AccountInLists.tsx
+++ b/src/screens/Tabs/Shared/AccountInLists.tsx
@@ -27,15 +27,13 @@ const TabSharedAccountInLists: React.FC<
     navigation.setOptions({
       presentation: 'modal',
       title: t('screenTabs:shared.accountInLists.name', { username: account.username }),
-      headerRight: () => {
-        return (
-          <HeaderRight
-            type='text'
-            content={t('common:buttons.done')}
-            onPress={() => navigation.pop(1)}
-          />
-        )
-      }
+      headerRight: () => (
+        <HeaderRight
+          type='text'
+          content={t('common:buttons.done')}
+          onPress={() => navigation.pop(1)}
+        />
+      )
     })
   }, [])
 
@@ -66,11 +64,11 @@ const TabSharedAccountInLists: React.FC<
     <SectionList
       style={{ padding: StyleConstants.Spacing.Global.PagePadding }}
       sections={sections}
-      SectionSeparatorComponent={props => {
-        return props.leadingItem && props.trailingSection ? (
-          <View style={{ flex: 1, height: StyleConstants.Spacing.Global.PagePadding * 2 }} />
+      SectionSeparatorComponent={props =>
+        props.leadingItem && props.trailingSection ? (
+          <View style={{ height: StyleConstants.Spacing.XL }} />
         ) : null
-      }}
+      }
       renderSectionHeader={({ section: { title, data } }) =>
         data.length ? (
           <CustomText fontStyle='S' style={{ color: colors.secondary }} children={title} />
@@ -79,11 +77,11 @@ const TabSharedAccountInLists: React.FC<
       renderItem={({ index, item, section }) => (
         <MenuRow
           key={index}
-          iconFront='List'
+          iconFront='list'
           content={
             <Button
               type='icon'
-              content={section.id === 'in' ? 'Minus' : 'Plus'}
+              content={section.id === 'in' ? 'minus' : 'plus'}
               round
               disabled={accountInListsQuery.isFetching}
               onPress={() => {
@@ -117,7 +115,7 @@ const TabSharedAccountInLists: React.FC<
           title={item.title}
         />
       )}
-    ></SectionList>
+    />
   )
 }
 
diff --git a/src/screens/Tabs/Shared/Attachments.tsx b/src/screens/Tabs/Shared/Attachments.tsx
index d6f5cdd5..b9f100e2 100644
--- a/src/screens/Tabs/Shared/Attachments.tsx
+++ b/src/screens/Tabs/Shared/Attachments.tsx
@@ -38,7 +38,8 @@ const TabSharedAttachments: React.FC<TabSharedStackScreenProps<'Tab-Shared-Attac
             ]}
           />
         </CustomText>
-      )
+      ),
+      headerBackVisible: false
     })
     navigation.setParams({ queryKey })
   }, [])
diff --git a/src/screens/Tabs/Shared/Filter.tsx b/src/screens/Tabs/Shared/Filter.tsx
new file mode 100644
index 00000000..ab152591
--- /dev/null
+++ b/src/screens/Tabs/Shared/Filter.tsx
@@ -0,0 +1,132 @@
+import Button from '@components/Button'
+import { Filter } from '@components/Filter'
+import { HeaderRight } from '@components/Header'
+import Hr from '@components/Hr'
+import CustomText from '@components/Text'
+import { featureCheck } from '@utils/helpers/featureCheck'
+import { TabSharedStackScreenProps, useNavState } from '@utils/navigation/navigators'
+import { useFilterMutation, useFiltersQuery } from '@utils/queryHooks/filters'
+import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import React, { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+import { SectionList, View } from 'react-native'
+
+const TabSharedFilter: React.FC<TabSharedStackScreenProps<'Tab-Shared-Filter'>> = ({
+  navigation,
+  route: { params }
+}) => {
+  if (!featureCheck('filter_server_side')) {
+    navigation.goBack()
+    return null
+  }
+
+  const { colors } = useTheme()
+  const { t } = useTranslation(['common', 'screenTabs'])
+
+  useEffect(() => {
+    navigation.setOptions({
+      title: t('screenTabs:shared.filter.name'),
+      headerRight: () => (
+        <HeaderRight
+          type='text'
+          content={t('common:buttons.done')}
+          onPress={() => navigation.goBack()}
+        />
+      )
+    })
+  }, [])
+
+  const { data, isFetching, refetch } = useFiltersQuery<'v2'>({ version: 'v2' })
+  const sections = [
+    {
+      id: 'add',
+      data:
+        data?.filter(filter => {
+          switch (params.source) {
+            case 'hashtag':
+              return !filter.keywords.find(keyword => keyword.keyword === `#${params.tag_name}`)
+            case 'status':
+              return !filter.statuses.find(({ status_id }) => status_id === params.status.id)
+          }
+        }) || []
+    },
+    {
+      id: 'remove',
+      title: t('screenTabs:shared.filter.existed'),
+      data:
+        data?.filter(filter => {
+          switch (params.source) {
+            case 'hashtag':
+              return !!filter.keywords.find(keyword => keyword.keyword === `#${params.tag_name}`)
+            case 'status':
+              return !!filter.statuses.find(({ status_id }) => status_id === params.status.id)
+          }
+        }) || []
+    }
+  ]
+
+  const mutation = useFilterMutation()
+
+  const navState = useNavState()
+
+  return (
+    <SectionList
+      contentContainerStyle={{ padding: StyleConstants.Spacing.Global.PagePadding }}
+      sections={sections}
+      SectionSeparatorComponent={props =>
+        props.leadingItem && props.trailingSection ? (
+          <View style={{ height: StyleConstants.Spacing.XL }} />
+        ) : null
+      }
+      renderSectionHeader={({ section: { title, data } }) =>
+        title && data.length ? (
+          <CustomText fontStyle='S' style={{ color: colors.secondary }} children={title} />
+        ) : null
+      }
+      ItemSeparatorComponent={Hr}
+      renderItem={({ item, section }) => (
+        <Filter
+          filter={item}
+          button={
+            <Button
+              type='icon'
+              content={section.id === 'add' ? 'plus' : 'minus'}
+              round
+              disabled={isFetching}
+              onPress={() => {
+                if (section.id === 'add' || section.id === 'remove') {
+                  switch (params.source) {
+                    case 'status':
+                      mutation
+                        .mutateAsync({
+                          source: 'status',
+                          filter: item,
+                          action: section.id,
+                          status: params.status
+                        })
+                        .then(() => refetch())
+                      break
+                    case 'hashtag':
+                      mutation
+                        .mutateAsync({
+                          source: 'keyword',
+                          filter: item,
+                          action: section.id,
+                          keyword: `#${params.tag_name}`
+                        })
+                        .then(() => refetch())
+                      break
+                  }
+                }
+              }}
+            />
+          }
+          onPress={() => {}}
+        />
+      )}
+    />
+  )
+}
+
+export default TabSharedFilter
diff --git a/src/screens/Tabs/Shared/Hashtag.tsx b/src/screens/Tabs/Shared/Hashtag.tsx
index 149459f0..6a1d3f58 100644
--- a/src/screens/Tabs/Shared/Hashtag.tsx
+++ b/src/screens/Tabs/Shared/Hashtag.tsx
@@ -1,85 +1,69 @@
-import haptics from '@components/haptics'
+import menuHashtag from '@components/contextMenu/hashtag'
 import { HeaderLeft, HeaderRight } from '@components/Header'
-import { displayMessage } from '@components/Message'
 import Timeline from '@components/Timeline'
-import { useQueryClient } from '@tanstack/react-query'
 import { featureCheck } from '@utils/helpers/featureCheck'
 import { TabSharedStackScreenProps } from '@utils/navigation/navigators'
-import { QueryKeyFollowedTags, useTagsMutation, useTagsQuery } from '@utils/queryHooks/tags'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
-import React, { useEffect } from 'react'
-import { useTranslation } from 'react-i18next'
+import React, { Fragment, useEffect } from 'react'
+import * as DropdownMenu from 'zeego/dropdown-menu'
 
 const TabSharedHashtag: React.FC<TabSharedStackScreenProps<'Tab-Shared-Hashtag'>> = ({
   navigation,
   route: {
-    params: { hashtag }
+    params: { tag_name }
   }
 }) => {
-  const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Hashtag', hashtag }]
+  const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Hashtag', tag_name }]
+
+  const canFollowTags = featureCheck('follow_tags')
+  const canFilterTag = featureCheck('filter_server_side')
+  const mHashtag = menuHashtag({ tag_name, queryKey })
 
   useEffect(() => {
     navigation.setOptions({
       headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
-      title: `#${decodeURIComponent(hashtag)}`
+      title: `#${decodeURIComponent(tag_name)}`
     })
     navigation.setParams({ queryKey: queryKey })
   }, [])
 
-  const { t } = useTranslation(['common', 'screenTabs'])
-
-  const canFollowTags = featureCheck('follow_tags')
-  const { data, isFetching, refetch } = useTagsQuery({
-    tag: hashtag,
-    options: { enabled: canFollowTags }
-  })
-  const queryClient = useQueryClient()
-  const mutation = useTagsMutation({
-    onSuccess: () => {
-      haptics('Success')
-      refetch()
-      const queryKeyFollowedTags: QueryKeyFollowedTags = ['FollowedTags']
-      queryClient.invalidateQueries({ queryKey: queryKeyFollowedTags })
-    },
-    onError: (err: any, { to }) => {
-      displayMessage({
-        type: 'error',
-        message: t('common:message.error.message', {
-          function: to
-            ? t('screenTabs:shared.hashtag.follow')
-            : t('screenTabs:shared.hashtag.unfollow')
-        }),
-        ...(err.status &&
-          typeof err.status === 'number' &&
-          err.data &&
-          err.data.error &&
-          typeof err.data.error === 'string' && {
-            description: err.data.error
-          })
-      })
-    }
-  })
   useEffect(() => {
-    if (!canFollowTags) return
+    if (!canFollowTags && !canFilterTag) return
 
     navigation.setOptions({
       headerRight: () => (
-        <HeaderRight
-          loading={isFetching || mutation.isLoading}
-          type='text'
-          content={
-            data?.following
-              ? t('screenTabs:shared.hashtag.unfollow')
-              : t('screenTabs:shared.hashtag.follow')
-          }
-          onPress={() =>
-            typeof data?.following === 'boolean' &&
-            mutation.mutate({ tag: hashtag, to: !data.following })
-          }
-        />
+        <DropdownMenu.Root>
+          <DropdownMenu.Trigger>
+            <HeaderRight content='more-horizontal' onPress={() => {}} />
+          </DropdownMenu.Trigger>
+
+          <DropdownMenu.Content>
+            {[mHashtag].map((menu, i) => (
+              <Fragment key={i}>
+                {menu.map((group, index) => (
+                  <DropdownMenu.Group key={index}>
+                    {group.map(item => {
+                      switch (item.type) {
+                        case 'item':
+                          return (
+                            <DropdownMenu.Item key={item.key} {...item.props}>
+                              <DropdownMenu.ItemTitle children={item.title} />
+                              {item.icon ? (
+                                <DropdownMenu.ItemIcon ios={{ name: item.icon }} />
+                              ) : null}
+                            </DropdownMenu.Item>
+                          )
+                      }
+                    })}
+                  </DropdownMenu.Group>
+                ))}
+              </Fragment>
+            ))}
+          </DropdownMenu.Content>
+        </DropdownMenu.Root>
       )
     })
-  }, [canFollowTags, data?.following, isFetching])
+  }, [mHashtag])
 
   return <Timeline queryKey={queryKey} />
 }
diff --git a/src/screens/Tabs/Shared/History.tsx b/src/screens/Tabs/Shared/History.tsx
index 72d51762..fdfc4720 100644
--- a/src/screens/Tabs/Shared/History.tsx
+++ b/src/screens/Tabs/Shared/History.tsx
@@ -103,7 +103,7 @@ const ContentView: React.FC<{
                   paddingTop: StyleConstants.Font.LineHeight.M - StyleConstants.Font.Size.M,
                   marginRight: StyleConstants.Spacing.S
                 }}
-                name={item.poll?.multiple ? 'Square' : 'Circle'}
+                name={item.poll?.multiple ? 'square' : 'circle'}
                 size={StyleConstants.Font.Size.M}
                 color={
                   prevItem?.poll?.multiple !== item.poll?.multiple ? colors.red : colors.disabled
diff --git a/src/screens/Tabs/Shared/Report.tsx b/src/screens/Tabs/Shared/Report.tsx
index 78c2a770..30438fbb 100644
--- a/src/screens/Tabs/Shared/Report.tsx
+++ b/src/screens/Tabs/Shared/Report.tsx
@@ -1,5 +1,6 @@
 import ComponentAccount from '@components/Account'
 import { HeaderLeft, HeaderRight } from '@components/Header'
+import { ModalScrollView } from '@components/ModalScrollView'
 import Selections from '@components/Selections'
 import CustomText from '@components/Text'
 import apiInstance from '@utils/api/instance'
@@ -11,7 +12,7 @@ import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Platform, ScrollView, TextInput, View } from 'react-native'
+import { Platform, TextInput, View } from 'react-native'
 import { Switch } from 'react-native-gesture-handler'
 
 const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>> = ({
@@ -96,7 +97,7 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
   }, [rulesQuery.data])
 
   return (
-    <ScrollView>
+    <ModalScrollView>
       <View
         style={{
           margin: StyleConstants.Spacing.Global.PagePadding,
@@ -125,7 +126,11 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
           >
             <CustomText
               fontStyle='M'
-              style={{ color: colors.primaryDefault, paddingRight: StyleConstants.Spacing.M }}
+              style={{
+                flex: 1,
+                color: colors.primaryDefault,
+                paddingRight: StyleConstants.Spacing.M
+              }}
               numberOfLines={2}
             >
               {t('screenTabs:shared.report.forward.heading', {
@@ -140,15 +145,11 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
           </View>
         ) : null}
 
-        <CustomText
-          fontStyle='M'
-          style={{ color: colors.primaryDefault, marginBottom: StyleConstants.Spacing.S }}
-        >
-          {t('screenTabs:shared.report.reasons.heading')}
-        </CustomText>
-        <View style={{ marginLeft: StyleConstants.Spacing.M }}>
-          <Selections options={categories} setOptions={setCategories} />
-        </View>
+        <Selections
+          title={t('screenTabs:shared.report.reasons.heading')}
+          options={categories}
+          setOptions={setCategories}
+        />
 
         {categories[1].selected || comment.length ? (
           <>
@@ -200,29 +201,16 @@ const TabSharedReport: React.FC<TabSharedStackScreenProps<'Tab-Shared-Report'>>
         ) : null}
 
         {rules.length ? (
-          <>
-            <CustomText
-              fontStyle='M'
-              style={{
-                color: categories[2].selected ? colors.primaryDefault : colors.disabled,
-                marginTop: StyleConstants.Spacing.M,
-                marginBottom: StyleConstants.Spacing.S
-              }}
-            >
-              {t('screenTabs:shared.report.violatedRules.heading')}
-            </CustomText>
-            <View style={{ marginLeft: StyleConstants.Spacing.M }}>
-              <Selections
-                disabled={!categories[2].selected}
-                multiple
-                options={rules}
-                setOptions={setRules}
-              />
-            </View>
-          </>
+          <Selections
+            title={t('screenTabs:shared.report.violatedRules.heading')}
+            disabled={!categories[2].selected}
+            multiple
+            options={rules}
+            setOptions={setRules}
+          />
         ) : null}
       </View>
-    </ScrollView>
+    </ModalScrollView>
   )
 }
 
diff --git a/src/screens/Tabs/Shared/Search/index.tsx b/src/screens/Tabs/Shared/Search/index.tsx
index d06e239e..d3ea5e1e 100644
--- a/src/screens/Tabs/Shared/Search/index.tsx
+++ b/src/screens/Tabs/Shared/Search/index.tsx
@@ -24,11 +24,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
   const [searchTerm, setSearchTerm] = useState<string>('')
   useEffect(() => {
     navigation.setOptions({
-      ...(Platform.OS === 'ios'
-        ? {
-            headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
-          }
-        : { headerLeft: () => null }),
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
       headerTitle: () => {
         return (
           <View
@@ -77,7 +73,8 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
             />
           </View>
         )
-      }
+      },
+      headerBackVisible: false
     })
   }, [mode])
   useEffect(() => {
diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx
index 6210521c..99af54bf 100644
--- a/src/screens/Tabs/Shared/Toot.tsx
+++ b/src/screens/Tabs/Shared/Toot.tsx
@@ -51,7 +51,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
         >
           {hasRemoteContent ? (
             <Icon
-              name='Wifi'
+              name='wifi'
               size={StyleConstants.Font.Size.M}
               color={colors.primaryDefault}
               style={{ marginRight: StyleConstants.Spacing.S }}
@@ -66,7 +66,8 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
           />
         </Pressable>
       ),
-      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />
+      headerLeft: () => <HeaderLeft onPress={() => navigation.goBack()} />,
+      headerBackVisible: false
     })
     navigation.setParams({ toot, queryKey: queryKey.local })
   }, [hasRemoteContent])
@@ -306,14 +307,62 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
   return (
     <FlatList
       ref={flRef}
-      scrollEventThrottle={16}
-      windowSize={7}
+      windowSize={5}
       data={query.data?.pages?.[0].body}
       renderItem={({ item, index }) => {
         const prev = query.data?.pages[0].body[index - 1]?._level || 0
         const curr = item._level || 0
         const next = query.data?.pages[0].body[index + 1]?._level || 0
 
+        const height = heights[index] || 300
+        let path = ''
+
+        if (curr > 1 || next > 1) {
+          Array.from({ length: curr }).forEach((_, i) => {
+            if (i > MAX_LEVEL) return null
+
+            const lastLine = curr === i + 1
+            if (lastLine) {
+              if (curr === prev + 1 || curr === next - 1) {
+                if (curr > next) return
+
+                path =
+                  path +
+                  ` M ${curr * StyleConstants.Spacing.S + ARC} ${
+                    StyleConstants.Spacing.M + StyleConstants.Avatar.XS / 2
+                  } ` +
+                  `a ${ARC} ${ARC} 0 0 0 -${ARC} ${ARC} ` +
+                  `v ${height}`
+              } else {
+                if (i >= curr - 2) return
+
+                path =
+                  path +
+                  ` M ${(i + 1) * StyleConstants.Spacing.S} 0 ` +
+                  `v ${
+                    height -
+                    (StyleConstants.Spacing.S * 1.5 + StyleConstants.Font.Size.L) / 2 -
+                    StyleConstants.Avatar.XS / 2
+                  } ` +
+                  `a ${ARC} ${ARC} 0 0 0 ${ARC} ${ARC}`
+              }
+            } else {
+              if (i >= next - 1) {
+                path =
+                  path +
+                  ` M ${(i + 1) * StyleConstants.Spacing.S} 0 ` +
+                  `v ${
+                    height -
+                    (StyleConstants.Spacing.S * 1.5 + StyleConstants.Font.Size.L * 1.35) / 2
+                  } ` +
+                  `h ${ARC}`
+              } else {
+                path = path + ` M ${(i + 1) * StyleConstants.Spacing.S} 0 ` + `v ${height}`
+              }
+            }
+          })
+        }
+
         return (
           <View
             style={{ paddingLeft: Math.min(curr - 1, MAX_LEVEL) * StyleConstants.Spacing.S }}
@@ -323,89 +372,11 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
               }
             }) => setHeights({ ...heights, [index]: height })}
           >
-            {curr > 1 || next > 1
-              ? [...new Array(curr)].map((_, i) => {
-                  if (i > MAX_LEVEL) return null
-
-                  const lastLine = curr === i + 1
-                  if (lastLine) {
-                    if (curr === prev + 1 || curr === next - 1) {
-                      if (curr > next) {
-                        return null
-                      }
-                      return (
-                        <Svg key={i} style={{ position: 'absolute' }}>
-                          <Path
-                            d={
-                              `M ${curr * StyleConstants.Spacing.S + ARC} ${
-                                StyleConstants.Spacing.M + StyleConstants.Avatar.XS / 2
-                              } ` +
-                              `a ${ARC} ${ARC} 0 0 0 -${ARC} ${ARC} ` +
-                              `v 999`
-                            }
-                            strokeWidth={1}
-                            stroke={colors.border}
-                            strokeOpacity={0.6}
-                          />
-                        </Svg>
-                      )
-                    } else {
-                      if (i >= curr - 2) return null
-                      return (
-                        <Svg key={i} style={{ position: 'absolute' }}>
-                          <Path
-                            d={
-                              `M ${(i + 1) * StyleConstants.Spacing.S} 0 ` +
-                              `v ${
-                                (heights[index] || 999) -
-                                (StyleConstants.Spacing.S * 1.5 + StyleConstants.Font.Size.L) / 2 -
-                                StyleConstants.Avatar.XS / 2
-                              } ` +
-                              `a ${ARC} ${ARC} 0 0 0 ${ARC} ${ARC}`
-                            }
-                            strokeWidth={1}
-                            stroke={colors.border}
-                            strokeOpacity={0.6}
-                          />
-                        </Svg>
-                      )
-                    }
-                  } else {
-                    if (i >= next - 1) {
-                      return (
-                        <Svg key={i} style={{ position: 'absolute' }}>
-                          <Path
-                            d={
-                              `M ${(i + 1) * StyleConstants.Spacing.S} 0 ` +
-                              `v ${
-                                (heights[index] || 999) -
-                                (StyleConstants.Spacing.S * 1.5 +
-                                  StyleConstants.Font.Size.L * 1.35) /
-                                  2
-                              } ` +
-                              `h ${ARC}`
-                            }
-                            strokeWidth={1}
-                            stroke={colors.border}
-                            strokeOpacity={0.6}
-                          />
-                        </Svg>
-                      )
-                    } else {
-                      return (
-                        <Svg key={i} style={{ position: 'absolute' }}>
-                          <Path
-                            d={`M ${(i + 1) * StyleConstants.Spacing.S} 0 ` + `v 999`}
-                            strokeWidth={1}
-                            stroke={colors.border}
-                            strokeOpacity={0.6}
-                          />
-                        </Svg>
-                      )
-                    }
-                  }
-                })
-              : null}
+            {path.length ? (
+              <Svg style={{ position: 'absolute' }} fill='none'>
+                <Path d={path} strokeWidth={1} stroke={colors.border} strokeOpacity={0.6} />
+              </Svg>
+            ) : null}
             <TimelineDefault
               item={item}
               queryKey={item._remote ? queryKey.remote : queryKey.local}
@@ -428,7 +399,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
           </View>
         )
       }}
-      initialNumToRender={6}
+      initialNumToRender={3}
       maxToRenderPerBatch={3}
       ItemSeparatorComponent={({ leadingItem }) => {
         return (
diff --git a/src/screens/Tabs/Shared/Users.tsx b/src/screens/Tabs/Shared/Users.tsx
index b2994a6e..f0c4f71f 100644
--- a/src/screens/Tabs/Shared/Users.tsx
+++ b/src/screens/Tabs/Shared/Users.tsx
@@ -115,7 +115,7 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
             }}
           >
             <Icon
-              name='AlertCircle'
+              name='alert-circle'
               color={colors.secondary}
               size={StyleConstants.Font.Size.M}
               style={{ marginRight: StyleConstants.Spacing.S }}
diff --git a/src/screens/Tabs/Shared/index.tsx b/src/screens/Tabs/Shared/index.tsx
index 7ae62d84..50fd33a9 100644
--- a/src/screens/Tabs/Shared/index.tsx
+++ b/src/screens/Tabs/Shared/index.tsx
@@ -9,6 +9,7 @@ import TabSharedSearch from '@screens/Tabs/Shared/Search'
 import TabSharedToot from '@screens/Tabs/Shared/Toot'
 import TabSharedUsers from '@screens/Tabs/Shared/Users'
 import React from 'react'
+import TabSharedFilter from './Filter'
 
 const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNavigator> }) => {
   return (
@@ -28,6 +29,12 @@ const TabShared = ({ Stack }: { Stack: ReturnType<typeof createNativeStackNaviga
         name='Tab-Shared-Attachments'
         component={TabSharedAttachments}
       />
+      <Stack.Screen
+        key='Tab-Shared-Filter'
+        name='Tab-Shared-Filter'
+        component={TabSharedFilter}
+        options={{ presentation: 'modal' }}
+      />
       <Stack.Screen
         key='Tab-Shared-Hashtag'
         name='Tab-Shared-Hashtag'
diff --git a/src/screens/Tabs/index.tsx b/src/screens/Tabs/index.tsx
index fbfe1236..2f1505aa 100644
--- a/src/screens/Tabs/index.tsx
+++ b/src/screens/Tabs/index.tsx
@@ -41,13 +41,13 @@ const ScreenTabs = ({ navigation }: RootStackScreenProps<'Screen-Tabs'>) => {
         }) => {
           switch (route.name) {
             case 'Tab-Local':
-              return <Icon name='Home' size={size} color={color} />
+              return <Icon name='home' size={size} color={color} />
             case 'Tab-Public':
-              return <Icon name='Globe' size={size} color={color} />
+              return <Icon name='globe' size={size} color={color} />
             case 'Tab-Compose':
-              return <Icon name='Plus' size={size} color={color} />
+              return <Icon name='plus' size={size} color={color} />
             case 'Tab-Notifications':
-              return <Icon name='Bell' size={size} color={color} />
+              return <Icon name='bell' size={size} color={color} />
             case 'Tab-Me':
               return (
                 <GracefullyImage
@@ -65,7 +65,7 @@ const ScreenTabs = ({ navigation }: RootStackScreenProps<'Screen-Tabs'>) => {
                 />
               )
             default:
-              return <Icon name='AlertOctagon' size={size} color={color} />
+              return <Icon name='alert-octagon' size={size} color={color} />
           }
         }
       })}
diff --git a/src/screens/index.tsx b/src/screens/index.tsx
index ce9e6538..f39c0e15 100644
--- a/src/screens/index.tsx
+++ b/src/screens/index.tsx
@@ -248,7 +248,7 @@ const Screens: React.FC = () => {
               headerShadowVisible: false,
               headerTransparent: true,
               headerStyle: { backgroundColor: 'transparent' },
-              headerLeft: () => <HeaderLeft content='X' onPress={() => navigation.goBack()} />,
+              headerLeft: () => <HeaderLeft content='x' onPress={() => navigation.goBack()} />,
               title: t('screenAnnouncements:heading')
             })}
           />
diff --git a/src/utils/api/general.ts b/src/utils/api/general.ts
index b313f7bb..6994c42b 100644
--- a/src/utils/api/general.ts
+++ b/src/utils/api/general.ts
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
+import { ctx, handleError, PagedResponse, parseHeaderLinks, processBody, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -39,15 +39,11 @@ const apiGeneral = async <T = unknown>({
     url,
     params,
     headers: {
-      'Content-Type': body && body instanceof FormData ? 'multipart/form-data' : 'application/json',
-      Accept: '*/*',
+      Accept: 'application/json',
       ...userAgent,
       ...headers
     },
-    ...(body &&
-      (body instanceof FormData
-        ? (body as (FormData & { _parts: [][] }) | undefined)?._parts?.length
-        : Object.keys(body).length) && { data: body })
+    data: processBody(body)
   })
     .then(response => ({ body: response.data, links: parseHeaderLinks(response.headers.link) }))
     .catch(handleError())
diff --git a/src/utils/api/helpers/index.ts b/src/utils/api/helpers/index.ts
index 5f5999a0..596410ae 100644
--- a/src/utils/api/helpers/index.ts
+++ b/src/utils/api/helpers/index.ts
@@ -94,7 +94,6 @@ export const parseHeaderLinks = (headerLink?: string): PagedResponse['links'] =>
   }
 }
 
-type LinkFormat = { id: string; isOffset: boolean }
 export type PagedResponse<T = unknown> = {
   body: T
   links?: {
@@ -103,4 +102,20 @@ export type PagedResponse<T = unknown> = {
   }
 }
 
+export const processBody = (body?: FormData | Object): FormData | Object | undefined => {
+  if (!body) return
+
+  if (body instanceof FormData) {
+    if ((body as FormData & { _parts: [][] })._parts?.length) {
+      return body
+    } else {
+      return
+    }
+  }
+
+  if (Object.keys(body).length) {
+    return body
+  }
+}
+
 export { ctx, handleError, userAgent }
diff --git a/src/utils/api/instance.ts b/src/utils/api/instance.ts
index 64f5b318..f66c729d 100644
--- a/src/utils/api/instance.ts
+++ b/src/utils/api/instance.ts
@@ -1,7 +1,14 @@
 import { getAccountDetails } from '@utils/storage/actions'
 import { StorageGlobal } from '@utils/storage/global'
 import axios, { AxiosRequestConfig } from 'axios'
-import { ctx, handleError, PagedResponse, parseHeaderLinks, userAgent } from './helpers'
+import {
+  ctx,
+  handleError,
+  PagedResponse,
+  parseHeaderLinks,
+  processBody,
+  userAgent
+} from './helpers'
 
 export type Params = {
   account?: StorageGlobal['account.active']
@@ -12,7 +19,7 @@ export type Params = {
     [key: string]: string | number | boolean | string[] | number[] | boolean[]
   }
   headers?: { [key: string]: string }
-  body?: FormData
+  body?: FormData | Object
   extras?: Omit<AxiosRequestConfig, 'method' | 'baseURL' | 'url' | 'params' | 'headers' | 'data'>
 }
 
@@ -51,13 +58,12 @@ const apiInstance = async <T = unknown>({
     url,
     params,
     headers: {
-      'Content-Type': body && body instanceof FormData ? 'multipart/form-data' : 'application/json',
-      Accept: '*/*',
+      Accept: 'application/json',
       ...userAgent,
       ...headers,
       Authorization: `Bearer ${accountDetails['auth.token']}`
     },
-    ...((body as (FormData & { _parts: [][] }) | undefined)?._parts.length && { data: body }),
+    data: processBody(body),
     ...extras
   })
     .then(response => ({ body: response.data, links: parseHeaderLinks(response.headers.link) }))
diff --git a/src/utils/api/tooot.ts b/src/utils/api/tooot.ts
index 5a76c08c..b50e2efb 100644
--- a/src/utils/api/tooot.ts
+++ b/src/utils/api/tooot.ts
@@ -1,6 +1,6 @@
 import { mapEnvironment } from '@utils/helpers/checkEnvironment'
 import axios from 'axios'
-import { ctx, handleError, userAgent } from './helpers'
+import { ctx, handleError, processBody, userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -42,15 +42,11 @@ const apiTooot = async <T = unknown>({
     url: `${url}`,
     params,
     headers: {
-      'Content-Type': body && body instanceof FormData ? 'multipart/form-data' : 'application/json',
-      Accept: '*/*',
+      Accept: 'application/json',
       ...userAgent,
       ...headers
     },
-    ...(body &&
-      (body instanceof FormData
-        ? (body as (FormData & { _parts: [][] }) | undefined)?._parts?.length
-        : Object.keys(body).length) && { data: body })
+    data: processBody(body)
   })
     .then(response => {
       return Promise.resolve({
diff --git a/src/utils/helpers/featureCheck.ts b/src/utils/helpers/featureCheck.ts
index 83acf784..138fec0b 100644
--- a/src/utils/helpers/featureCheck.ts
+++ b/src/utils/helpers/featureCheck.ts
@@ -1,56 +1,38 @@
 import { getAccountStorage } from '@utils/storage/actions'
 
-const features = [
-  {
-    feature: 'account_follow_notify',
-    version: 3.3
-  },
-  {
-    feature: 'notification_type_status',
-    version: 3.3
-  },
-  {
-    feature: 'account_return_suspended',
-    version: 3.3
-  },
-  {
-    feature: 'edit_post',
-    version: 3.5
-  },
-  {
-    feature: 'deprecate_auth_follow',
-    version: 3.5
-  },
-  {
-    feature: 'notification_type_update',
-    version: 3.5
-  },
-  {
-    feature: 'notification_type_admin_signup',
-    version: 3.5
-  },
-  {
-    feature: 'notification_types_positive_filter',
-    version: 3.5
-  },
-  {
-    feature: 'trends_new_path',
-    version: 3.5
-  },
-  {
-    feature: 'follow_tags',
-    version: 4.0
-  },
-  {
-    feature: 'notification_type_admin_report',
-    version: 4.0
-  },
-  {
-    feature: 'filter_server_side',
-    version: 4.0
-  }
+type Features =
+  | 'account_follow_notify'
+  | 'notification_type_status'
+  | 'account_return_suspended'
+  | 'edit_post'
+  | 'deprecate_auth_follow'
+  | 'notification_type_update'
+  | 'notification_type_admin_signup'
+  | 'notification_types_positive_filter'
+  | 'trends_new_path'
+  | 'follow_tags'
+  | 'notification_type_admin_report'
+  | 'filter_server_side'
+  | 'instance_new_path'
+  | 'edit_media_details'
+
+const features: { feature: Features; version: number }[] = [
+  { feature: 'account_follow_notify', version: 3.3 },
+  { feature: 'notification_type_status', version: 3.3 },
+  { feature: 'account_return_suspended', version: 3.3 },
+  { feature: 'edit_post', version: 3.5 },
+  { feature: 'deprecate_auth_follow', version: 3.5 },
+  { feature: 'notification_type_update', version: 3.5 },
+  { feature: 'notification_type_admin_signup', version: 3.5 },
+  { feature: 'notification_types_positive_filter', version: 3.5 },
+  { feature: 'trends_new_path', version: 3.5 },
+  { feature: 'follow_tags', version: 4.0 },
+  { feature: 'notification_type_admin_report', version: 4.0 },
+  { feature: 'filter_server_side', version: 4.0 },
+  { feature: 'instance_new_path', version: 4.0 },
+  { feature: 'edit_media_details', version: 4.1 }
 ]
 
-export const featureCheck = (feature: string, v?: string): boolean =>
+export const featureCheck = (feature: Features, v?: string): boolean =>
   (features.find(f => f.feature === feature)?.version || 999) <=
   parseFloat(v || getAccountStorage.string('version'))
diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts
index 132cd046..92e60fe1 100644
--- a/src/utils/navigation/navigators.ts
+++ b/src/utils/navigation/navigators.ts
@@ -99,7 +99,10 @@ export type TabSharedStackParamList = {
   }
   'Tab-Shared-Account-In-Lists': { account: Pick<Mastodon.Account, 'id' | 'username'> }
   'Tab-Shared-Attachments': { account: Mastodon.Account; queryKey?: QueryKeyTimeline }
-  'Tab-Shared-Hashtag': { hashtag: Mastodon.Tag['name']; queryKey?: QueryKeyTimeline }
+  'Tab-Shared-Filter':
+    | { source: 'status'; status: Mastodon.Status }
+    | { source: 'hashtag'; tag_name: Mastodon.Tag['name'] }
+  'Tab-Shared-Hashtag': { tag_name: Mastodon.Tag['name']; queryKey?: QueryKeyTimeline }
   'Tab-Shared-History': { status: Mastodon.Status; detectedLanguage: string }
   'Tab-Shared-Report': {
     account: Pick<Mastodon.Account, 'id' | 'acct' | 'username' | 'url'>
@@ -157,6 +160,7 @@ export type TabMeStackParamList = {
         key: string // To update title after successful mutation
       }
   'Tab-Me-List-List': undefined
+  'Tab-Me-Preferences': undefined
   'Tab-Me-Profile': undefined
   'Tab-Me-Push': undefined
   'Tab-Me-Settings': undefined
@@ -185,3 +189,18 @@ export type TabMeProfileStackParamList = {
 }
 export type TabMeProfileStackScreenProps<T extends keyof TabMeProfileStackParamList> =
   NativeStackScreenProps<TabMeProfileStackParamList, T>
+
+export type TabMePreferencesStackParamList = {
+  'Tab-Me-Preferences-Root': undefined
+  'Tab-Me-Preferences-Filters': undefined
+  'Tab-Me-Preferences-Filter':
+    | {
+        type: 'add'
+      }
+    | {
+        type: 'edit'
+        filter: Mastodon.Filter<'v2'>
+      }
+}
+export type TabMePreferencesStackScreenProps<T extends keyof TabMePreferencesStackParamList> =
+  NativeStackScreenProps<TabMePreferencesStackParamList, T>
diff --git a/src/utils/push/useReceive.ts b/src/utils/push/useReceive.ts
index 6af388c9..89bd88c6 100644
--- a/src/utils/push/useReceive.ts
+++ b/src/utils/push/useReceive.ts
@@ -7,6 +7,7 @@ import { useEffect } from 'react'
 import pushUseNavigate from './useNavigate'
 
 const pushUseReceive = () => {
+  const [accountActive] = useGlobalStorage.string('account.active')
   const [accounts] = useGlobalStorage.object('accounts')
 
   useEffect(() => {
@@ -19,25 +20,25 @@ const pushUseReceive = () => {
         accountId: string
       }
 
-      const currAccount = accounts?.find(
-        account =>
-          account ===
-          generateAccountKey({ domain: payloadData.instanceUrl, id: payloadData.accountId })
-      )
+      const incomingAccount = generateAccountKey({
+        domain: payloadData.instanceUrl,
+        id: payloadData.accountId
+      })
+      const foundAccount = accounts?.find(account => account === incomingAccount)
       displayMessage({
         duration: 'long',
         message: notification.request.content.title!,
         description: notification.request.content.body!,
-        onPress: () => {
-          if (currAccount) {
-            setAccount(currAccount)
+        onPress: async () => {
+          if (foundAccount && foundAccount !== accountActive) {
+            await setAccount(foundAccount)
           }
           pushUseNavigate(payloadData.notification_id)
         }
       })
     })
     return () => subscription.remove()
-  }, [accounts])
+  }, [accountActive, accounts])
 }
 
 export default pushUseReceive
diff --git a/src/utils/push/useRespond.ts b/src/utils/push/useRespond.ts
index e20f14f7..c44a06cc 100644
--- a/src/utils/push/useRespond.ts
+++ b/src/utils/push/useRespond.ts
@@ -6,11 +6,12 @@ import { useEffect } from 'react'
 import pushUseNavigate from './useNavigate'
 
 const pushUseRespond = () => {
+  const [accountActive] = useGlobalStorage.string('account.active')
   const [accounts] = useGlobalStorage.object('accounts')
 
   useEffect(() => {
     const subscription = Notifications.addNotificationResponseReceivedListener(
-      ({ notification }) => {
+      async ({ notification }) => {
         const queryKey: QueryKeyTimeline = ['Timeline', { page: 'Notifications' }]
         queryClient.invalidateQueries(queryKey)
         const payloadData = notification.request.content.data as {
@@ -19,19 +20,19 @@ const pushUseRespond = () => {
           accountId: string
         }
 
-        const currAccount = accounts?.find(
-          account =>
-            account ===
-            generateAccountKey({ domain: payloadData.instanceUrl, id: payloadData.accountId })
-        )
-        if (currAccount) {
-          setAccount(currAccount)
+        const incomingAccount = generateAccountKey({
+          domain: payloadData.instanceUrl,
+          id: payloadData.accountId
+        })
+        const foundAccount = accounts?.find(account => account === incomingAccount)
+        if (foundAccount && foundAccount !== accountActive) {
+          await setAccount(foundAccount)
         }
         pushUseNavigate(payloadData.notification_id)
       }
     )
     return () => subscription.remove()
-  }, [accounts])
+  }, [accountActive, accounts])
 }
 
 export default pushUseRespond
diff --git a/src/utils/queryHooks/apps.ts b/src/utils/queryHooks/apps.ts
index 840885fb..636fb621 100644
--- a/src/utils/queryHooks/apps.ts
+++ b/src/utils/queryHooks/apps.ts
@@ -1,10 +1,4 @@
-import {
-  QueryFunctionContext,
-  useMutation,
-  UseMutationOptions,
-  useQuery,
-  UseQueryOptions
-} from '@tanstack/react-query'
+import { useMutation, UseMutationOptions, useQuery, UseQueryOptions } from '@tanstack/react-query'
 import apiGeneral from '@utils/api/general'
 import apiInstance from '@utils/api/instance'
 import { AxiosError } from 'axios'
@@ -12,7 +6,7 @@ import * as AuthSession from 'expo-auth-session'
 
 export type QueryKeyApps = ['Apps']
 
-const queryFunctionApps = async ({ queryKey }: QueryFunctionContext<QueryKeyApps>) => {
+const queryFunctionApps = async () => {
   const res = await apiInstance<Mastodon.Apps>({
     method: 'get',
     url: 'apps/verify_credentials'
diff --git a/src/utils/queryHooks/filters.ts b/src/utils/queryHooks/filters.ts
index cc67e468..98d41098 100644
--- a/src/utils/queryHooks/filters.ts
+++ b/src/utils/queryHooks/filters.ts
@@ -1,24 +1,125 @@
-import { useQuery, UseQueryOptions } from '@tanstack/react-query'
+import haptics from '@components/haptics'
+import { QueryFunctionContext, useMutation, useQuery, UseQueryOptions } from '@tanstack/react-query'
 import apiInstance from '@utils/api/instance'
 import { AxiosError } from 'axios'
 
-export type QueryKeyFilters = ['Filters']
+export type QueryKeyFilter = ['Filter', { id: Mastodon.Filter<'v2'>['id'] }]
 
-const queryFunction = () =>
-  apiInstance<Mastodon.Filter<'v1'>[]>({
+const filterQueryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyFilter>) => {
+  const res = await apiInstance<Mastodon.Filter<'v2'>>({
     method: 'get',
-    url: 'filters'
-  }).then(res => res.body)
+    version: 'v2',
+    url: `filters/${queryKey[1].id}`
+  })
+  return res.body
+}
 
-const useFiltersQuery = (params?: {
-  options: UseQueryOptions<Mastodon.Filter<'v1'>[], AxiosError>
+const useFilterQuery = ({
+  filter,
+  options
+}: {
+  filter: Mastodon.Filter<'v2'>
+  options?: UseQueryOptions<Mastodon.Filter<'v2'>, AxiosError>
 }) => {
-  const queryKey: QueryKeyFilters = ['Filters']
-  return useQuery(queryKey, queryFunction, {
+  const queryKey: QueryKeyFilter = ['Filter', { id: filter.id }]
+  return useQuery(queryKey, filterQueryFunction, {
+    ...options,
+    staleTime: Infinity,
+    cacheTime: Infinity
+  })
+}
+
+/* ----- */
+
+type MutationVarsFilter = { filter: Mastodon.Filter<'v2'> } & (
+  | { source: 'status'; action: 'add'; status: Mastodon.Status }
+  | { source: 'status'; action: 'remove'; status: Mastodon.Status }
+  | { source: 'keyword'; action: 'add'; keyword: string }
+  | { source: 'keyword'; action: 'remove'; keyword: string }
+)
+
+const mutationFunction = async (params: MutationVarsFilter) => {
+  switch (params.source) {
+    case 'status':
+      switch (params.action) {
+        case 'add':
+          return apiInstance({
+            method: 'post',
+            version: 'v2',
+            url: `filters/${params.filter.id}/statuses`,
+            body: { status_id: params.status.id }
+          })
+        case 'remove':
+          for (const status of params.filter.statuses) {
+            if (status.status_id === params.status.id) {
+              await apiInstance({
+                method: 'delete',
+                version: 'v2',
+                url: `filters/statuses/${status.id}`
+              })
+            }
+          }
+          return Promise.resolve()
+      }
+      break
+    case 'keyword':
+      switch (params.action) {
+        case 'add':
+          return apiInstance({
+            method: 'post',
+            version: 'v2',
+            url: `filters/${params.filter.id}/keywords`,
+            body: { keyword: params.keyword, whole_word: true }
+          })
+        case 'remove':
+          for (const keyword of params.filter.keywords) {
+            if (keyword.keyword === params.keyword) {
+              await apiInstance({
+                method: 'delete',
+                version: 'v2',
+                url: `filters/keywords/${keyword.id}`
+              })
+            }
+          }
+          return Promise.resolve()
+      }
+      break
+  }
+}
+
+const useFilterMutation = () => {
+  return useMutation<any, AxiosError, MutationVarsFilter>(mutationFunction, {
+    onSuccess: () => haptics('Light'),
+    onError: () => haptics('Error')
+  })
+}
+
+/* ----- */
+
+export type QueryKeyFilters = ['Filters', { version: 'v1' | 'v2' }]
+
+const filtersQueryFunction = async <T extends 'v1' | 'v2' = 'v1'>({
+  queryKey
+}: QueryFunctionContext<QueryKeyFilters>) => {
+  const version = queryKey[1].version
+  const res = await apiInstance<Mastodon.Filter<T>[]>({
+    method: 'get',
+    version,
+    url: 'filters'
+  })
+  return res.body
+}
+
+const useFiltersQuery = <T extends 'v1' | 'v2' = 'v1'>(params?: {
+  version?: T
+  options?: UseQueryOptions<Mastodon.Filter<T>[], AxiosError>
+}) => {
+  const queryKey: QueryKeyFilters = ['Filters', { version: params?.version || 'v1' }]
+  return useQuery(queryKey, filtersQueryFunction, {
     ...params?.options,
     staleTime: Infinity,
     cacheTime: Infinity
   })
 }
 
-export { useFiltersQuery }
+export { useFilterQuery, useFilterMutation, useFiltersQuery }
diff --git a/src/utils/queryHooks/preferences.ts b/src/utils/queryHooks/preferences.ts
index 6b19d31d..42ab51ac 100644
--- a/src/utils/queryHooks/preferences.ts
+++ b/src/utils/queryHooks/preferences.ts
@@ -19,7 +19,7 @@ const usePreferencesQuery = (params?: {
     ...params?.options,
     staleTime: Infinity,
     cacheTime: Infinity,
-    initialData: getAccountStorage.object('preferences'),
+    placeholderData: getAccountStorage.object('preferences'),
     onSuccess: data => setAccountStorage([{ key: 'preferences', value: data }])
   })
 }
diff --git a/src/utils/queryHooks/tags.ts b/src/utils/queryHooks/tags.ts
index 0058fc8f..348a9762 100644
--- a/src/utils/queryHooks/tags.ts
+++ b/src/utils/queryHooks/tags.ts
@@ -60,32 +60,33 @@ const useFollowedTagsQuery = (
   )
 }
 
-export type QueryKeyTags = ['Tags', { tag: string }]
-const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyTags>) => {
-  const { tag } = queryKey[1]
+export type QueryKeyTag = ['Tag', { tag_name: string }]
+const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyTag>) => {
+  const { tag_name } = queryKey[1]
 
-  const res = await apiInstance<Mastodon.Tag>({ method: 'get', url: `tags/${tag}` })
+  const res = await apiInstance<Mastodon.Tag>({ method: 'get', url: `tags/${tag_name}` })
   return res.body
 }
-const useTagsQuery = ({
-  options,
-  ...queryKeyParams
-}: QueryKeyTags[1] & {
+const useTagQuery = ({
+  tag_name,
+  options
+}: {
+  tag_name: Mastodon.Tag['name']
   options?: UseQueryOptions<Mastodon.Tag, AxiosError>
 }) => {
-  const queryKey: QueryKeyTags = ['Tags', { ...queryKeyParams }]
+  const queryKey: QueryKeyTag = ['Tag', { tag_name }]
   return useQuery(queryKey, queryFunction, options)
 }
 
-type MutationVarsAnnouncement = { tag: string; to: boolean }
-const mutationFunction = async ({ tag, to }: MutationVarsAnnouncement) => {
+type MutationVarsTag = { tag_name: Mastodon.Tag['name']; to: boolean }
+const mutationFunction = async ({ tag_name, to }: MutationVarsTag) => {
   return apiInstance<{}>({
     method: 'post',
-    url: `tags/${tag}/${to ? 'follow' : 'unfollow'}`
+    url: `tags/${tag_name}/${to ? 'follow' : 'unfollow'}`
   })
 }
-const useTagsMutation = (options: UseMutationOptions<{}, AxiosError, MutationVarsAnnouncement>) => {
+const useTagMutation = (options: UseMutationOptions<{}, AxiosError, MutationVarsTag>) => {
   return useMutation(mutationFunction, options)
 }
 
-export { useFollowedTagsQuery, useTagsQuery, useTagsMutation }
+export { useFollowedTagsQuery, useTagQuery, useTagMutation }
diff --git a/src/utils/queryHooks/timeline.ts b/src/utils/queryHooks/timeline.ts
index ed9d7bf2..4792b6f4 100644
--- a/src/utils/queryHooks/timeline.ts
+++ b/src/utils/queryHooks/timeline.ts
@@ -33,7 +33,7 @@ export type QueryKeyTimeline = [
       }
     | {
         page: 'Hashtag'
-        hashtag: Mastodon.Tag['name']
+        tag_name: Mastodon.Tag['name']
       }
     | {
         page: 'List'
@@ -219,7 +219,7 @@ export const queryFunctionTimeline = async ({
     case 'Hashtag':
       return apiInstance<Mastodon.Status[]>({
         method: 'get',
-        url: `timelines/tag/${page.hashtag}`,
+        url: `timelines/tag/${page.tag_name}`,
         params
       })
 
diff --git a/src/utils/styles/themes.ts b/src/utils/styles/themes.ts
index eafbb16f..4f6bc268 100644
--- a/src/utils/styles/themes.ts
+++ b/src/utils/styles/themes.ts
@@ -42,9 +42,9 @@ const themeColors: {
     dark_darker: 'rgb(130, 130, 130)'
   },
   disabled: {
-    light: 'rgb(200, 200, 200)',
-    dark_lighter: 'rgb(120, 120, 120)',
-    dark_darker: 'rgb(66, 66, 66)'
+    light: 'rgb(220, 220, 220)',
+    dark_lighter: 'rgb(70, 70, 70)',
+    dark_darker: 'rgb(50, 50, 50)'
   },
   blue: {
     light: 'rgb(43, 144, 221)',
diff --git a/yarn.lock b/yarn.lock
index 6c49a110..166933e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2276,15 +2276,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mattermost/react-native-paste-input@npm:^0.5.2":
-  version: 0.5.2
-  resolution: "@mattermost/react-native-paste-input@npm:0.5.2"
+"@mattermost/react-native-paste-input@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "@mattermost/react-native-paste-input@npm:0.6.0"
   dependencies:
-    deprecated-react-native-prop-types: ^2.3.0
+    semver: 7.3.8
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 85def4f7e41d5331061160889b1365fa822472df291f8e58dcabaed966623826ddb56451ae90e5658ab6a4727359672027dc5ca4fe78082adc769cd58fe88c29
+  checksum: 95fe8d9652f80793a245ad3a6b3cfebc152ea9a0243982507d3ac83844e6ca21723e62337fa3db7690af33d9f9427ad097c75863793b55321c0a0d55f53f7a11
   languageName: node
   linkType: hard
 
@@ -2744,12 +2744,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native-camera-roll/camera-roll@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "@react-native-camera-roll/camera-roll@npm:5.2.1"
+"@react-native-camera-roll/camera-roll@npm:^5.2.3":
+  version: 5.2.3
+  resolution: "@react-native-camera-roll/camera-roll@npm:5.2.3"
   peerDependencies:
     react-native: ">=0.59"
-  checksum: db901554170cced81db4b01c0e89324905fe4c6915a41e4cf4b6d1fa35f5894d18d1d734304d516824bff434784e4b571e9fa379e850f8dd4d42a28e3eab9eee
+  checksum: 791028c52e1cadade5eebbb19ad5815273969e187d0325326c8e38439023c10aff3caed3bedf956c1acebf6b6d8471f4c75373a45bf860d9b18c37537e68247c
   languageName: node
   linkType: hard
 
@@ -2979,9 +2979,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native-firebase/app@npm:^16.5.0":
-  version: 16.5.0
-  resolution: "@react-native-firebase/app@npm:16.5.0"
+"@react-native-firebase/app@npm:^16.5.2":
+  version: 16.5.2
+  resolution: "@react-native-firebase/app@npm:16.5.2"
   dependencies:
     "@expo/config-plugins": ^5.0.4
     opencollective-postinstall: ^2.0.1
@@ -2989,7 +2989,7 @@ __metadata:
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 2eab11544f8b4e932127119b6485e43788214df8264f1f84b06695ad1ca0ae88e9969c9e8d8005ab986637223991617960b1556dee43453cc38716d537d9c81a
+  checksum: 8fd7dd614523f53e34e7488c7baf9cb279db1e0db8e0a3ab0aabc71a77c054af7876dc070e4c86ffb0406bae2fb240495954e95891a7047ed1c6e74f4a4de716
   languageName: node
   linkType: hard
 
@@ -3010,17 +3010,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native/normalize-color@npm:*, @react-native/normalize-color@npm:^2.0.0":
+"@react-native/normalize-color@npm:2.0.0":
+  version: 2.0.0
+  resolution: "@react-native/normalize-color@npm:2.0.0"
+  checksum: 2da373297f0d22b700edb9ab1b2cca34684e94a5dfe172e1cfd114e74ac17e139e802bc671e9868e0a580190eccbf3fa804f67be8cc1d9cbd0e216e994495931
+  languageName: node
+  linkType: hard
+
+"@react-native/normalize-color@npm:^2.0.0":
   version: 2.1.0
   resolution: "@react-native/normalize-color@npm:2.1.0"
   checksum: 8ccbd40b3c7629f1dc97b3e9aadd95fd3507fcf2e37535a6299a70436ab891c34cbdc4240b07380553d6e85dd909e23d5773b5be1da2906b026312e0b0768838
   languageName: node
   linkType: hard
 
-"@react-native/normalize-color@npm:2.0.0":
-  version: 2.0.0
-  resolution: "@react-native/normalize-color@npm:2.0.0"
-  checksum: 2da373297f0d22b700edb9ab1b2cca34684e94a5dfe172e1cfd114e74ac17e139e802bc671e9868e0a580190eccbf3fa804f67be8cc1d9cbd0e216e994495931
+"@react-native/normalize-colors@npm:*":
+  version: 0.72.0
+  resolution: "@react-native/normalize-colors@npm:0.72.0"
+  checksum: c8ec577663394a3390eb34c3cd531350521172bcfad7de309ab111e5f9e3d27c966d4a4387f00972302107be3d8cad584c5794ccfa30939aecc56162e4ddbe25
   languageName: node
   linkType: hard
 
@@ -3031,11 +3038,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-navigation/bottom-tabs@npm:^6.5.2":
-  version: 6.5.2
-  resolution: "@react-navigation/bottom-tabs@npm:6.5.2"
+"@react-navigation/bottom-tabs@npm:^6.5.3":
+  version: 6.5.3
+  resolution: "@react-navigation/bottom-tabs@npm:6.5.3"
   dependencies:
-    "@react-navigation/elements": ^1.3.12
+    "@react-navigation/elements": ^1.3.13
     color: ^4.2.3
     warn-once: ^0.1.0
   peerDependencies:
@@ -3044,13 +3051,13 @@ __metadata:
     react-native: "*"
     react-native-safe-area-context: ">= 3.0.0"
     react-native-screens: ">= 3.0.0"
-  checksum: 166fdf793f7e7976dba0e3304ecf710b11b3366f1b61385a884bfbc16a074cc6ee014aab3a323bf90168a3bf95868df4e6c55c366150382440644c57872daa9b
+  checksum: 7e222f39035e84d8bc98ba4937fea0e0ece1307c85b7102a6e3f19ce5b2550cfc83c1c1b68ef6e885b3d325863df442ca524d5ab34c262837cea179366383358
   languageName: node
   linkType: hard
 
-"@react-navigation/core@npm:^6.4.5":
-  version: 6.4.5
-  resolution: "@react-navigation/core@npm:6.4.5"
+"@react-navigation/core@npm:^6.4.6":
+  version: 6.4.6
+  resolution: "@react-navigation/core@npm:6.4.6"
   dependencies:
     "@react-navigation/routers": ^6.1.6
     escape-string-regexp: ^4.0.0
@@ -3060,27 +3067,27 @@ __metadata:
     use-latest-callback: ^0.1.5
   peerDependencies:
     react: "*"
-  checksum: 90d0153aff2ab85e4b97cda1bb93626f4e8e0a2d248e67276c6953df52504efbc65672fbdbdbf335d31a941c551360db1eb77de94b58836fced13bf048ed0912
+  checksum: 0e77504d333a989bbdfe6377c5d840ad5a422810aabc54775f80c6023d2680af722b6b73882483578f7f58073625580a37f88cbe275de2971fa96987d9465ff1
   languageName: node
   linkType: hard
 
-"@react-navigation/elements@npm:^1.3.12":
-  version: 1.3.12
-  resolution: "@react-navigation/elements@npm:1.3.12"
+"@react-navigation/elements@npm:^1.3.13":
+  version: 1.3.13
+  resolution: "@react-navigation/elements@npm:1.3.13"
   peerDependencies:
     "@react-navigation/native": ^6.0.0
     react: "*"
     react-native: "*"
     react-native-safe-area-context: ">= 3.0.0"
-  checksum: 070bedf8caf0f35fb7c80452eff21413d41c9ac72f9017da969373f9caac74dfd3541df028a648852fe6e6881cd4158b4ddf3eda1afa1a414a9297cd475f902f
+  checksum: 341d8d44ecda16bbed990d40f10bedd368d579ffe1fd4568f0293f97299768167a110763170da92ff14ccff3916704dbc133465776ecdc9ac65cc8bf3caa1e31
   languageName: node
   linkType: hard
 
-"@react-navigation/native-stack@npm:^6.9.7":
-  version: 6.9.7
-  resolution: "@react-navigation/native-stack@npm:6.9.7"
+"@react-navigation/native-stack@npm:^6.9.8":
+  version: 6.9.8
+  resolution: "@react-navigation/native-stack@npm:6.9.8"
   dependencies:
-    "@react-navigation/elements": ^1.3.12
+    "@react-navigation/elements": ^1.3.13
     warn-once: ^0.1.0
   peerDependencies:
     "@react-navigation/native": ^6.0.0
@@ -3088,22 +3095,22 @@ __metadata:
     react-native: "*"
     react-native-safe-area-context: ">= 3.0.0"
     react-native-screens: ">= 3.0.0"
-  checksum: 4b267aa6a9d2a9c5268b942b5dce681014b4c4e7da5222ce0b9704bc821e34765fb15bd65bd4ebebba42cea3d8587512ef68ba1d53eaca40f5aee235f37ee07c
+  checksum: 37413ffc79f442860cc1cbd51d4f9c8160e5a01826ca7e1b815e88f2a24b5df53dc6c604a76e099aa6a2ad809c093b253924095e975ad76325fdc443e6457b02
   languageName: node
   linkType: hard
 
-"@react-navigation/native@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "@react-navigation/native@npm:6.1.1"
+"@react-navigation/native@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "@react-navigation/native@npm:6.1.2"
   dependencies:
-    "@react-navigation/core": ^6.4.5
+    "@react-navigation/core": ^6.4.6
     escape-string-regexp: ^4.0.0
     fast-deep-equal: ^3.1.3
     nanoid: ^3.1.23
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 31befabaf2aeb1d47d7635cfd0611474ad1a648cf39bb7a76c8cd9073b3a4af7a2cd0f3aaf11f7b17becd94e04e4a971ff55dec48cede7603f70abb463761798
+  checksum: 1bdf5339cccc1c40f780929738790f6d7d80533c80c3db80c598870f124782d83f4842b63a2bced55e040d120fc0de419d780fd906108c5358a83cde540b595e
   languageName: node
   linkType: hard
 
@@ -3116,11 +3123,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-navigation/stack@npm:^6.3.10":
-  version: 6.3.10
-  resolution: "@react-navigation/stack@npm:6.3.10"
+"@react-navigation/stack@npm:^6.3.11":
+  version: 6.3.11
+  resolution: "@react-navigation/stack@npm:6.3.11"
   dependencies:
-    "@react-navigation/elements": ^1.3.12
+    "@react-navigation/elements": ^1.3.13
     color: ^4.2.3
     warn-once: ^0.1.0
   peerDependencies:
@@ -3130,7 +3137,7 @@ __metadata:
     react-native-gesture-handler: ">= 1.0.0"
     react-native-safe-area-context: ">= 3.0.0"
     react-native-screens: ">= 3.0.0"
-  checksum: 6efac9780dceeb0de65e69634ea75b955fdc9ebab6807f455d60c1037b67bf5a0cb5708790cf7808616a2ec53159822bba766c719648fb91a2c7fd9e4cd5f51a
+  checksum: a826f3ed56b280e27762c08e822e88c33b395d51cfa5b277dd45f7d7ef1884674222ce316a102c36ea5f96e554f7f45673e87c0715799689f9533ddc272b0d2d
   languageName: node
   linkType: hard
 
@@ -3144,15 +3151,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/browser@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/browser@npm:7.26.0"
+"@sentry/browser@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/browser@npm:7.29.0"
   dependencies:
-    "@sentry/core": 7.26.0
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
+    "@sentry/core": 7.29.0
+    "@sentry/replay": 7.29.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     tslib: ^1.9.3
-  checksum: dc4e15f55869528ea45483323d0e332216110c14b8af625e96e395a563d4f134789bc37f0761f389284569d9e6266aa691876809fe45fcc8f33ed6cd2331ef28
+  checksum: 136b9d03a9ff38e72f4d8fd335f23469341d0095d1f075a36d85ef2cd6bd0763635a7e1cbc7abe14508291e88cffe549eda6016c858564b55c1d4e81ef67882f
   languageName: node
   linkType: hard
 
@@ -3190,103 +3198,116 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/core@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/core@npm:7.26.0"
+"@sentry/core@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/core@npm:7.29.0"
   dependencies:
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     tslib: ^1.9.3
-  checksum: d5f8c1e1b2463312438ec02d4878c3d248493c5cc566ef161bad0b8f5644efc40bb453e8f43d4a68b3c27b3990e33c983fcf5caa2e502ff19b5808e70ce71a57
+  checksum: d9330ed3528f2328b524cb237e400368dcb6c36b8afb791d28141e98ab5c0b56dc306a65cfc7164108cb5616346dabe793a39a140257f723906dc25a03b7ebcd
   languageName: node
   linkType: hard
 
-"@sentry/hub@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/hub@npm:7.26.0"
+"@sentry/hub@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/hub@npm:7.29.0"
   dependencies:
-    "@sentry/core": 7.26.0
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
+    "@sentry/core": 7.29.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     tslib: ^1.9.3
-  checksum: be5937ca6612d53316307542c18935e0c749ce4f76eed6318a1d1d30d732c1b46f976a5bda43f751ec03c0b9eea617df689ce3683d870348e094d7d27a066da7
+  checksum: dc6eb1744cb68eabfa5bd1a919b0ae0df721d34b36d1b8c5e9612b9d8ab9329560b89542b9b06157e39330c5cd34a157fa8a3a7509bb4a7f007b2083c5046f80
   languageName: node
   linkType: hard
 
-"@sentry/integrations@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/integrations@npm:7.26.0"
+"@sentry/integrations@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/integrations@npm:7.29.0"
   dependencies:
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     localforage: ^1.8.1
     tslib: ^1.9.3
-  checksum: 63f8ed3e5f0de8edd8d8e05172c14f03bf4ddffcea66e5bd73869d184fbcb97b8608eed2113af6f8c77dada00c140a18ba5b2f3533a18079db72472609cc4aaa
+  checksum: fec2b9b7902b9b097b5453ae4c797e4efa18ac05a3b539c58d037085e12846f443ebe2e8d916a273ee4df71a29891265db5723b7fd4b5e8287fe5864cb9b2e43
   languageName: node
   linkType: hard
 
-"@sentry/react-native@npm:4.12.0":
-  version: 4.12.0
-  resolution: "@sentry/react-native@npm:4.12.0"
+"@sentry/react-native@npm:4.13.0":
+  version: 4.13.0
+  resolution: "@sentry/react-native@npm:4.13.0"
   dependencies:
-    "@sentry/browser": 7.26.0
+    "@sentry/browser": 7.29.0
     "@sentry/cli": 1.74.4
-    "@sentry/core": 7.26.0
-    "@sentry/hub": 7.26.0
-    "@sentry/integrations": 7.26.0
-    "@sentry/react": 7.26.0
-    "@sentry/tracing": 7.26.0
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
+    "@sentry/core": 7.29.0
+    "@sentry/hub": 7.29.0
+    "@sentry/integrations": 7.29.0
+    "@sentry/react": 7.29.0
+    "@sentry/tracing": 7.29.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     "@sentry/wizard": 1.4.0
   peerDependencies:
     react: ">=16.4.1"
     react-native: ">=0.56.0"
-  checksum: 186b372fdb4de58e2b1ebd52b169a203e80d00cf9f250f1bb15a83e13c50c97781080228105fd9755735157c3f0c90194f63b0072b699c76af27ec34b7aeb185
+  checksum: 8f83147409b31854ae2c1cc485ce20a86f8f70ef83dfa52d5547f3ffa3202e5de5bf14e306dff6c280752677b813e00505d80dfa6b1bf110c4749be9f6215919
   languageName: node
   linkType: hard
 
-"@sentry/react@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/react@npm:7.26.0"
+"@sentry/react@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/react@npm:7.29.0"
   dependencies:
-    "@sentry/browser": 7.26.0
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
+    "@sentry/browser": 7.29.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     hoist-non-react-statics: ^3.3.2
     tslib: ^1.9.3
   peerDependencies:
     react: 15.x || 16.x || 17.x || 18.x
-  checksum: e0aa9b698da17cb7cd6d18dc8a4debdd7bd0ba6d7f0302cd00e28cc94685a1823c542cdd325027c90bbff9dfb91591a13443a5b3cdfb39a8ee1e25efb6e13de8
+  checksum: 022bf398f2cf43bf5e1f7340cfc02ccfc4cdc026fb3d6805e760d182bcb2601d413cf412beaa37fecbbf0dc554ce38c4a01d9bf38d1591f80cd059ee5235205d
   languageName: node
   linkType: hard
 
-"@sentry/tracing@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/tracing@npm:7.26.0"
+"@sentry/replay@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/replay@npm:7.29.0"
   dependencies:
-    "@sentry/core": 7.26.0
-    "@sentry/types": 7.26.0
-    "@sentry/utils": 7.26.0
-    tslib: ^1.9.3
-  checksum: f28805e750d5610a3e24d368e42c8ce8aa1c384265fe16dc8911c713a9620bb6fa7e99acd916157647ba64ee19331e61928db3a22838345968880746a01610ac
+    "@sentry/core": 7.29.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
+  peerDependencies:
+    "@sentry/browser": ">=7.24.0"
+  checksum: 539e18c128bb7966c9d4ea91ebd9cde6d42f42f96fa648d7ead5bff699e643f3792f57a344376586fab26f659f5e1431176faf0e12e6ea53508fd48ba928dd12
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/types@npm:7.26.0"
-  checksum: 79cec061f989ba635f1278f46ff8a4b4a32a0c751a51abca43c286cf1da20302e2590102c312e44b2f25f541ee5dc21d03cf676da35d634751f93dbbd01b08f3
-  languageName: node
-  linkType: hard
-
-"@sentry/utils@npm:7.26.0":
-  version: 7.26.0
-  resolution: "@sentry/utils@npm:7.26.0"
+"@sentry/tracing@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/tracing@npm:7.29.0"
   dependencies:
-    "@sentry/types": 7.26.0
+    "@sentry/core": 7.29.0
+    "@sentry/types": 7.29.0
+    "@sentry/utils": 7.29.0
     tslib: ^1.9.3
-  checksum: 51bac244259f68071f93cf74955b1aafb8e6ca50f84f2a8258cb447f3a7ce6e526fd3c695b3b44b6348c3ebbdf9766894b7d85feb2868c7a67cbfc40c576849b
+  checksum: 7ad9040664a8c65693aba2bdd9cecc8334ce25a296c01727d38649c7141106b78c92142626ce8e44983b4272e0f411010a3df99843a1af6d4f89e4f67ce6f57e
+  languageName: node
+  linkType: hard
+
+"@sentry/types@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/types@npm:7.29.0"
+  checksum: 53815b66662a193cfd7024b9fb2477afb8178a771aa59f3bef10578cc940a9d7207722f9f04e2ca65a8e118cef012ac42f4936aa921aacdfc00a914bec88b009
+  languageName: node
+  linkType: hard
+
+"@sentry/utils@npm:7.29.0":
+  version: 7.29.0
+  resolution: "@sentry/utils@npm:7.29.0"
+  dependencies:
+    "@sentry/types": 7.29.0
+    tslib: ^1.9.3
+  checksum: 9914a2129692a5713453437d75b957a18ad5a4ef8085776e5499208ad329dea8da27ee2e2b74fdc089a3831b4e2929f8e6c0f3bc75528f41023d85de5077f462
   languageName: node
   linkType: hard
 
@@ -3346,18 +3367,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.20.9":
-  version: 4.20.9
-  resolution: "@tanstack/query-core@npm:4.20.9"
-  checksum: 679551353e6d5adcae771bc78b64959a6ecf4f85c1f74952b38b18a7425374cf84dc2e461cf6048be206d8bbac265468d36231f7f9d0b6689504a0e069dd5ac6
+"@tanstack/query-core@npm:4.22.4":
+  version: 4.22.4
+  resolution: "@tanstack/query-core@npm:4.22.4"
+  checksum: 01663a36ad7ed5c43cb7cfa8ffcdf7df4de05cf68e9991bbc339be2a656a1c94f69e0b5405dfa972cf877b09dac3cba4cbdf8c91f5dffabc46ac32ec0ce5f4bb
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:^4.20.9":
-  version: 4.20.9
-  resolution: "@tanstack/react-query@npm:4.20.9"
+"@tanstack/react-query@npm:^4.23.0":
+  version: 4.23.0
+  resolution: "@tanstack/react-query@npm:4.23.0"
   dependencies:
-    "@tanstack/query-core": 4.20.9
+    "@tanstack/query-core": 4.22.4
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -3368,7 +3389,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 4fc953d774c5c0f7f332f014dfb2fb9865387ae6e849fdf551e2ad70f07d55fbdbc4c6afb27a1f90bce3a2348bd1adf67ab78a4bc2cdf8d3e5ff90128730b467
+  checksum: 166140855f8806e951e9a4ebccb5ba354eb2abc314e6b6ff696d2a1a8720e9ea868221f62d58004101e44899b61fdf57a40fe286bb13233645e292cd5567545c
   languageName: node
   linkType: hard
 
@@ -3403,13 +3424,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/invariant@npm:^2.2.35":
-  version: 2.2.35
-  resolution: "@types/invariant@npm:2.2.35"
-  checksum: af1b624057c89789ed0917838fea3d42bb0c101cc22b829a24d8777c678be3bc79d6ae05992a13bdf607b94731262467a2e62a809602ea1f7eea5e8c2242660d
-  languageName: node
-  linkType: hard
-
 "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0":
   version: 2.0.4
   resolution: "@types/istanbul-lib-coverage@npm:2.0.4"
@@ -3493,16 +3507,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-native@npm:^0.70.8":
-  version: 0.70.8
-  resolution: "@types/react-native@npm:0.70.8"
+"@types/react-native@npm:^0.70.9":
+  version: 0.70.9
+  resolution: "@types/react-native@npm:0.70.9"
   dependencies:
     "@types/react": "*"
-  checksum: e951992178f0a6a2a5bc5312824ad67146594840c03ec51156022eacb23e8db7be7470d0c9ad61828dbae840e531bf0cf553205b9dc290b358091329746fd094
+  checksum: 52b362f518c8a912174ae7cda1b20532bee11c2767794efcc0300650b750f72bcd8852435105559155f202504a742fe6e50f4e3cc4c1a9836dea9db132410ce3
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:^18.0.26":
+"@types/react@npm:*, @types/react@npm:16 || 17 || 18":
   version: 18.0.26
   resolution: "@types/react@npm:18.0.26"
   dependencies:
@@ -3513,6 +3527,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react@npm:^18.0.27":
+  version: 18.0.27
+  resolution: "@types/react@npm:18.0.27"
+  dependencies:
+    "@types/prop-types": "*"
+    "@types/scheduler": "*"
+    csstype: ^3.0.2
+  checksum: 600fdbc39a92ea4a77047db3e12f05f67776a710f5918248c0189a59ac2a38900c9db5a5d2e433a16df528a3ecab1aa114b322cacea573bb1ca2fc0b094c52d1
+  languageName: node
+  linkType: hard
+
 "@types/scheduler@npm:*":
   version: 0.16.2
   resolution: "@types/scheduler@npm:0.16.2"
@@ -3968,14 +3993,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "axios@npm:1.2.2"
+"axios@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "axios@npm:1.2.4"
   dependencies:
     follow-redirects: ^1.15.0
     form-data: ^4.0.0
     proxy-from-env: ^1.1.0
-  checksum: 6e357491b38426c5720f7328ecbafca3c643b03952c052d787570672ce7a9365717c2d64db4ce97cfbee3f830fa405101e360e14d0857ef7f96a9f4d814c4e03
+  checksum: 3454248d72028d69e90e348542140136c1226b448529e78beae5b88e65d6c67f85a3d0eb49f089b338cb54f173671b585c95ef3339f3cb28286eb2878fe47880
   languageName: node
   linkType: hard
 
@@ -4001,6 +4026,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-module-resolver@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "babel-plugin-module-resolver@npm:5.0.0"
+  dependencies:
+    find-babel-config: ^2.0.0
+    glob: ^8.0.3
+    pkg-up: ^3.1.0
+    reselect: ^4.1.7
+    resolve: ^1.22.1
+  checksum: d6880e49fc8e7bac509a2c183b4303ee054a47a80032a59a6f7844bb468ebe5e333b5dc5378443afdab5839e2da2b31a6c8d9a985a0047cd076b82bb9161cc78
+  languageName: node
+  linkType: hard
+
 "babel-plugin-polyfill-corejs2@npm:^0.3.3":
   version: 0.3.3
   resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3"
@@ -5227,14 +5265,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deprecated-react-native-prop-types@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "deprecated-react-native-prop-types@npm:2.3.0"
+"deprecated-react-native-prop-types@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "deprecated-react-native-prop-types@npm:4.0.0"
   dependencies:
-    "@react-native/normalize-color": "*"
+    "@react-native/normalize-colors": "*"
     invariant: "*"
     prop-types: "*"
-  checksum: d14f4be1dfe780a7fa9197a31b4a9a2b409c8cf1bf677713fd92d06733dee1043578662d1a8858541cf06164ae91d295db6e595f29bf13e808d9fb37bc58c90b
+  checksum: 3542c70d0379153c946bc2e23202405df4337be3dc2a96601b6696247097e13405091efa7640841f8c920d3239145d8c024e13758c65a884a207b88ec2c826aa
   languageName: node
   linkType: hard
 
@@ -5703,9 +5741,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-modules-autolinking@npm:1.0.1":
-  version: 1.0.1
-  resolution: "expo-modules-autolinking@npm:1.0.1"
+"expo-modules-autolinking@npm:1.0.2":
+  version: 1.0.2
+  resolution: "expo-modules-autolinking@npm:1.0.2"
   dependencies:
     chalk: ^4.1.0
     commander: ^7.2.0
@@ -5714,7 +5752,7 @@ __metadata:
     fs-extra: ^9.1.0
   bin:
     expo-modules-autolinking: bin/expo-modules-autolinking.js
-  checksum: b3123a3dae6ff2a238861724db553de5fb00aa2575fbaaadc2aa44a5d6735b010b07ecb70ea6555c8c2523a923fbd51c26b39ce8f1103510e5220e6f67539d64
+  checksum: 61d171c1947eee2434dcee160754e6c60ce7644b2475c93cfcf465eac712c0e71c9c7b8158981031af4c16b0eace794fd5831c1f97203f1e2f3504100338e909
   languageName: node
   linkType: hard
 
@@ -5826,9 +5864,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo@npm:^47.0.12":
-  version: 47.0.12
-  resolution: "expo@npm:47.0.12"
+"expo@npm:^47.0.13":
+  version: 47.0.13
+  resolution: "expo@npm:47.0.13"
   dependencies:
     "@babel/runtime": ^7.14.0
     "@expo/cli": 0.4.11
@@ -5844,7 +5882,7 @@ __metadata:
     expo-file-system: ~15.1.1
     expo-font: ~11.0.1
     expo-keep-awake: ~11.0.1
-    expo-modules-autolinking: 1.0.1
+    expo-modules-autolinking: 1.0.2
     expo-modules-core: 1.1.1
     fbemitter: ^3.0.0
     getenv: ^1.0.0
@@ -5858,7 +5896,7 @@ __metadata:
       optional: true
   bin:
     expo: bin/cli.js
-  checksum: 24f7073660fb4c4c76a398d722d1fcae1ea654463faf2a730e986f884618a93618d1ee9116fe6c8199338c2e8aa716c2d389344a967824d264e2440eb7f16340
+  checksum: 8972f8e94777f73cc0063c18bb97a96accab32006686ff8e3f836cc3b9447e101da20fb2468533faabf9ac9b99dcdb6abe8aed5a6dbdf51b0bfd8bbdcf7ea07d
   languageName: node
   linkType: hard
 
@@ -6046,6 +6084,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-babel-config@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "find-babel-config@npm:2.0.0"
+  dependencies:
+    json5: ^2.1.1
+    path-exists: ^4.0.0
+  checksum: d110308b02fe6a6411a0cfb7fd50af6740fbf5093eada3d6ddacf99b07fc8eea4aa3475356484710a0032433029a21ce733bb3ef88fda1d6e35c29a3e4983014
+  languageName: node
+  linkType: hard
+
 "find-cache-dir@npm:^2.0.0":
   version: 2.1.0
   resolution: "find-cache-dir@npm:2.1.0"
@@ -6448,6 +6496,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^8.0.3":
+  version: 8.1.0
+  resolution: "glob@npm:8.1.0"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^5.0.1
+    once: ^1.3.0
+  checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47
+  languageName: node
+  linkType: hard
+
 "globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
@@ -6711,12 +6772,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:^22.4.8":
-  version: 22.4.8
-  resolution: "i18next@npm:22.4.8"
+"i18next@npm:^22.4.9":
+  version: 22.4.9
+  resolution: "i18next@npm:22.4.9"
   dependencies:
     "@babel/runtime": ^7.20.6
-  checksum: bac5eb763ba6e2e34ff58d52da2ad8ef506d42d0be9efb4abb116d649fef4d6af097a8be1bade3439ff1a1c66c207e661212a1c7caefd405f02a738e37e7bc37
+  checksum: 8cce4aaced4857e006fab2c9d4adb0eb1375829e459076be79d4d3532b1be6342b7003a720e187098f17bb276bea46df8b3fc2cf21f0f3a230bd519243048d1a
   languageName: node
   linkType: hard
 
@@ -7519,6 +7580,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json5@npm:^2.1.1, json5@npm:^2.2.2":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
+  bin:
+    json5: lib/cli.js
+  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
+  languageName: node
+  linkType: hard
+
 "json5@npm:^2.2.1":
   version: 2.2.2
   resolution: "json5@npm:2.2.2"
@@ -7528,15 +7598,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.2.2":
-  version: 2.2.3
-  resolution: "json5@npm:2.2.3"
-  bin:
-    json5: lib/cli.js
-  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
-  languageName: node
-  linkType: hard
-
 "jsonfile@npm:^2.1.0":
   version: 2.4.0
   resolution: "jsonfile@npm:2.4.0"
@@ -9592,21 +9653,11 @@ __metadata:
 
 "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::locator=tooot%40workspace%3A.":
   version: 8.6.3
-  resolution: "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::version=8.6.3&hash=d37d57&locator=tooot%40workspace%3A."
+  resolution: "react-native-fast-image@patch:react-native-fast-image@npm%3A8.6.3#./.yarn/patches/react-native-fast-image-npm-8.6.3-03ee2d23c0.patch::version=8.6.3&hash=65bdbb&locator=tooot%40workspace%3A."
   peerDependencies:
     react: ^17 || ^18
     react-native: ">=0.60.0"
-  checksum: e5749406ed7608d606df8a7d298a6adaeefdf1077e5349ceb51b344e1fc9de62923f0af05c753c0baa59f476be6d46aee20a20c92c7840a30d8b473a156dfec5
-  languageName: node
-  linkType: hard
-
-"react-native-feather@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "react-native-feather@npm:1.1.2"
-  peerDependencies:
-    react-native: ">=0.46"
-    react-native-svg: ">=5.3"
-  checksum: a83d421a4629d9f3afd54f96d90fe2370108e9dbc62b62e9ecc8db235533ccdd2a0edd063492f7070640666a62707b420dbd0e5eefc21b0172ded11e5a05b7b5
+  checksum: 09d7ccebd6075b85fc06d60093edf2611d97a6571b5bcd7d915df0316866a09d3bf9a74960a64aa75ac8901c9840f78b70aac58ff8b6ac627968259151109328
   languageName: node
   linkType: hard
 
@@ -9624,9 +9675,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-gesture-handler@npm:~2.8.0":
-  version: 2.8.0
-  resolution: "react-native-gesture-handler@npm:2.8.0"
+"react-native-gesture-handler@npm:~2.9.0":
+  version: 2.9.0
+  resolution: "react-native-gesture-handler@npm:2.9.0"
   dependencies:
     "@egjs/hammerjs": ^2.0.17
     hoist-non-react-statics: ^3.3.0
@@ -9636,7 +9687,7 @@ __metadata:
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 3dc4ab5cf160e471b07cd644e24f6384bdc4fc777f259fb12dfb42a5c9a15f84f60043ce3a1cd737f8dc563892a52566c8ab33bed0b1635f2898ac8ba75c8668
+  checksum: 6bfdd9d23486193424dcfb0073dd821a216c2783dde746d73a3441e920602343f09efa10261c6f09fcbcb645d029a95305c86f61997053c01ad89751c8c6d236
   languageName: node
   linkType: hard
 
@@ -9647,37 +9698,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-image-picker@npm:^4.10.3":
-  version: 4.10.3
-  resolution: "react-native-image-picker@npm:4.10.3"
+"react-native-image-picker@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "react-native-image-picker@npm:5.0.1"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 1f1c5cae5950790cfbdab2e1f547cfe065de9949c7cf0102dec512f43889f586eed1c265e1ecbc88df106696650b3dc5bf936b862078906787aca7e9ca2f145c
+  checksum: c14eb042ed55a6edbe6d0d5b09627e6191ca730451c4086b0ea218c6cfd10645372f7eabb77141ea8f63e35bb4b8c7ed0e4e100b3cd6bba5e51c4b38581505b0
   languageName: node
   linkType: hard
 
-"react-native-ios-context-menu@npm:1.15.1":
-  version: 1.15.1
-  resolution: "react-native-ios-context-menu@npm:1.15.1"
+"react-native-ios-context-menu@npm:^1.15.3":
+  version: 1.15.3
+  resolution: "react-native-ios-context-menu@npm:1.15.3"
   dependencies:
     "@dominicstop/ts-event-emitter": ^1.1.0
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 3925783aa849e4af817ec2d7ad9e777da87587b0c95b44f1ee509c9a9b64d8471fb925f99ea9a5573a9028517fff75c441585b703f1d944c7451c0f7a708dd6e
-  languageName: node
-  linkType: hard
-
-"react-native-ios-context-menu@patch:react-native-ios-context-menu@npm%3A1.15.1#./.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch::locator=tooot%40workspace%3A.":
-  version: 1.15.1
-  resolution: "react-native-ios-context-menu@patch:react-native-ios-context-menu@npm%3A1.15.1#./.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch::version=1.15.1&hash=e3f0c8&locator=tooot%40workspace%3A."
-  dependencies:
-    "@dominicstop/ts-event-emitter": ^1.1.0
-  peerDependencies:
-    react: "*"
-    react-native: "*"
-  checksum: ad6bcca2cb3816bc6c52922540cb83e02a5a5217347293e8e4d710742c533afbd244cfd8d3fbe7cf453ba0715435987168bfc1326efec841422ea70a1c9f4a6a
+  checksum: 5c587fe95296b8ae5d93caa98a9816c56425755ba3a113230a8eba70b1eb1e117aa793a1b043e7970eca8d51a32a52695947ffca7555349688bd8723a72df4c6
   languageName: node
   linkType: hard
 
@@ -9744,13 +9783,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-reanimated@npm:^2.13.0":
-  version: 2.13.0
-  resolution: "react-native-reanimated@npm:2.13.0"
+"react-native-reanimated@npm:^2.14.4":
+  version: 2.14.4
+  resolution: "react-native-reanimated@npm:2.14.4"
   dependencies:
     "@babel/plugin-transform-object-assign": ^7.16.7
     "@babel/preset-typescript": ^7.16.7
-    "@types/invariant": ^2.2.35
+    convert-source-map: ^1.7.0
     invariant: ^2.2.4
     lodash.isequal: ^4.5.0
     setimmediate: ^1.0.5
@@ -9759,30 +9798,30 @@ __metadata:
     "@babel/core": ^7.0.0-0
     react: "*"
     react-native: "*"
-  checksum: 260249012b2e9d19f700bf7817b349c2643f71717b2a50a9da6e37e44eeadbbeee2bc02403f32e6a31617555a8b3ad5aabcbbac72300962908b32e14babbe503
+  checksum: ec24225a145a8636065b464660256bed99ba5f50c7f6c74899838f5563e59a342ea217c285a06be8bdd5549e2faaf1ebdac6986011a767ba814a4cf469ed9bdb
   languageName: node
   linkType: hard
 
-"react-native-safe-area-context@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "react-native-safe-area-context@npm:4.4.1"
+"react-native-safe-area-context@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "react-native-safe-area-context@npm:4.5.0"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: ef7c41ea59a34b114c6481fb130e66ef85e8d5b88acb46279131367761ca9fbf22cd310fe613f49b6c9b56dbd83e044be640f0532eda1d3856bf708e96335a35
+  checksum: 958df1d20492aa89c23d746f88409a3a3bd1b0d397c80310a4b0bbec9888cbbeb7579c9c92dad46841e2e6536491806206228ba009b7c8af970670aef8273a30
   languageName: node
   linkType: hard
 
-"react-native-screens@npm:^3.18.2":
-  version: 3.18.2
-  resolution: "react-native-screens@npm:3.18.2"
+"react-native-screens@npm:^3.19.0":
+  version: 3.19.0
+  resolution: "react-native-screens@npm:3.19.0"
   dependencies:
     react-freeze: ^1.0.0
     warn-once: ^0.1.0
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 8f7202baced736220710138469aea2c7b543662d820eb47170bfc98a0503f8c764d7509596ccbcc76cac6158e47a2c029444d6e1f78c20e98bcafeda15027ac1
+  checksum: 3a0116bf0628a735bdb87d7e4648f4bbac278152599a2bdd973e4dec92f87cb2c805dd7adb844d01236c7c92bab017ea8de59bea44d9f58397fddb6f9f3077c5
   languageName: node
   linkType: hard
 
@@ -9800,16 +9839,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-svg@npm:^13.6.0":
-  version: 13.6.0
-  resolution: "react-native-svg@npm:13.6.0"
+"react-native-svg@npm:^13.7.0":
+  version: 13.7.0
+  resolution: "react-native-svg@npm:13.7.0"
   dependencies:
     css-select: ^5.1.0
     css-tree: ^1.1.3
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 6d9b43d12c885982e69fe81d0bccc9b417d977782d4f66ef6964eb33d87ebc79c0a7b7b2dcae60be2857a9ce9178efe35e28de1bc9da92a69bc736177d507770
+  checksum: f3609dbb9d2614323914a8cc5ae11092aacb3a140e6d5ff57b255ddb6a9d2dc2efd5c28f65c6232e0b7228ec3231359540a7fa11ec92f944e6e98d570b147483
   languageName: node
   linkType: hard
 
@@ -10181,7 +10220,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reselect@npm:^4.0.0":
+"reselect@npm:^4.0.0, reselect@npm:^4.1.7":
   version: 4.1.7
   resolution: "reselect@npm:4.1.7"
   checksum: 738d8e2b8f0dca154ad29de6a209c9fbca2d70ae6788fd85df87f2c74b95a65bbf2d16d43a9e2faff39de34d17a29d706ba08a6b2ee5660c09589edbd19af7e1
@@ -10209,7 +10248,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.13.1, resolve@npm:^1.14.2":
+"resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.22.1":
   version: 1.22.1
   resolution: "resolve@npm:1.22.1"
   dependencies:
@@ -10231,7 +10270,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.13.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.13.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
   version: 1.22.1
   resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=c3c19d"
   dependencies:
@@ -10460,6 +10499,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:7.3.8, semver@npm:^7.3.5":
+  version: 7.3.8
+  resolution: "semver@npm:7.3.8"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
+  languageName: node
+  linkType: hard
+
 "semver@npm:^5.5.0, semver@npm:^5.6.0":
   version: 5.7.1
   resolution: "semver@npm:5.7.1"
@@ -10478,17 +10528,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.5":
-  version: 7.3.8
-  resolution: "semver@npm:7.3.8"
-  dependencies:
-    lru-cache: ^6.0.0
-  bin:
-    semver: bin/semver.js
-  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
-  languageName: node
-  linkType: hard
-
 "send@npm:0.18.0, send@npm:^0.18.0":
   version: 0.18.0
   resolution: "send@npm:0.18.0"
@@ -11356,38 +11395,39 @@ __metadata:
     "@formatjs/intl-numberformat": ^8.3.3
     "@formatjs/intl-pluralrules": ^5.1.8
     "@formatjs/intl-relativetimeformat": ^11.1.8
-    "@mattermost/react-native-paste-input": ^0.5.2
+    "@mattermost/react-native-paste-input": ^0.6.0
     "@neverdull-agency/expo-unlimited-secure-store": ^1.0.10
     "@react-native-async-storage/async-storage": ~1.17.11
-    "@react-native-camera-roll/camera-roll": ^5.2.1
+    "@react-native-camera-roll/camera-roll": ^5.2.3
     "@react-native-clipboard/clipboard": ^1.11.1
     "@react-native-community/blur": ^4.3.0
     "@react-native-community/netinfo": 9.3.7
     "@react-native-community/segmented-control": ^2.2.2
-    "@react-native-firebase/app": ^16.5.0
+    "@react-native-firebase/app": ^16.5.2
     "@react-native-menu/menu": ^0.7.3
-    "@react-navigation/bottom-tabs": ^6.5.2
-    "@react-navigation/native": ^6.1.1
-    "@react-navigation/native-stack": ^6.9.7
-    "@react-navigation/stack": ^6.3.10
-    "@sentry/react-native": 4.12.0
+    "@react-navigation/bottom-tabs": ^6.5.3
+    "@react-navigation/native": ^6.1.2
+    "@react-navigation/native-stack": ^6.9.8
+    "@react-navigation/stack": ^6.3.11
+    "@sentry/react-native": 4.13.0
     "@sharcoux/slider": ^6.1.1
-    "@tanstack/react-query": ^4.20.9
+    "@tanstack/react-query": ^4.23.0
     "@types/diff": ^5.0.2
     "@types/linkify-it": ^3.0.2
     "@types/lodash": ^4.14.191
-    "@types/react": ^18.0.26
+    "@types/react": ^18.0.27
     "@types/react-dom": ^18.0.10
-    "@types/react-native": ^0.70.8
+    "@types/react-native": ^0.70.9
     "@types/react-native-share-menu": ^5.0.2
     "@types/url-parse": ^1.4.8
-    axios: ^1.2.2
-    babel-plugin-module-resolver: ^4.1.0
+    axios: ^1.2.4
+    babel-plugin-module-resolver: ^5.0.0
     babel-plugin-transform-remove-console: ^6.9.4
     chalk: ^4.1.2
+    deprecated-react-native-prop-types: ^4.0.0
     diff: ^5.1.0
     dotenv: ^16.0.3
-    expo: ^47.0.12
+    expo: ^47.0.13
     expo-auth-session: ^3.8.0
     expo-av: ^13.1.0
     expo-constants: ^14.1.0
@@ -11406,7 +11446,7 @@ __metadata:
     expo-video-thumbnails: ^7.1.0
     expo-web-browser: ~12.0.0
     htmlparser2: ^8.0.1
-    i18next: ^22.4.8
+    i18next: ^22.4.9
     linkify-it: ^4.0.1
     lodash: ^4.17.21
     react: ^18.2.0
@@ -11417,21 +11457,20 @@ __metadata:
     react-native-blurhash: ^1.1.10
     react-native-clean-project: ^4.0.1
     react-native-fast-image: ^8.6.3
-    react-native-feather: ^1.1.2
     react-native-flash-message: ^0.4.0
-    react-native-gesture-handler: ~2.8.0
-    react-native-image-picker: ^4.10.3
-    react-native-ios-context-menu: ^1.15.1
+    react-native-gesture-handler: ~2.9.0
+    react-native-image-picker: ^5.0.1
+    react-native-ios-context-menu: ^1.15.3
     react-native-language-detection: ^0.2.2
     react-native-mmkv: ^2.5.1
     react-native-pager-view: ^6.1.2
     react-native-quick-base64: ^2.0.5
-    react-native-reanimated: ^2.13.0
+    react-native-reanimated: ^2.14.4
     react-native-reanimated-zoom: ^0.3.3
-    react-native-safe-area-context: ^4.4.1
-    react-native-screens: ^3.18.2
+    react-native-safe-area-context: ^4.5.0
+    react-native-screens: ^3.19.0
     react-native-share-menu: ^6.0.0
-    react-native-svg: ^13.6.0
+    react-native-svg: ^13.7.0
     react-native-swipe-list-view: ^3.2.9
     react-native-tab-view: ^3.3.4
     react-redux: ^8.0.5
@@ -11552,9 +11591,9 @@ __metadata:
   linkType: hard
 
 "ua-parser-js@npm:^0.7.30":
-  version: 0.7.32
-  resolution: "ua-parser-js@npm:0.7.32"
-  checksum: 6b6b035dd78a0ab3369f166ab6f26225d823d83630788806d634f16259297a8f4ae6fe0be4e48f4353ac10dffded3971d7745c55d1432fdfc78a893ba58ef044
+  version: 0.7.33
+  resolution: "ua-parser-js@npm:0.7.33"
+  checksum: 1510e9ec26fcaf0d8c6ae8f1078a8230e8816f083e1b5f453ea19d06b8ef2b8a596601c92148fd41899e8b3e5f83fa69c42332bd5729b931a721040339831696
   languageName: node
   linkType: hard