diff --git a/examples/SampleApp/App.tsx b/examples/SampleApp/App.tsx
index 6f427f6604..e52d0495ca 100644
--- a/examples/SampleApp/App.tsx
+++ b/examples/SampleApp/App.tsx
@@ -59,8 +59,6 @@ Geolocation.setRNConfiguration({
 });
 
 import type { LocalMessage, StreamChat, TextComposerMiddleware } from 'stream-chat';
-import { Toast } from './src/components/ToastComponent/Toast';
-import { useClientNotificationsToastHandler } from './src/hooks/useClientNotificationsToastHandler';
 import AsyncStore from './src/utils/AsyncStore.ts';
 import {
   MessageInputFloatingConfigItem,
@@ -377,7 +375,6 @@ const DrawerNavigatorWrapper: React.FC<{
         <AppOverlayProvider>
           <UserSearchProvider>
             <DrawerNavigator />
-            <Toast />
           </UserSearchProvider>
         </AppOverlayProvider>
       </StreamChatProvider>
@@ -403,7 +400,6 @@ const UserSelector = () => (
 // TODO: Split the stack into multiple stacks - ChannelStack, CreateChannelStack etc.
 const HomeScreen = () => {
   const { overlay } = useOverlayContext();
-  useClientNotificationsToastHandler();
 
   return (
     <Stack.Navigator
diff --git a/examples/SampleApp/src/components/AttachmentPickerContent.tsx b/examples/SampleApp/src/components/AttachmentPickerContent.tsx
index a7a56e13ef..f2102dfe2b 100644
--- a/examples/SampleApp/src/components/AttachmentPickerContent.tsx
+++ b/examples/SampleApp/src/components/AttachmentPickerContent.tsx
@@ -20,7 +20,7 @@ export const CustomAttachmentPickerContent = (props: AttachmentPickerContentProp
   } = useTheme();
 
   const Icon = useCallback(
-    () => <ShareLocationIcon stroke={semantics.textTertiary} />,
+    () => <ShareLocationIcon width={32} height={32} stroke={semantics.textTertiary} />,
     [semantics.textTertiary],
   );
 
diff --git a/examples/SampleApp/src/components/ScreenHeader.tsx b/examples/SampleApp/src/components/ScreenHeader.tsx
index 9d7ef3d4ca..ab1b5393a0 100644
--- a/examples/SampleApp/src/components/ScreenHeader.tsx
+++ b/examples/SampleApp/src/components/ScreenHeader.tsx
@@ -122,7 +122,7 @@ export const ScreenHeader: React.FC<ScreenHeaderProps> = (props) => {
   const {
     theme: { semantics },
   } = useTheme();
-  const { black, grey, white } = useLegacyColors();
+  const { black, grey } = useLegacyColors();
   const insets = useSafeAreaInsets();
 
   return (
@@ -130,7 +130,7 @@ export const ScreenHeader: React.FC<ScreenHeaderProps> = (props) => {
       style={[
         styles.safeAreaContainer,
         {
-          backgroundColor: white,
+          backgroundColor: semantics.backgroundCoreElevation1,
           borderBottomColor: semantics.borderCoreSubtle,
           height: HEADER_CONTENT_HEIGHT + (inSafeArea ? 0 : insets.top),
         },
diff --git a/examples/SampleApp/src/icons/ShareLocationIcon.tsx b/examples/SampleApp/src/icons/ShareLocationIcon.tsx
index 2680f19261..fd290834d0 100644
--- a/examples/SampleApp/src/icons/ShareLocationIcon.tsx
+++ b/examples/SampleApp/src/icons/ShareLocationIcon.tsx
@@ -2,9 +2,17 @@ import Svg, { Path } from 'react-native-svg';
 import { ColorValue } from 'react-native';
 
 // Icon for "Share Location" button, next to input box.
-export const ShareLocationIcon = ({ stroke }: { stroke: ColorValue }) => {
+export const ShareLocationIcon = ({
+  width,
+  height,
+  stroke,
+}: {
+  stroke: ColorValue;
+  width: number;
+  height: number;
+}) => {
   return (
-    <Svg width={20} height={20} viewBox='0 0 24 24' fill='none'>
+    <Svg width={width} height={height} viewBox='0 0 24 24' fill='none'>
       <Path
         d='M12 12c-1.654 0-3-1.345-3-3 0-1.654 1.346-3 3-3s3 1.346 3 3c0 1.655-1.346 3-3 3zm0-4a1.001 1.001 0 101 1c0-.551-.449-1-1-1z'
         fill={stroke}
diff --git a/package/src/components/Attachment/Giphy/Giphy.tsx b/package/src/components/Attachment/Giphy/Giphy.tsx
index 87d9c77eb1..db4a76f624 100644
--- a/package/src/components/Attachment/Giphy/Giphy.tsx
+++ b/package/src/components/Attachment/Giphy/Giphy.tsx
@@ -22,7 +22,7 @@ import { Button } from '../../ui/';
 
 export type GiphyPropsWithContext = Pick<
   MessageContextValue,
-  'handleAction' | 'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
+  'handleAction' | 'isMyMessage' | 'onLongPress' | 'onPress' | 'onPressIn' | 'preventPress'
 > &
   Pick<MessagesContextValue, 'additionalPressableProps' | 'giphyVersion'> & {
     attachment: Attachment;
@@ -34,6 +34,7 @@ const GiphyWithContext = (props: GiphyPropsWithContext) => {
     attachment,
     giphyVersion,
     handleAction,
+    isMyMessage,
     onLongPress,
     onPress,
     onPressIn,
@@ -53,7 +54,7 @@ const GiphyWithContext = (props: GiphyPropsWithContext) => {
     },
   } = useTheme();
 
-  const styles = useStyles();
+  const styles = useStyles({ isMyMessage });
 
   const uri = image_url || thumb_url;
 
@@ -122,7 +123,7 @@ const GiphyWithContext = (props: GiphyPropsWithContext) => {
         }
       }}
       testID='giphy-attachment'
-      style={styles.container}
+      style={[styles.container, container]}
       {...additionalPressableProps}
     >
       <GiphyImage attachment={attachment} giphyVersion={giphyVersion} />
@@ -134,10 +135,12 @@ const areEqual = (prevProps: GiphyPropsWithContext, nextProps: GiphyPropsWithCon
   const {
     attachment: { actions: prevActions, image_url: prevImageUrl, thumb_url: prevThumbUrl },
     giphyVersion: prevGiphyVersion,
+    isMyMessage: prevIsMyMessage,
   } = prevProps;
   const {
     attachment: { actions: nextActions, image_url: nextImageUrl, thumb_url: nextThumbUrl },
     giphyVersion: nextGiphyVersion,
+    isMyMessage: nextIsMyMessage,
   } = nextProps;
 
   const imageUrlEqual = prevImageUrl === nextImageUrl;
@@ -165,6 +168,11 @@ const areEqual = (prevProps: GiphyPropsWithContext, nextProps: GiphyPropsWithCon
     return false;
   }
 
+  const isMyMessageEqual = prevIsMyMessage === nextIsMyMessage;
+  if (!isMyMessageEqual) {
+    return false;
+  }
+
   return true;
 };
 
@@ -178,7 +186,8 @@ export type GiphyProps = Partial<GiphyPropsWithContext> & {
  * UI component for card in attachments.
  */
 export const Giphy = (props: GiphyProps) => {
-  const { handleAction, onLongPress, onPress, onPressIn, preventPress } = useMessageContext();
+  const { handleAction, isMyMessage, onLongPress, onPress, onPressIn, preventPress } =
+    useMessageContext();
   const { additionalPressableProps, giphyVersion } = useMessagesContext();
 
   return (
@@ -187,6 +196,7 @@ export const Giphy = (props: GiphyProps) => {
         additionalPressableProps,
         giphyVersion,
         handleAction,
+        isMyMessage,
         onLongPress,
         onPress,
         onPressIn,
@@ -199,14 +209,16 @@ export const Giphy = (props: GiphyProps) => {
 
 Giphy.displayName = 'Giphy{messageItemView{giphy}}';
 
-const useStyles = () => {
+const useStyles = ({ isMyMessage }: Pick<GiphyPropsWithContext, 'isMyMessage'>) => {
   const {
     theme: { semantics },
   } = useTheme();
   return useMemo(() => {
     return StyleSheet.create({
       container: {
-        backgroundColor: semantics.chatBgOutgoing,
+        backgroundColor: isMyMessage
+          ? semantics.chatBgAttachmentOutgoing
+          : semantics.chatBgAttachmentIncoming,
         borderRadius: primitives.radiusLg,
         maxWidth: 256, // TODO: Not sure how to fix this
         overflow: 'hidden',
@@ -240,5 +252,5 @@ const useStyles = () => {
         lineHeight: primitives.typographyLineHeightTight,
       },
     });
-  }, [semantics]);
+  }, [isMyMessage, semantics]);
 };
diff --git a/package/src/components/Attachment/__tests__/Giphy.test.js b/package/src/components/Attachment/__tests__/Giphy.test.js
index d35e5839bd..dc430c7031 100644
--- a/package/src/components/Attachment/__tests__/Giphy.test.js
+++ b/package/src/components/Attachment/__tests__/Giphy.test.js
@@ -14,7 +14,7 @@ import { MessageProvider } from '../../../contexts/messageContext/MessageContext
 import { MessagesProvider } from '../../../contexts/messagesContext/MessagesContext';
 import { OverlayProvider } from '../../../contexts/overlayContext/OverlayProvider';
 
-import { ThemeProvider } from '../../../contexts/themeContext/ThemeContext';
+import { mergeThemes, ThemeProvider } from '../../../contexts/themeContext/ThemeContext';
 import { getOrCreateChannelApi } from '../../../mock-builders/api/getOrCreateChannel';
 import { useMockedApis } from '../../../mock-builders/api/useMockedApis';
 import { generateGiphyAttachment } from '../../../mock-builders/generator/attachment';
@@ -36,6 +36,8 @@ const streami18n = new Streami18n({
 });
 
 describe('Giphy', () => {
+  const lightTheme = mergeThemes({ scheme: 'light' });
+
   const getAttachmentComponent = (props, messageContextValue = {}) => {
     const message = generateMessage();
     return (
@@ -115,6 +117,36 @@ describe('Giphy', () => {
     });
   });
 
+  it('uses the outgoing attachment background for outgoing giphys', async () => {
+    render(getAttachmentComponent({ attachment }, { isMyMessage: true }));
+
+    await waitFor(() => {
+      const style = screen.getByTestId('giphy-attachment').props.style;
+      expect(style).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            backgroundColor: lightTheme.semantics.chatBgAttachmentOutgoing,
+          }),
+        ]),
+      );
+    });
+  });
+
+  it('uses the incoming attachment background for incoming giphys', async () => {
+    render(getAttachmentComponent({ attachment }, { isMyMessage: false }));
+
+    await waitFor(() => {
+      const style = screen.getByTestId('giphy-attachment').props.style;
+      expect(style).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            backgroundColor: lightTheme.semantics.chatBgAttachmentIncoming,
+          }),
+        ]),
+      );
+    });
+  });
+
   it('"giphy" attachment size should be customisable', async () => {
     attachment.giphy = giphy;
     render(getAttachmentComponent({ attachment, giphyVersion: 'fixed_height' }));
diff --git a/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx b/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx
index 59ee68645b..e42d2cd7d2 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx
@@ -201,7 +201,7 @@ export const AttachmentCameraPicker = (
       onPress={openCameraPicker}
       height={height}
       buttonText={t('Open Camera')}
-      description={t('Take a video and share')}
+      description={t(videoOnly ? 'Take a video and share' : 'Take a photo and share')}
     />
   );
 };
@@ -216,8 +216,8 @@ export const AttachmentFilePicker = (props: AttachmentPickerContentProps) => {
       Icon={FilePickerIcon}
       onPress={pickFile}
       height={height}
-      buttonText={t('Pick document')}
-      description={t('Pick a document to share it with everyone')}
+      buttonText={t('Open Files')}
+      description={t('Select files to share')}
     />
   );
 };
diff --git a/package/src/components/AttachmentPicker/components/AttachmentPickerGenericContent.tsx b/package/src/components/AttachmentPicker/components/AttachmentPickerGenericContent.tsx
index 768680a576..5731a3b68a 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentPickerGenericContent.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentPickerGenericContent.tsx
@@ -21,12 +21,20 @@ const useStyles = () => {
           paddingHorizontal: primitives.spacing2xl,
           paddingBottom: primitives.spacing3xl,
         },
-        infoContainer: { flex: 1, alignItems: 'center', justifyContent: 'center' },
+        infoContainer: {
+          flex: 1,
+          gap: primitives.spacingSm,
+          alignItems: 'center',
+          justifyContent: 'center',
+        },
+        actionContainer: {
+          gap: primitives.spacingMd,
+          alignItems: 'center',
+          justifyContent: 'center',
+        },
         text: {
           fontSize: primitives.typographyFontSizeMd,
           color: semantics.textSecondary,
-          marginTop: 8,
-          marginHorizontal: 24,
           textAlign: 'center',
           maxWidth: 200,
         },
@@ -54,13 +62,13 @@ export const AttachmentPickerGenericContent = (props: AttachmentPickerGenericCon
     theme: {
       semantics,
       attachmentPicker: {
-        content: { container, text, infoContainer },
+        content: { actionContainer, container, text, infoContainer },
       },
     },
   } = useTheme();
 
   const ThemedIcon = useCallback(
-    () => <Icon width={22} height={22} stroke={semantics.textTertiary} />,
+    () => <Icon width={32} height={32} stroke={semantics.textTertiary} />,
     [Icon, semantics.textTertiary],
   );
 
@@ -76,15 +84,17 @@ export const AttachmentPickerGenericContent = (props: AttachmentPickerGenericCon
     >
       <View style={[styles.infoContainer, infoContainer]}>
         <ThemedIcon />
-        <Text style={[styles.text, text]}>{description}</Text>
+        <View style={[styles.actionContainer, actionContainer]}>
+          <Text style={[styles.text, text]}>{description}</Text>
+          <Button
+            variant={'secondary'}
+            type={'outline'}
+            size={'md'}
+            label={buttonText}
+            onPress={onPress}
+          />
+        </View>
       </View>
-      <Button
-        variant={'secondary'}
-        type={'outline'}
-        size={'lg'}
-        label={buttonText}
-        onPress={onPress}
-      />
     </View>
   );
 };
diff --git a/package/src/components/AutoCompleteInput/AutoCompleteSuggestionList.tsx b/package/src/components/AutoCompleteInput/AutoCompleteSuggestionList.tsx
index 07988eaa55..897bf2c271 100644
--- a/package/src/components/AutoCompleteInput/AutoCompleteSuggestionList.tsx
+++ b/package/src/components/AutoCompleteInput/AutoCompleteSuggestionList.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
-import { FlatList, StyleSheet } from 'react-native';
+import { StyleSheet } from 'react-native';
+
+import { FlatList } from 'react-native-gesture-handler';
 
 import Animated, { LinearTransition, ZoomIn, ZoomOut } from 'react-native-reanimated';
 
diff --git a/package/src/components/ChannelPreview/ChannelDetailsBottomSheet.tsx b/package/src/components/ChannelPreview/ChannelDetailsBottomSheet.tsx
index 670fd55393..c139e05bfd 100644
--- a/package/src/components/ChannelPreview/ChannelDetailsBottomSheet.tsx
+++ b/package/src/components/ChannelPreview/ChannelDetailsBottomSheet.tsx
@@ -141,7 +141,7 @@ const useStyles = () => {
           flexDirection: 'row',
           padding: primitives.spacingSm,
           gap: primitives.spacingSm,
-          backgroundColor: semantics.backgroundCoreElevation1,
+          backgroundColor: 'transparent',
           ...header.container,
         },
         headerMeta: {
diff --git a/package/src/components/ChannelPreview/ChannelPreviewMessage.tsx b/package/src/components/ChannelPreview/ChannelPreviewMessage.tsx
index 98509ee6c9..ca7e17fdde 100644
--- a/package/src/components/ChannelPreview/ChannelPreviewMessage.tsx
+++ b/package/src/components/ChannelPreview/ChannelPreviewMessage.tsx
@@ -104,7 +104,9 @@ export const ChannelPreviewMessage = (props: ChannelPreviewMessageProps) => {
     return (
       <View style={styles.container}>
         <PollIcon height={16} width={16} stroke={semantics.textSecondary} />
-        <Text style={styles.subtitle}>{pollLabel}</Text>
+        <Text ellipsizeMode='tail' numberOfLines={1} style={styles.subtitle}>
+          {pollLabel}
+        </Text>
       </View>
     );
   }
diff --git a/package/src/components/ImageGallery/components/ImageGrid.tsx b/package/src/components/ImageGallery/components/ImageGrid.tsx
index 9e7df0a1f2..28c7165e27 100644
--- a/package/src/components/ImageGallery/components/ImageGrid.tsx
+++ b/package/src/components/ImageGallery/components/ImageGrid.tsx
@@ -12,6 +12,7 @@ import type {
   ImageGalleryAsset,
   ImageGalleryState,
 } from '../../../state-store/image-gallery-state-store';
+import { primitives } from '../../../theme';
 import { FileTypes } from '../../../types/types';
 import { StreamBottomSheetModalFlatList } from '../../UIComponents/StreamBottomSheetModalFlatList';
 
@@ -108,8 +109,9 @@ const useStyles = () => {
     return StyleSheet.create({
       contentContainer: {
         flexGrow: 1,
-        ...contentContainer,
         backgroundColor: semantics.backgroundCoreApp,
+        marginTop: primitives.spacingSm,
+        ...contentContainer,
       },
       image: { margin: 1, ...gridImage },
     });
diff --git a/package/src/components/Indicators/LoadingIndicator.tsx b/package/src/components/Indicators/LoadingIndicator.tsx
index 1e6593345d..4f8dc88020 100644
--- a/package/src/components/Indicators/LoadingIndicator.tsx
+++ b/package/src/components/Indicators/LoadingIndicator.tsx
@@ -6,7 +6,7 @@ import { useTranslationContext } from '../../contexts/translationContext/Transla
 import { primitives } from '../../theme';
 import { Spinner } from '../UIComponents/Spinner';
 
-type LoadingIndicatorWrapperProps = { text: string };
+type LoadingIndicatorWrapperProps = { text: string | undefined };
 
 const LoadingIndicatorWrapper = ({ text }: LoadingIndicatorWrapperProps) => {
   const styles = useStyles();
@@ -14,9 +14,11 @@ const LoadingIndicatorWrapper = ({ text }: LoadingIndicatorWrapperProps) => {
   return (
     <View style={styles.container}>
       <Spinner height={20} width={20} />
-      <Text style={styles.loadingText} testID='loading'>
-        {text}
-      </Text>
+      {text ? (
+        <Text style={styles.loadingText} testID='loading'>
+          {text}
+        </Text>
+      ) : null}
     </View>
   );
 };
@@ -44,7 +46,7 @@ export const LoadingIndicator = (props: LoadingProps) => {
     case 'message':
       return <LoadingIndicatorWrapper text={t('Loading messages...')} />;
     case 'threads':
-      return <LoadingIndicatorWrapper text={t('Loading threads...')} />;
+      return <LoadingIndicatorWrapper text={undefined} />;
     default:
       return <LoadingIndicatorWrapper text={t('Loading...')} />;
   }
diff --git a/package/src/components/Message/Message.tsx b/package/src/components/Message/Message.tsx
index 786e097696..dbca30c0e4 100644
--- a/package/src/components/Message/Message.tsx
+++ b/package/src/components/Message/Message.tsx
@@ -381,21 +381,12 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
     }
   };
 
-  const onPressQuotedMessage = (quotedMessage: LocalMessage) => {
-    if (!goToMessage) {
-      return;
-    }
-
-    goToMessage(quotedMessage.id);
-  };
-
   const errorOrFailed = message.type === 'error' || message.status === MessageStatusTypes.FAILED;
 
   const onPress = (error = errorOrFailed) => {
     if (dismissKeyboardOnMessageTouch) {
       dismissKeyboard();
     }
-    const quotedMessage = message.quoted_message;
     if (error) {
       /**
        * If its a Blocked message, we don't do anything as per specs.
@@ -411,8 +402,6 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
         return;
       }
       showMessageOverlay();
-    } else if (quotedMessage) {
-      onPressQuotedMessage(quotedMessage);
     }
   };
 
diff --git a/package/src/components/Message/MessageItemView/MessageContent.tsx b/package/src/components/Message/MessageItemView/MessageContent.tsx
index cb65156006..429e299e03 100644
--- a/package/src/components/Message/MessageItemView/MessageContent.tsx
+++ b/package/src/components/Message/MessageItemView/MessageContent.tsx
@@ -121,6 +121,7 @@ const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
     FileAttachmentGroup,
     Gallery,
     groupStyles,
+    goToMessage,
     isMessageAIGenerated,
     isMyMessage,
     isVeryLastMessage,
@@ -221,7 +222,6 @@ const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
 
   const { setNativeScrollability } = useMessageListItemContext();
   const hasContentSideViews = !!(MessageContentLeadingView || MessageContentTrailingView);
-
   const contentBody = (
     <>
       <View
@@ -240,12 +240,45 @@ const MessageContentWithContext = (props: MessageContentPropsWithContext) => {
             case 'quoted_reply':
               return (
                 message.quoted_message && (
-                  <View
+                  <Pressable
+                    disabled={!goToMessage}
                     key={`quoted_reply_${messageContentOrderIndex}`}
+                    onLongPress={(event) => {
+                      if (onLongPress) {
+                        onLongPress({
+                          emitter: 'messageContent',
+                          event,
+                        });
+                      }
+                    }}
+                    onPress={(event) => {
+                      if (!message.quoted_message || !goToMessage) {
+                        return;
+                      }
+
+                      if (onPress) {
+                        onPress({
+                          defaultHandler: () => goToMessage(message.quoted_message!.id),
+                          emitter: 'messageContent',
+                          event,
+                        });
+                        return;
+                      }
+
+                      goToMessage(message.quoted_message.id);
+                    }}
+                    onPressIn={(event) => {
+                      if (onPressIn) {
+                        onPressIn({
+                          emitter: 'messageContent',
+                          event,
+                        });
+                      }
+                    }}
                     style={[styles.replyContainer, replyContainer]}
                   >
                     <Reply mode='reply' styles={replyStyles} />
-                  </View>
+                  </Pressable>
                 )
               );
             case 'attachments':
@@ -584,7 +617,8 @@ export const MessageContent = (props: MessageContentProps) => {
   const messageHasSingleFile =
     messageContentOrder.length === 1 && messageContentOrder[0] === 'files' && isSingleFile;
   const messageHasOnlyText = messageContentOrder.length === 1 && messageContentOrder[0] === 'text';
-  const messageHasGiphyOrImgur =
+  const messageHasStandaloneGiphyOrImgur =
+    !message.quoted_message &&
     otherAttachments.filter(
       (file) => file.type === FileTypes.Giphy || file.type === FileTypes.Imgur,
     ).length > 0;
@@ -594,17 +628,20 @@ export const MessageContent = (props: MessageContentProps) => {
     messageHasSingleMedia ||
     messageHasSingleFile ||
     messageHasOnlyText ||
-    messageHasGiphyOrImgur;
+    messageHasStandaloneGiphyOrImgur;
 
   const hidePaddingHorizontal =
-    messageHasPoll || messageHasSingleMedia || messageHasSingleFile || messageHasGiphyOrImgur;
+    messageHasPoll ||
+    messageHasSingleMedia ||
+    messageHasSingleFile ||
+    messageHasStandaloneGiphyOrImgur;
 
   const hidePaddingBottom =
     messageHasPoll ||
     messageHasSingleMedia ||
     messageHasSingleFile ||
     messageHasOnlyText ||
-    messageHasGiphyOrImgur ||
+    messageHasStandaloneGiphyOrImgur ||
     (messageContentOrder.length > 1 &&
       messageContentOrder[messageContentOrder.length - 1] === 'text');
 
diff --git a/package/src/components/Message/MessageItemView/MessageItemView.tsx b/package/src/components/Message/MessageItemView/MessageItemView.tsx
index b21f5a477f..fb2b658f59 100644
--- a/package/src/components/Message/MessageItemView/MessageItemView.tsx
+++ b/package/src/components/Message/MessageItemView/MessageItemView.tsx
@@ -17,6 +17,7 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useStableCallback } from '../../../hooks/useStableCallback';
 
 import { primitives } from '../../../theme';
+import { FileTypes } from '../../../types/types';
 import { checkMessageEquality, checkQuotedMessageEquality } from '../../../utils/utils';
 import { useMessageData } from '../hooks/useMessageData';
 
@@ -293,10 +294,14 @@ const MessageItemViewWithContext = (props: MessageItemViewPropsWithContext) => {
   });
 
   const groupStyle = `${alignment}_${groupStyles?.[0]?.toLowerCase?.()}`;
+  const hasStandaloneGiphyOrImgur =
+    !message.quoted_message &&
+    otherAttachments.length > 0 &&
+    (otherAttachments[0].type === FileTypes.Giphy || otherAttachments[0].type === FileTypes.Imgur);
 
   let noBorder = onlyEmojis && !message.quoted_message;
   if (otherAttachments.length) {
-    if (otherAttachments[0].type === 'giphy' && !isMyMessage) {
+    if (hasStandaloneGiphyOrImgur && !isMyMessage) {
       noBorder = false;
     } else {
       noBorder = true;
@@ -306,10 +311,8 @@ const MessageItemViewWithContext = (props: MessageItemViewPropsWithContext) => {
   let backgroundColor = semantics.chatBgOutgoing;
   if (onlyEmojis && !message.quoted_message) {
     backgroundColor = 'transparent';
-  } else if (otherAttachments.length) {
-    if (otherAttachments[0].type === 'giphy') {
-      backgroundColor = 'transparent';
-    }
+  } else if (hasStandaloneGiphyOrImgur) {
+    backgroundColor = 'transparent';
   } else if (isMessageReceivedOrErrorType) {
     backgroundColor = semantics.chatBgIncoming;
   }
diff --git a/package/src/components/Message/MessageItemView/MessageReplies.tsx b/package/src/components/Message/MessageItemView/MessageReplies.tsx
index 42649c1a47..d44e0aba05 100644
--- a/package/src/components/Message/MessageItemView/MessageReplies.tsx
+++ b/package/src/components/Message/MessageItemView/MessageReplies.tsx
@@ -235,7 +235,7 @@ const useStyles = () => {
         gap: primitives.spacingXs,
       },
       messageRepliesText: {
-        color: shouldUseOverlayStyles ? semantics.textOnAccent : semantics.textPrimary,
+        color: shouldUseOverlayStyles ? semantics.textOnAccent : semantics.textLink,
         fontSize: primitives.typographyFontSizeSm,
         fontWeight: primitives.typographyFontWeightSemiBold,
         lineHeight: primitives.typographyLineHeightTight,
diff --git a/package/src/components/Message/MessageItemView/MessageStatus.tsx b/package/src/components/Message/MessageItemView/MessageStatus.tsx
index a4a4ea650a..5046ac7ba7 100644
--- a/package/src/components/Message/MessageItemView/MessageStatus.tsx
+++ b/package/src/components/Message/MessageItemView/MessageStatus.tsx
@@ -29,7 +29,6 @@ const MessageStatusWithContext = (props: MessageStatusPropsWithContext) => {
       messageItemView: {
         status: { checkAllIcon, checkIcon, container, timeIcon },
       },
-      semantics,
     },
   } = useTheme();
 
@@ -54,14 +53,14 @@ const MessageStatusWithContext = (props: MessageStatusPropsWithContext) => {
       {read ? (
         <CheckAll
           height={16}
-          stroke={semantics.accentPrimary}
+          stroke={styles.readCheck.color}
           width={16}
           accessibilityLabel='Read'
           {...checkAllIcon}
         />
       ) : delivered ? (
         <CheckAll
-          stroke={semantics.chatTextTimestamp}
+          stroke={styles.deliveredCheck.color}
           height={16}
           width={16}
           accessibilityLabel='Delivered'
@@ -69,7 +68,7 @@ const MessageStatusWithContext = (props: MessageStatusPropsWithContext) => {
         />
       ) : sending ? (
         <Time
-          stroke={semantics.chatTextTimestamp}
+          stroke={styles.sendingCheck.color}
           height={16}
           width={16}
           accessibilityLabel='Sending'
@@ -77,7 +76,7 @@ const MessageStatusWithContext = (props: MessageStatusPropsWithContext) => {
         />
       ) : sent ? (
         <Check
-          stroke={semantics.chatTextTimestamp}
+          stroke={styles.sentCheck.color}
           height={16}
           width={16}
           accessibilityLabel='Sent'
@@ -162,6 +161,18 @@ const useStyles = () => {
         flexDirection: 'row',
         gap: primitives.spacingXxs,
       },
+      readCheck: {
+        color: shouldUseOverlayStyles ? semantics.textOnAccent : semantics.accentPrimary,
+      },
+      deliveredCheck: {
+        color: shouldUseOverlayStyles ? semantics.textOnAccent : semantics.chatTextTimestamp,
+      },
+      sendingCheck: {
+        color: shouldUseOverlayStyles ? semantics.textOnAccent : semantics.chatTextTimestamp,
+      },
+      sentCheck: {
+        color: shouldUseOverlayStyles ? semantics.textOnAccent : semantics.chatTextTimestamp,
+      },
     });
   }, [shouldUseOverlayStyles, semantics]);
 };
diff --git a/package/src/components/Message/MessageItemView/__tests__/MessageContent.test.js b/package/src/components/Message/MessageItemView/__tests__/MessageContent.test.js
index 21fbbeee46..994c967702 100644
--- a/package/src/components/Message/MessageItemView/__tests__/MessageContent.test.js
+++ b/package/src/components/Message/MessageItemView/__tests__/MessageContent.test.js
@@ -7,7 +7,10 @@ import { ChannelsStateProvider } from '../../../../contexts/channelsStateContext
 
 import { getOrCreateChannelApi } from '../../../../mock-builders/api/getOrCreateChannel';
 import { useMockedApis } from '../../../../mock-builders/api/useMockedApis';
-import { generateVideoAttachment } from '../../../../mock-builders/generator/attachment';
+import {
+  generateGiphyAttachment,
+  generateVideoAttachment,
+} from '../../../../mock-builders/generator/attachment';
 import { generateChannelResponse } from '../../../../mock-builders/generator/channel';
 import { generateMember } from '../../../../mock-builders/generator/member';
 import { generateMessage } from '../../../../mock-builders/generator/message';
@@ -326,6 +329,46 @@ describe('MessageContent', () => {
     expect(contentContainerStyle.paddingBottom).toBe(0);
   });
 
+  it('keeps content padding for a quoted reply with a giphy attachment', async () => {
+    const user = generateUser();
+    const message = generateMessage({
+      attachments: [generateGiphyAttachment()],
+      quoted_message: generateMessage({ text: 'quoted message', user }),
+      text: '',
+      user,
+    });
+
+    renderMessage({ message });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('message-content-wrapper')).toBeTruthy();
+      expect(screen.getByTestId('giphy-attachment')).toBeTruthy();
+    });
+
+    const giphyAttachment = screen.getByTestId('giphy-attachment');
+    let ancestor = giphyAttachment.parent;
+    let contentContainerStyle;
+
+    while (ancestor && !contentContainerStyle) {
+      const flattenedStyle = StyleSheet.flatten(ancestor.props.style);
+      if (
+        flattenedStyle &&
+        'paddingTop' in flattenedStyle &&
+        'paddingHorizontal' in flattenedStyle &&
+        'paddingBottom' in flattenedStyle
+      ) {
+        contentContainerStyle = flattenedStyle;
+        break;
+      }
+      ancestor = ancestor.parent;
+    }
+
+    expect(contentContainerStyle).toBeTruthy();
+    expect(contentContainerStyle.paddingTop).toBeGreaterThan(0);
+    expect(contentContainerStyle.paddingHorizontal).toBeGreaterThan(0);
+    expect(contentContainerStyle.paddingBottom).toBeGreaterThan(0);
+  });
+
   it('renders the FileAttachment component when a file attachment exists', async () => {
     const user = generateUser();
     const message = generateMessage({
diff --git a/package/src/components/Message/MessageItemView/__tests__/MessageItemView.test.js b/package/src/components/Message/MessageItemView/__tests__/MessageItemView.test.js
index 14d7e5a28a..367d4a67f3 100644
--- a/package/src/components/Message/MessageItemView/__tests__/MessageItemView.test.js
+++ b/package/src/components/Message/MessageItemView/__tests__/MessageItemView.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Text } from 'react-native';
+import { StyleSheet, Text } from 'react-native';
 import { GestureDetector } from 'react-native-gesture-handler';
 
 import { cleanup, render, screen, waitFor } from '@testing-library/react-native';
@@ -10,6 +10,7 @@ import { useMessageContext } from '../../../../contexts/messageContext/MessageCo
 
 import { getOrCreateChannelApi } from '../../../../mock-builders/api/getOrCreateChannel';
 import { useMockedApis } from '../../../../mock-builders/api/useMockedApis';
+import { generateGiphyAttachment } from '../../../../mock-builders/generator/attachment';
 import { generateChannelResponse } from '../../../../mock-builders/generator/channel';
 import { generateMember } from '../../../../mock-builders/generator/member';
 import { generateMessage } from '../../../../mock-builders/generator/message';
@@ -256,4 +257,23 @@ describe('MessageItemView', () => {
       });
     });
   });
+
+  it('keeps the message shell background for a quoted reply with a giphy attachment', async () => {
+    const user = generateUser();
+    const message = generateMessage({
+      attachments: [generateGiphyAttachment()],
+      quoted_message: generateMessage({ text: 'quoted message', user }),
+      text: '',
+      user,
+    });
+
+    renderMessage({ message });
+
+    await waitFor(() => {
+      const wrapperStyle = StyleSheet.flatten(
+        screen.getByTestId('message-content-wrapper').props.style,
+      );
+      expect(wrapperStyle.backgroundColor).not.toBe('transparent');
+    });
+  });
 });
diff --git a/package/src/components/MessageInput/ShowThreadMessageInChannelButton.tsx b/package/src/components/MessageInput/ShowThreadMessageInChannelButton.tsx
index bab94bfdaf..c0aaeaaa66 100644
--- a/package/src/components/MessageInput/ShowThreadMessageInChannelButton.tsx
+++ b/package/src/components/MessageInput/ShowThreadMessageInChannelButton.tsx
@@ -76,6 +76,7 @@ export const ShowThreadMessageInChannelButtonWithContext = (
               showReplyInChannel
                 ? {
                     backgroundColor: semantics.controlRadioCheckBgSelected,
+                    borderWidth: 0,
                     ...checkBoxActive,
                   }
                 : { ...checkBoxInactive },
diff --git a/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap b/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap
index 62004760c8..99456ca166 100644
--- a/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap
+++ b/package/src/components/MessageInput/__tests__/__snapshots__/AttachButton.test.js.snap
@@ -1800,7 +1800,7 @@ exports[`AttachButton should render an disabled AttachButton 1`] = `
             },
             {
               "backgroundColor": undefined,
-              "borderColor": "#d5dbe1",
+              "borderColor": "#ebeef1",
               "borderWidth": 1,
               "height": 48,
               "width": 48,
diff --git a/package/src/components/Poll/components/MultipleVotesSettings.tsx b/package/src/components/Poll/components/MultipleVotesSettings.tsx
index 569aac18ed..403944fbce 100644
--- a/package/src/components/Poll/components/MultipleVotesSettings.tsx
+++ b/package/src/components/Poll/components/MultipleVotesSettings.tsx
@@ -169,6 +169,7 @@ export const MultipleVotesSettings = () => {
             LeadingIcon={Minus}
             onPress={decrementMaxVotes}
             disabled={decrementDisabled}
+            style={decrementDisabled ? styles.buttonDisabled : styles.buttonEnabled}
             testID='max-votes-decrement'
           />
           <MaxVotesTextInput />
@@ -180,6 +181,7 @@ export const MultipleVotesSettings = () => {
             LeadingIcon={Plus}
             onPress={incrementMaxVotes}
             disabled={incrementDisabled}
+            style={incrementDisabled ? styles.buttonDisabled : styles.buttonEnabled}
             testID='max-votes-increment'
           />
         </Animated.View>
@@ -235,6 +237,12 @@ const useStyles = () => {
         paddingVertical: primitives.spacingMd,
         textAlign: I18nManager.isRTL ? 'right' : 'left',
       },
+      buttonEnabled: {
+        borderColor: semantics.borderCoreOnSurface,
+      },
+      buttonDisabled: {
+        borderColor: semantics.borderUtilityDisabledOnSurface,
+      },
     });
   }, [semantics]);
 };
diff --git a/package/src/components/Poll/components/PollOption.tsx b/package/src/components/Poll/components/PollOption.tsx
index 2df1a6cb28..d0a45b5509 100644
--- a/package/src/components/Poll/components/PollOption.tsx
+++ b/package/src/components/Poll/components/PollOption.tsx
@@ -124,14 +124,18 @@ export const PollOption = ({ option, showProgressBar = true, forceIncoming }: Po
       <VoteButton option={option} />
       <View style={[styles.info, info]}>
         <View style={[styles.header, header]}>
-          <Text style={[styles.text, text]}>{option.text}</Text>
+          <Text ellipsizeMode='tail' numberOfLines={2} style={[styles.text, text]}>
+            {option.text}
+          </Text>
           <View style={[styles.votesContainer, votesContainer]}>
-            <UserAvatarStack
-              users={relevantVotes.map((vote: PollVote) => vote.user as UserResponse)}
-              overlap={0.2}
-              maxVisible={3}
-              avatarSize='xs'
-            />
+            {relevantVotes.length > 0 ? (
+              <UserAvatarStack
+                users={relevantVotes.map((vote: PollVote) => vote.user as UserResponse)}
+                overlap={0.2}
+                maxVisible={3}
+                avatarSize='xs'
+              />
+            ) : null}
 
             <Text style={[styles.votesText, votesText]}>{voteCountsByOption[option.id] || 0}</Text>
           </View>
@@ -223,10 +227,14 @@ const useStyles = () => {
       },
       header: {
         flexDirection: 'row',
-        justifyContent: 'space-between',
+        alignItems: 'flex-start',
+        gap: primitives.spacingXs,
+        minWidth: 0,
       },
       text: {
         color: semantics.chatTextIncoming,
+        flexGrow: 1,
+        flexShrink: 1,
         fontSize: primitives.typographyFontSizeSm,
         fontWeight: primitives.typographyFontWeightRegular,
         lineHeight: primitives.typographyLineHeightTight,
@@ -234,9 +242,17 @@ const useStyles = () => {
       },
       info: {
         flexGrow: 1,
+        flexShrink: 1,
+        gap: primitives.spacingXs,
+        minWidth: 0,
+      },
+      votesContainer: {
+        alignItems: 'center',
+        flexDirection: 'row',
+        flexShrink: 0,
         gap: primitives.spacingXs,
+        minHeight: 20,
       },
-      votesContainer: { flexDirection: 'row', gap: primitives.spacingXs, alignItems: 'center' },
       votesText: {
         color: semantics.chatTextIncoming,
         fontSize: primitives.typographyFontSizeXs,
diff --git a/package/src/components/ThreadList/ThreadList.tsx b/package/src/components/ThreadList/ThreadList.tsx
index 909fa7a797..0e7909b36a 100644
--- a/package/src/components/ThreadList/ThreadList.tsx
+++ b/package/src/components/ThreadList/ThreadList.tsx
@@ -45,7 +45,7 @@ export const DefaultThreadListLoadingIndicator = () => (
     ))}
   </View>
 );
-export const DefaultThreadListLoadingNextIndicator = () => <LoadingIndicator />;
+export const DefaultThreadListLoadingNextIndicator = () => <LoadingIndicator listType='threads' />;
 
 const renderItem = (props: { item: Thread }) => <ThreadListItem thread={props.item} />;
 
diff --git a/package/src/components/ui/Button/hooks/useButtonStyles.ts b/package/src/components/ui/Button/hooks/useButtonStyles.ts
index 1b9528bc7f..9053dfb063 100644
--- a/package/src/components/ui/Button/hooks/useButtonStyles.ts
+++ b/package/src/components/ui/Button/hooks/useButtonStyles.ts
@@ -79,7 +79,7 @@ export const useButtonStyles = ({ variant, type }: ButtonStylesConfig) => {
         borderColor: semantics.buttonSecondaryBorder,
         disabledForegroundColor: semantics.textDisabled,
         disabledBackgroundColor: undefined,
-        disabledBorderColor: semantics.buttonSecondaryBorder,
+        disabledBorderColor: semantics.borderUtilityDisabled,
       },
       secondaryGhost: {
         foregroundColor: semantics.buttonSecondaryText,
diff --git a/package/src/contexts/themeContext/utils/theme.ts b/package/src/contexts/themeContext/utils/theme.ts
index cdfe66b10c..73c4659430 100644
--- a/package/src/contexts/themeContext/utils/theme.ts
+++ b/package/src/contexts/themeContext/utils/theme.ts
@@ -107,6 +107,7 @@ export type Theme = {
     bottomSheetContentContainer: ViewStyle;
     durationText: TextStyle;
     content: {
+      actionContainer: ViewStyle;
       container: ViewStyle;
       infoContainer: ViewStyle;
       text: TextStyle;
@@ -1030,6 +1031,7 @@ export const defaultTheme: Theme = {
     bottomSheetContentContainer: {},
     durationText: {},
     content: {
+      actionContainer: {},
       container: {},
       infoContainer: {},
       text: {},
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index c2fb1f047d..5a948d9415 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Change in Settings",
   "Create a poll and let everyone vote": "Create a poll and let everyone vote",
   "Open Camera": "Open Camera",
-  "Pick a document to share it with everyone": "Pick a document to share it with everyone",
-  "Pick document": "Pick document",
+  "Open Files": "Open Files",
+  "Select files to share": "Select files to share",
+  "Take a photo and share": "Take a photo and share",
   "Take a video and share": "Take a video and share",
   "You have not granted access to your camera": "You have not granted access to your camera",
   "{{count}} Reactions_many": "{{count}} Reactions",
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index d2eb4227ad..7700717c5f 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Cambiar en Ajustes",
   "Create a poll and let everyone vote": "Crea una encuesta y deja que todos voten",
   "Open Camera": "Abrir camara",
-  "Pick a document to share it with everyone": "Elige un documento para compartirlo con todos",
-  "Pick document": "Elegir documento",
+  "Open Files": "Abrir archivos",
+  "Select files to share": "Selecciona archivos para compartir",
+  "Take a photo and share": "Toma una foto y compártela",
   "Take a video and share": "Graba un video y compártelo",
   "You have not granted access to your camera": "No has concedido acceso a tu camara",
   "{{count}} Reactions_many": "{{count}} reacciones",
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 0e11ae6081..8792562d47 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Changer dans Réglages",
   "Create a poll and let everyone vote": "Créez un sondage et laissez tout le monde voter",
   "Open Camera": "Ouvrir la caméra",
-  "Pick a document to share it with everyone": "Choisissez un document pour le partager avec tout le monde",
-  "Pick document": "Choisir un document",
+  "Open Files": "Ouvrir les fichiers",
+  "Select files to share": "Sélectionnez des fichiers à partager",
+  "Take a photo and share": "Prenez une photo et partagez-la",
   "Take a video and share": "Prenez une vidéo et partagez-la",
   "You have not granted access to your camera": "Vous n'avez pas accordé l'accès à votre caméra",
   "{{count}} Reactions_many": "{{count}} réactions",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 2a72030ac2..c359f3482f 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -164,8 +164,9 @@
   "Change in Settings": "שנה בהגדרות",
   "Create a poll and let everyone vote": "צור סקר ותן לכולם להצביע",
   "Open Camera": "פתח מצלמה",
-  "Pick a document to share it with everyone": "בחר מסמך כדי לשתף אותו עם כולם",
-  "Pick document": "בחר מסמך",
+  "Open Files": "פתח קבצים",
+  "Select files to share": "בחר קבצים לשיתוף",
+  "Take a photo and share": "צלם תמונה ושתף",
   "Take a video and share": "צלם וידאו ושתף",
   "You have not granted access to your camera": "לא הענקת גישה למצלמה שלך",
   "{{count}} Reactions_many": "{{count}} תגובות",
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index 67a59b6c6b..0b106a40af 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -164,8 +164,9 @@
   "Change in Settings": "सेटिंग्स में बदलें",
   "Create a poll and let everyone vote": "पोल बनाएँ और सभी को वोट करने दें",
   "Open Camera": "कैमरा खोलें",
-  "Pick a document to share it with everyone": "सभी के साथ साझा करने के लिए एक दस्तावेज़ चुनें",
-  "Pick document": "दस्तावेज़ चुनें",
+  "Open Files": "फ़ाइलें खोलें",
+  "Select files to share": "साझा करने के लिए फ़ाइलें चुनें",
+  "Take a photo and share": "एक फ़ोटो लें और साझा करें",
   "Take a video and share": "वीडियो लें और साझा करें",
   "You have not granted access to your camera": "आपने अपने कैमरे के लिए अनुमति नहीं दी है",
   "{{count}} Reactions_many": "{{count}} प्रतिक्रियाएँ",
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index e0ae0dbe47..a43b7c8330 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Cambia in Impostazioni",
   "Create a poll and let everyone vote": "Crea un sondaggio e lascia che tutti votino",
   "Open Camera": "Apri fotocamera",
-  "Pick a document to share it with everyone": "Scegli un documento da condividere con tutti",
-  "Pick document": "Scegli documento",
+  "Open Files": "Apri file",
+  "Select files to share": "Seleziona file da condividere",
+  "Take a photo and share": "Scatta una foto e condividila",
   "Take a video and share": "Registra un video e condividilo",
   "You have not granted access to your camera": "Non hai concesso l’accesso alla fotocamera",
   "{{count}} Reactions_many": "{{count}} reazioni",
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index 2adb39bae3..0505b82a45 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -164,8 +164,9 @@
   "Change in Settings": "設定で変更",
   "Create a poll and let everyone vote": "投票を作成してみんなに投票してもらう",
   "Open Camera": "カメラを開く",
-  "Pick a document to share it with everyone": "みんなと共有するドキュメントを選択",
-  "Pick document": "ドキュメントを選択",
+  "Open Files": "ファイルを開く",
+  "Select files to share": "共有するファイルを選択",
+  "Take a photo and share": "写真を撮って共有",
   "Take a video and share": "動画を撮影して共有",
   "You have not granted access to your camera": "カメラへのアクセスが許可されていません",
   "{{count}} Reactions_many": "{{count}}件のリアクション",
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index f516d868c7..d329a26d84 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -164,8 +164,9 @@
   "Change in Settings": "설정에서 변경",
   "Create a poll and let everyone vote": "투표를 만들어 모두가 투표하게 하세요",
   "Open Camera": "카메라 열기",
-  "Pick a document to share it with everyone": "모두와 공유할 문서를 선택하세요",
-  "Pick document": "문서 선택",
+  "Open Files": "파일 열기",
+  "Select files to share": "공유할 파일 선택",
+  "Take a photo and share": "사진을 찍고 공유",
   "Take a video and share": "동영상을 촬영하고 공유",
   "You have not granted access to your camera": "카메라 접근 권한이 없습니다",
   "{{count}} Reactions_many": "{{count}}개의 반응",
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index d184963856..81090abd9a 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Wijzigen in Instellingen",
   "Create a poll and let everyone vote": "Maak een peiling en laat iedereen stemmen",
   "Open Camera": "Camera openen",
-  "Pick a document to share it with everyone": "Kies een document om het met iedereen te delen",
-  "Pick document": "Document kiezen",
+  "Open Files": "Bestanden openen",
+  "Select files to share": "Selecteer bestanden om te delen",
+  "Take a photo and share": "Maak een foto en deel deze",
   "Take a video and share": "Maak een video en deel deze",
   "You have not granted access to your camera": "Je hebt geen toegang tot je camera verleend",
   "{{count}} Reactions_many": "{{count}} reacties",
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 22a92ac41d..c7fa4e24cc 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Alterar nos Ajustes",
   "Create a poll and let everyone vote": "Crie uma enquete e deixe todos votarem",
   "Open Camera": "Abrir camera",
-  "Pick a document to share it with everyone": "Escolha um documento para compartilhar com todos",
-  "Pick document": "Escolher documento",
+  "Open Files": "Abrir arquivos",
+  "Select files to share": "Selecione arquivos para compartilhar",
+  "Take a photo and share": "Tire uma foto e compartilhe",
   "Take a video and share": "Grave um video e compartilhe",
   "You have not granted access to your camera": "Você não concedeu acesso à sua câmera",
   "{{count}} Reactions_many": "{{count}} reações",
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index cd7b6d4ff4..54a9972abc 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Изменить в настройках",
   "Create a poll and let everyone vote": "Создайте опрос и дайте всем проголосовать",
   "Open Camera": "Открыть камеру",
-  "Pick a document to share it with everyone": "Выберите документ, чтобы поделиться им со всеми",
-  "Pick document": "Выбрать документ",
+  "Open Files": "Открыть файлы",
+  "Select files to share": "Выберите файлы для отправки",
+  "Take a photo and share": "Сделайте фото и поделитесь",
   "Take a video and share": "Снимите видео и поделитесь",
   "You have not granted access to your camera": "Вы не предоставили доступ к вашей камере",
   "{{count}} Reactions_many": "{{count}} реакций",
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index c11893e98c..9aa082add3 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -164,8 +164,9 @@
   "Change in Settings": "Ayarlar'da değiştir",
   "Create a poll and let everyone vote": "Bir anket oluşturun ve herkesin oy vermesine izin verin",
   "Open Camera": "Kamerayı aç",
-  "Pick a document to share it with everyone": "Herkesle paylaşmak için bir belge seçin",
-  "Pick document": "Belge seç",
+  "Open Files": "Dosyaları aç",
+  "Select files to share": "Paylaşmak için dosyaları seç",
+  "Take a photo and share": "Fotoğraf çek ve paylaş",
   "Take a video and share": "Video çek ve paylaş",
   "You have not granted access to your camera": "Kameranıza erişim izni vermediniz",
   "{{count}} Reactions_many": "{{count}} tepki",