diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index a355d802973268975a20b6eb0b8c1a98eb7bd31e..bd875b9823ffed1efebbc513110648bc5289f34f 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -156,28 +156,33 @@
   .discussion-reply-holder {
     background-color: $white-light;
     padding: 10px 16px;
+  }
+}
 
-    .btn-group-justified {
-      table-layout: auto;
-    }
+.discussion-with-resolve-btn {
+  display: table;
+  width: 100%;
+  border-collapse: separate;
+  table-layout: auto;
+
+  .btn-group {
+    display: table-cell;
+    float: none;
+    width: 1%;
 
-    .btn-group:first-child {
+    &:first-child {
       width: 100%;
+      padding-right: 5px;
     }
 
-    .discussion-with-resolve-btn {
-      .btn-group:first-child .btn {
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-      }
-
-      .btn-group:last-child .btn {
-        margin-left: -1px;
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-      }
+    &:last-child {
+      padding-left: 5px;
     }
   }
+
+  .btn {
+    width: 100%;
+  }
 }
 
 .discussion-notes-count {
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml
index b9bc8a6304e25df30db808ce059240b25970509b..e59f7e6373dcb2bb36bcc064e039a5ff2712a6a6 100644
--- a/app/views/discussions/_diff_discussion.html.haml
+++ b/app/views/discussions/_diff_discussion.html.haml
@@ -5,8 +5,8 @@
       = render partial: "projects/notes/note", collection: discussion.notes, as: :note
 
     .discussion-reply-holder
-      .btn-group-justified.discussion-with-resolve-btn{ role: "group" }
-        .btn-group{ role: "group" }
+      .discussion-with-resolve-btn{ role: "group" }
+        .btn-group
           = link_to_reply_discussion(note)
-        .btn-group{ role: "group" }
+        .btn-group
           = render "projects/notes/discussions/resolve_all", note: note
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 5f9eecf27dbe2af0917e4997a48476d69d9052ff..456d87c6103fa41e307e98e687d25fa261a5a1e8 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -20,7 +20,7 @@
           - access = note_max_access_for_user(note)
           - if access and not note.system
             %span.note-role.hidden-xs= access
-          - if !note.system && current_user
+          - if !note.system && note.discussion_id && current_user
             %resolve-btn{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", ":note-id" => note.id, ":resolved" => "false", "inline-template" => true, "v-ref:note_#{note.id}" => true }
               .note-action-button
                 = icon("spin spinner", "v-show" => "loading")
diff --git a/app/views/projects/notes/discussions/_resolve_all.html.haml b/app/views/projects/notes/discussions/_resolve_all.html.haml
index e94bb7432418e8850d98f429c72ab1485c6620ee..2a787431850fcfc654e1cd641868b22b9b67b98d 100644
--- a/app/views/projects/notes/discussions/_resolve_all.html.haml
+++ b/app/views/projects/notes/discussions/_resolve_all.html.haml
@@ -1,4 +1,4 @@
 %resolve-all{ ":namespace" => "'#{note.project.namespace.path}/#{note.project.path}'", ":discussion-id" => "'#{note.discussion_id}'", "inline-template" => true, "v-cloak" => true }
-  %button.btn.btn-success{ type: "button", "@click" => "resolve", ":disabled" => "loading" }
+  %button.btn.btn-default{ type: "button", "@click" => "resolve", ":disabled" => "loading" }
     = icon("spinner spin", "v-show" => "loading")
     {{ buttonText }}