diff --git a/packages/react/src/views/AttachmentHandler/AttachmentMetadata.js b/packages/react/src/views/AttachmentHandler/AttachmentMetadata.js
index 17e25c03db..375a836c27 100644
--- a/packages/react/src/views/AttachmentHandler/AttachmentMetadata.js
+++ b/packages/react/src/views/AttachmentHandler/AttachmentMetadata.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { css } from '@emotion/react';
 import { ActionButton, Box, Tooltip } from '@embeddedchat/ui-elements';
-import { Markdown } from '../Markdown';
 
 const AttachmentMetadata = ({
   attachment,
@@ -48,25 +47,21 @@ const AttachmentMetadata = ({
           attachment.description !== ''
             ? [
                 css`
-                  margin: 10px 0px;
+                  margin-top: 0.5rem;
                   @media (max-width: 420px) {
                     margin: 5px 0px;
                   }
                 `,
               ]
             : css`
-                margin: -7px 0px;
+                margin-top: -3px;
                 @media (max-width: 420px) {
                   margin: -5px 0px;
                 }
               `
         }
       >
-        {msg ? (
-          <Markdown body={msg} md={attachment.descriptionMd} />
-        ) : (
-          attachment.description
-        )}
+        {attachment.description}
       </div>
       <Box
         css={css`
@@ -84,6 +79,7 @@ const AttachmentMetadata = ({
             display: flex;
             flex-direction: row;
             align-items: center;
+            margin-top: ${attachment.description ? '0.5rem' : '0px'};
             @media (max-width: 420px) {
               flex-direction: column;
               align-items: flex-start;
@@ -166,7 +162,7 @@ const AttachmentMetadata = ({
           <Box
             css={css`
               margin-left: 10px;
-              margin-top: ${attachment.description ? '3px' : '10px'};
+              margin-top: 1px;
               @media (max-width: 420px) {
                 margin-left: 0;
                 margin-top: 5px;
@@ -187,7 +183,7 @@ const AttachmentMetadata = ({
           <Box
             css={css`
               margin-left: 10px;
-              margin-top: 5px;
+              margin-top: 3px;
               @media (max-width: 420px) {
                 margin-left: 0;
                 margin-top: 5px;
diff --git a/packages/react/src/views/AttachmentHandler/AudioAttachment.js b/packages/react/src/views/AttachmentHandler/AudioAttachment.js
index 867792b4f7..d405ac1f10 100644
--- a/packages/react/src/views/AttachmentHandler/AudioAttachment.js
+++ b/packages/react/src/views/AttachmentHandler/AudioAttachment.js
@@ -34,7 +34,6 @@ const AudioAttachment = ({
           css`
             line-height: 0;
             border-radius: inherit;
-            padding: 0.5rem;
           `,
           (type ? variantStyles.pinnedContainer : '') ||
             css`
@@ -52,6 +51,7 @@ const AudioAttachment = ({
                   display: flex;
                   gap: 0.3rem;
                   align-items: center;
+                  padding: 0.5rem;
                 `,
                 variantStyles.textUserInfo,
               ]}
@@ -67,28 +67,16 @@ const AudioAttachment = ({
         ) : (
           ''
         )}
-        <Box
-          css={css`
-            @media (max-width: 450px) {
-              margin-top: 0.4rem;
-            }
-          `}
-        >
-          <AttachmentMetadata
-            attachment={attachment}
-            url={host + (attachment.title_url || attachment.audio_url)}
-            variantStyles={variantStyles}
-            msg={msg}
-            onExpandCollapseClick={toggleExpanded}
-            isExpanded={isExpanded}
-          />
-        </Box>
+        <AttachmentMetadata
+          attachment={attachment}
+          url={host + (attachment.title_url || attachment.audio_url)}
+          variantStyles={variantStyles}
+          msg={msg}
+          onExpandCollapseClick={toggleExpanded}
+          isExpanded={isExpanded}
+        />
         {isExpanded && (
-          <audio
-            src={host + attachment.audio_url}
-            style={{ maxHeight: '100%', maxWidth: '100%' }}
-            controls
-          />
+          <audio src={host + attachment.audio_url} width="100%" controls />
         )}
 
         {attachment.attachments &&
@@ -119,6 +107,7 @@ const AudioAttachment = ({
                           display: flex;
                           gap: 0.3rem;
                           align-items: center;
+                          padding: 0.5rem;
                         `,
                         variantStyles.textUserInfo,
                       ]}
@@ -134,18 +123,28 @@ const AudioAttachment = ({
                 ) : (
                   ''
                 )}
-                <AttachmentMetadata
-                  attachment={nestedAttachment}
-                  url={
-                    host +
-                    (nestedAttachment.title_url || nestedAttachment.audio_url)
-                  }
-                  variantStyles={variantStyles}
-                />
+                <Box
+                  css={css`
+                    padding-left: 0.5rem;
+                  `}
+                >
+                  <AttachmentMetadata
+                    attachment={nestedAttachment}
+                    url={
+                      host +
+                      (nestedAttachment.title_url || nestedAttachment.audio_url)
+                    }
+                    variantStyles={variantStyles}
+                  />
+                </Box>
                 <audio
                   src={host + nestedAttachment.audio_url}
                   width="100%"
                   controls
+                  style={{
+                    paddingLeft: '0.5rem',
+                    paddingBottom: '0.5rem',
+                  }}
                 />
               </Box>
             </Box>
diff --git a/packages/react/src/views/AttachmentHandler/VideoAttachment.js b/packages/react/src/views/AttachmentHandler/VideoAttachment.js
index 7bad3a90c6..50e54c8d98 100644
--- a/packages/react/src/views/AttachmentHandler/VideoAttachment.js
+++ b/packages/react/src/views/AttachmentHandler/VideoAttachment.js
@@ -173,14 +173,20 @@ const VideoAttachment = ({
                 ) : (
                   ''
                 )}
-                <AttachmentMetadata
-                  attachment={nestedAttachment}
-                  url={
-                    host +
-                    (nestedAttachment.title_url || nestedAttachment.video_url)
-                  }
-                  variantStyles={variantStyles}
-                />
+                <Box
+                  css={css`
+                    padding-left: 0.5rem;
+                  `}
+                >
+                  <AttachmentMetadata
+                    attachment={nestedAttachment}
+                    url={
+                      host +
+                      (nestedAttachment.title_url || nestedAttachment.video_url)
+                    }
+                    variantStyles={variantStyles}
+                  />
+                </Box>
                 <video
                   width="100%"
                   controls
diff --git a/packages/ui-elements/src/theme/DefaultTheme.js b/packages/ui-elements/src/theme/DefaultTheme.js
index 2859cd0489..3677f8eda1 100644
--- a/packages/ui-elements/src/theme/DefaultTheme.js
+++ b/packages/ui-elements/src/theme/DefaultTheme.js
@@ -1,5 +1,5 @@
 const DefaultTheme = {
-  radius: '0.2rem',
+  radius: '1.5rem',
 
   commonColors: {
     black: 'hsl(0, 100%, 0%)',