diff --git a/app/styles/components/markitup.scss b/app/styles/components/markitup.scss
index 40ce275a..eb70f415 100644
--- a/app/styles/components/markitup.scss
+++ b/app/styles/components/markitup.scss
@@ -24,6 +24,10 @@
     padding: 0;
 }
 
+.markdown {
+    position: relative;
+}
+
 .preview {
     .actions {
         background: $whitish;
diff --git a/app/styles/modules/common/attachments.scss b/app/styles/modules/common/attachments.scss
index b49b67e0..92050f74 100644
--- a/app/styles/modules/common/attachments.scss
+++ b/app/styles/modules/common/attachments.scss
@@ -98,7 +98,7 @@
         }
         .icon-edit,
         .icon-floppy {
-            right: 4rem;
+            right: 3.5rem;
         }
         .icon-delete {
             right: 2rem;
diff --git a/app/styles/modules/common/history.scss b/app/styles/modules/common/history.scss
index 0e5e68d2..693979a4 100644
--- a/app/styles/modules/common/history.scss
+++ b/app/styles/modules/common/history.scss
@@ -1,6 +1,5 @@
 .history {
     margin-bottom: 1rem;
-    padding: 0 1rem;
 }
 .changes-title {
     display: block;
@@ -66,7 +65,22 @@
 }
 .add-comment {
     @include clearfix;
+    &.active {
+        .button-green {
+            display: block;
+        }
+        textarea {
+            @include transition(height .3s ease-in);
+            height: 6rem;
+        }
+        .preview-icon {
+            opacity: 1;
+            position: absolute;
+            right: 1rem;
+        }
+    }
     textarea {
+        background: $white;
         float: left;
         height: 41px;
         margin-bottom: .5rem;
@@ -79,14 +93,11 @@
     .button-green {
         display: none;
     }
-    &.active {
-        .button-green {
-            display: block;
-        }
-        textarea {
-            @include transition(height .3s ease-in);
-            height: 6rem;
-        }
+    .edit,
+    .preview-icon {
+        opacity: 0;
+        position: absolute;
+        right: 1rem;
     }
 }
 a.show-more-comments {