diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index d20b704bc1..0e67f48e4d 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -4,7 +4,7 @@
       <img :src="nsfwImage"></img>
     </a>
 
-    <a v-if="type === 'image' && !nsfw" :href="attachment.url" target="_blank"><img :src="attachment.url"></img></a>
+    <a class="image-attachment" v-if="type === 'image' && !nsfw" :href="attachment.url" target="_blank"><img :src="attachment.url"></img></a>
 
     <video v-if="type === 'webm' && !nsfw" :src="attachment.url" controls></video>
 
@@ -29,5 +29,16 @@
      video {
          height: 100%;
      }
+
+     a.image-attachment {
+         display: flex;
+         flex: 1;
+
+         img {
+             width: 100%;
+             height: 100%;
+             flex: 1;
+         }
+     }
  }
 </style>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4d8700d5b3..685ec244b4 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -60,4 +60,8 @@
          word-break: break-all;
      }
  }
+
+ .status-actions {
+     padding-top: 5px;
+ }
 </style>