diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index c2762b3e3a1..b8405c4be72 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -398,7 +398,6 @@ ul.notes {
 
 .line-resolve-all {
   display: inline-block;
-  margin-top: 10px;
   padding: 5px 10px;
   background-color: $background-color;
   border: 1px solid $border-color;
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 4e090e005c3..1b8cce58009 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -44,7 +44,7 @@
         = succeed '.' do
           = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
-    #resolve-count-app.line-resolve-all-container{ "v-cloak" => true }
+    #resolve-count-app.line-resolve-all-container.prepend-top-default.append-bottom-default{ "v-cloak" => true }
       %resolve-count{ "inline-template" => true }
         .line-resolve-all{ "v-show" => "discussionCount > 0",
           ":class" => "{ 'has-next-btn': resolved !== discussionCount }" }