diff --git a/apps/comments/css/comments.scss b/apps/comments/css/comments.scss
index 88b890323aa983ca16df783caedb2e67cab51513..5e0bbce28a18d79649ed6b205d22670aca2f1e9a 100644
--- a/apps/comments/css/comments.scss
+++ b/apps/comments/css/comments.scss
@@ -49,10 +49,6 @@
 	opacity: 1;
 }
 
-#commentsTabView .newCommentForm .cancel {
-	margin-right: 6px;
-}
-
 #commentsTabView .newCommentForm div.message {
 	resize: none;
 }
@@ -182,8 +178,7 @@
 #commentsTabView .comment .action {
 	opacity: 0.3;
 	padding: 14px;
-	display: inline-block;
-	vertical-align: middle;
+	display: block;
 }
 
 #commentsTabView .comment .action:hover,
@@ -193,9 +188,6 @@
 
 #commentsTabView .newCommentRow .action-container {
 	margin-left: auto;
-	/** setting minimum width so as to avoid these two buttons from appearing on top of
-		each other when author name is long. width = icon-width * 2 + (inline-block gap) **/
-	min-width: 92px;
 }
 
 #commentsTabView .comment.disabled {
@@ -214,4 +206,4 @@
 
 .app-files .action-comment {
 	padding: 16px 14px;
-}
+}
\ No newline at end of file
diff --git a/apps/comments/js/commentsmodifymenu.js b/apps/comments/js/commentsmodifymenu.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd777ba5fa6a98a92c6f3f5d2314c2b0ac1c3ed5
Binary files /dev/null and b/apps/comments/js/commentsmodifymenu.js differ
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 36495e0690a0be00e20dc76f34359aacd40e3420..ad5f67842db067d589c6b05ba587e7a2e744a598 100644
Binary files a/apps/comments/js/commentstabview.js and b/apps/comments/js/commentstabview.js differ
diff --git a/apps/comments/js/merged.json b/apps/comments/js/merged.json
index 0202c7ff55a3d571c5ee793835ce4425e066e5e7..6e77d9cf80a5ef8f45fe1681560cf035ef8cc7f2 100644
--- a/apps/comments/js/merged.json
+++ b/apps/comments/js/merged.json
@@ -4,6 +4,7 @@
   "commentcollection.js",
   "commentsummarymodel.js",
   "commentstabview.js",
+  "commentsmodifymenu.js",
   "filesplugin.js",
   "activitytabviewplugin.js",
   "vendor/Caret.js/dist/jquery.caret.min.js",