diff --git a/CHANGELOG.md b/CHANGELOG.md
index 516e9bda01..1255b07f24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Posts: bot badge on statuses from bot accounts.
 
 ### Changed
+- Chats: improved display of media attachments.
 
 ### Fixed
+- Chats: media attachments rendering at the wrong size and/or causing the chat to scroll on load.
+- Chats: don't display "copy" button for messages without text.
 - Posts: don't have to click the play button twice for embedded videos.
 - index.html: remove `referrer` meta tag so it doesn't conflict with backend's `Referrer-Policy` header.
 
diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx
index cdf0321780..613a5eed0a 100644
--- a/app/soapbox/features/chats/components/chat-message-list.tsx
+++ b/app/soapbox/features/chats/components/chat-message-list.tsx
@@ -246,7 +246,7 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
 
     const menu: Menu = [];
 
-    if (navigator.clipboard) {
+    if (navigator.clipboard && chatMessage.content) {
       menu.push({
         text: intl.formatMessage(messages.copy),
         action: () => handleCopyText(chatMessage),
@@ -312,39 +312,47 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
               </div>
             )}
 
-            <HStack
-              alignItems='bottom'
+            <Stack
+              space={0.5}
               className={classNames({
                 'max-w-[85%]': true,
+                'flex-1': chatMessage.attachment,
                 'order-2': isMyMessage,
                 'order-1': !isMyMessage,
               })}
-              justifyContent={isMyMessage ? 'end' : 'start'}
+              alignItems={isMyMessage ? 'end' : 'start'}
             >
-              <div
-                title={getFormattedTimestamp(chatMessage)}
-                className={
-                  classNames({
-                    'text-ellipsis break-words relative rounded-md py-2 px-3 max-w-full space-y-2 [&_.mention]:underline': true,
-                    '[&_.mention]:text-primary-600 dark:[&_.mention]:text-accent-blue': !isMyMessage,
-                    '[&_.mention]:text-white dark:[&_.mention]:white': isMyMessage,
-                    'bg-primary-500 text-white': isMyMessage,
-                    'bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100': !isMyMessage,
-                    '!bg-transparent !p-0 emoji-lg': isOnlyEmoji,
-                  })
-                }
-                ref={setBubbleRef}
-                tabIndex={0}
-              >
-                {maybeRenderMedia(chatMessage)}
-                <Text
-                  size='sm'
-                  theme='inherit'
-                  className='break-word-nested'
-                  dangerouslySetInnerHTML={{ __html: content }}
-                />
-              </div>
-            </HStack>
+              {maybeRenderMedia(chatMessage)}
+
+              {content && (
+                <HStack alignItems='bottom' className='max-w-full'>
+                  <div
+                    title={getFormattedTimestamp(chatMessage)}
+                    className={
+                      classNames({
+                        'text-ellipsis break-words relative rounded-md py-2 px-3 max-w-full space-y-2 [&_.mention]:underline': true,
+                        'rounded-tr-sm': chatMessage.attachment && isMyMessage,
+                        'rounded-tl-sm': chatMessage.attachment && !isMyMessage,
+                        '[&_.mention]:text-primary-600 dark:[&_.mention]:text-accent-blue': !isMyMessage,
+                        '[&_.mention]:text-white dark:[&_.mention]:white': isMyMessage,
+                        'bg-primary-500 text-white': isMyMessage,
+                        'bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100': !isMyMessage,
+                        '!bg-transparent !p-0 emoji-lg': isOnlyEmoji,
+                      })
+                    }
+                    ref={setBubbleRef}
+                    tabIndex={0}
+                  >
+                    <Text
+                      size='sm'
+                      theme='inherit'
+                      className='break-word-nested'
+                      dangerouslySetInnerHTML={{ __html: content }}
+                    />
+                  </div>
+                </HStack>
+              )}
+            </Stack>
           </HStack>
 
           <HStack
diff --git a/app/soapbox/features/compose/components/upload-button.tsx b/app/soapbox/features/compose/components/upload-button.tsx
index 7d6f31c65c..e5c12e8b59 100644
--- a/app/soapbox/features/compose/components/upload-button.tsx
+++ b/app/soapbox/features/compose/components/upload-button.tsx
@@ -22,6 +22,7 @@ export interface IUploadButton {
   resetFileKey: number | null,
   className?: string,
   iconClassName?: string,
+  icon?: string,
 }
 
 const UploadButton: React.FC<IUploadButton> = ({
@@ -31,6 +32,7 @@ const UploadButton: React.FC<IUploadButton> = ({
   resetFileKey,
   className = 'text-gray-600 hover:text-gray-700 dark:hover:text-gray-500',
   iconClassName,
+  icon,
 }) => {
   const intl = useIntl();
   const { configuration } = useInstance();
@@ -52,9 +54,11 @@ const UploadButton: React.FC<IUploadButton> = ({
     return null;
   }
 
-  const src = onlyImages(attachmentTypes)
-    ? require('@tabler/icons/photo.svg')
-    : require('@tabler/icons/paperclip.svg');
+  const src = icon || (
+    onlyImages(attachmentTypes)
+      ? require('@tabler/icons/photo.svg')
+      : require('@tabler/icons/paperclip.svg')
+  );
 
   return (
     <div>
diff --git a/app/styles/components/media-gallery.scss b/app/styles/components/media-gallery.scss
index 0c71a43ddc..aa79493b1d 100644
--- a/app/styles/components/media-gallery.scss
+++ b/app/styles/components/media-gallery.scss
@@ -2,6 +2,7 @@
   box-sizing: border-box;
   overflow: hidden;
   border-radius: 10px;
+  isolation: isolate;
   position: relative;
   width: 100%;
   height: auto;