diff --git a/src/components/node/CommentContent/index.tsx b/src/components/node/CommentContent/index.tsx
index ae8b702f..ed4503cc 100644
--- a/src/components/node/CommentContent/index.tsx
+++ b/src/components/node/CommentContent/index.tsx
@@ -42,7 +42,7 @@ const CommentContent: FC<IProps> = ({ comment }) => {
       )}
 
       {groupped.image && groupped.image.length > 0 && (
-        <div className={styles.block}>
+        <div className={classnames(styles.block, styles.block_image)}>
           <div className={styles.images}>
             {groupped.image.map(file => (
               <div key={file.id}>
@@ -58,7 +58,7 @@ const CommentContent: FC<IProps> = ({ comment }) => {
       {groupped.audio && groupped.audio.length > 0 && (
         <>
           {groupped.audio.map(file => (
-            <div className={classnames(styles.block, styles.audio_block)} key={file.id}>
+            <div className={classnames(styles.block, styles.block_audio)} key={file.id}>
               <AudioPlayer file={file} />
 
               <div className={styles.date}>{getPrettyDate(comment.created_at)}</div>
diff --git a/src/components/node/CommentContent/styles.scss b/src/components/node/CommentContent/styles.scss
index 6ac33fc5..a2462771 100644
--- a/src/components/node/CommentContent/styles.scss
+++ b/src/components/node/CommentContent/styles.scss
@@ -22,6 +22,17 @@
 .block_audio {
   align-items: center;
   justify-content: center;
+  padding-bottom: 0 !important;
+}
+
+.block_image {
+  padding-bottom: 0 !important;
+
+  .date {
+    background: transparentize($color: $content_bg, $amount: 0.2);
+    border-radius: $radius 0 $radius 0;
+    color: transparentize(white, 0.2);
+  }
 }
 
 .text {
@@ -44,7 +55,7 @@
   right: 0;
   font: $font_12_regular;
   color: transparentize($color: white, $amount: 0.8);
-  padding: 4px 6px 4px 4px;
+  padding: 4px 6px 4px 6px;
   border-radius: 0 0 $radius 0;
 }
 
diff --git a/src/components/node/CommentForm/index.tsx b/src/components/node/CommentForm/index.tsx
index 642942f8..a096ea7e 100644
--- a/src/components/node/CommentForm/index.tsx
+++ b/src/components/node/CommentForm/index.tsx
@@ -134,6 +134,22 @@ const CommentFormUnconnected: FC<IProps> = ({
           />
         </div>
 
+        {comment.temp_ids.map(
+          temp_id =>
+            statuses[temp_id] &&
+            statuses[temp_id].is_uploading && (
+              <div key={statuses[temp_id].temp_id}>{statuses[temp_id].progress}</div>
+            )
+        )}
+
+        {comment.files.map(file => {
+          if (file.type === UPLOAD_TYPES.AUDIO) {
+            return <AudioPlayer file={file} />;
+          }
+
+          return <div>file.name</div>;
+        })}
+
         <Group horizontal className={styles.buttons}>
           <ButtonGroup>
             <Button iconLeft="image" size="small" grey iconOnly>
@@ -154,22 +170,6 @@ const CommentFormUnconnected: FC<IProps> = ({
           </Button>
         </Group>
       </form>
-
-      {comment.temp_ids.map(
-        temp_id =>
-          statuses[temp_id] &&
-          statuses[temp_id].is_uploading && (
-            <div key={statuses[temp_id].temp_id}>{statuses[temp_id].progress}</div>
-          )
-      )}
-
-      {comment.files.map(file => {
-        if (file.type === UPLOAD_TYPES.AUDIO) {
-          return <AudioPlayer file={file} />;
-        }
-
-        return <div>file.name</div>;
-      })}
     </CommentWrapper>
   );
 };