diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 299eda53140..d65b17fab30 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -716,7 +716,7 @@ ul.notes {
 .line-resolve-all {
   vertical-align: middle;
   display: inline-block;
-  padding: 6px 10px;
+  padding: 5px 10px 6px;
   background-color: $gray-light;
   border: 1px solid $border-color;
   border-radius: $border-radius-default;
diff --git a/changelogs/unreleased/revert-merge-request-discussion-buttons-padding.yml b/changelogs/unreleased/revert-merge-request-discussion-buttons-padding.yml
new file mode 100644
index 00000000000..9f11dd3dc3f
--- /dev/null
+++ b/changelogs/unreleased/revert-merge-request-discussion-buttons-padding.yml
@@ -0,0 +1,5 @@
+---
+title: Revert merge request discussion buttons padding
+merge_request: 20060
+author: George Tsiolis
+type: changed