diff --git a/src/App.scss b/src/App.scss
index 4bbc2d3c..d5f57e15 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -709,12 +709,6 @@ nav {
     margin: 0.5em 0 0.5em 0;
   }
 
-  .status .status-actions {
-    div {
-      max-width: 4em;
-    }
-  }
-
   .menu-button {
     display: block;
     margin-right: 0.8em;
@@ -723,7 +717,7 @@ nav {
 
 .login-hint {
   text-align: center;
-  
+
   @media all and (min-width: 801px) {
     display: none;
   }
diff --git a/src/components/link-preview/link-preview.vue b/src/components/link-preview/link-preview.vue
index deb5b44c..7394668c 100644
--- a/src/components/link-preview/link-preview.vue
+++ b/src/components/link-preview/link-preview.vue
@@ -24,10 +24,6 @@
   cursor: pointer;
   overflow: hidden;
 
-  // TODO: clean up the random margins in attachments, this makes preview line
-  // up with attachments...
-  // margin-right: 0.5em;
-
   .card-image {
     flex-shrink: 0;
     width: 120px;
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 8407a432..0273a5be 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -334,7 +334,6 @@ const Status = {
       }
     },
     replyEnter (id, event) {
-      console.log('replyEnter', id)
       this.showPreview = true
       const targetId = id
       const statuses = this.$store.state.statuses.allStatuses
@@ -353,7 +352,6 @@ const Status = {
       }
     },
     replyLeave () {
-      console.log('replyLeave')
       this.showPreview = false
     },
     generateUserProfileLink (id, name) {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 7d4e8338..174d97c9 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -277,20 +277,18 @@
 
     .heading-name-row {
       padding: 0;
-      flex-shrink: 1;
       display: flex;
-      align-items: baseline;
 
       .user-name {
         flex-shrink: 1;
-        margin-right: 0.5em;
+        margin-right: 0.4em;
         overflow: hidden;
         text-overflow: ellipsis;
       }
 
       .account-name {
         min-width: 1.6em;
-        margin-right: 0.5em;
+        margin-right: 0.4em;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -319,17 +317,21 @@
         white-space: nowrap;
       }
     }
+
     .reply-info {
       display: flex;
     }
+
     .reply-to {
       display: flex;
     }
+
     .reply-to-text {
       overflow: hidden;
       text-overflow: ellipsis;
       margin: 0 0.4em 0 0.2em;
     }
+
     .replies {
       line-height: 18px;
     }