diff --git a/css/comp-13.scss b/css/comp-13.scss
index 770fd8727..6f78fd543 100644
--- a/css/comp-13.scss
+++ b/css/comp-13.scss
@@ -35,4 +35,15 @@ body:not(.snapjs-left) {
 			display: none;
 		}
 	}
-}
\ No newline at end of file
+}
+
+#commentsTabView .newCommentForm .message {
+	width: 100%;
+	margin-left: 0;
+	padding-right: 0;
+	display: block;
+}
+
+#commentsTabView .comment {
+	margin-bottom: 0;
+}
diff --git a/css/style.scss b/css/style.scss
index 2b8f9caac..89e7db85e 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -967,6 +967,7 @@ input.input-inline {
 }
 .activitysubject .app-popover-menu-utils {
 	display: inline-block;
+	position: relative;
 	a {
 		font-weight: normal;
 	}
diff --git a/js/controller/ActivityController.js b/js/controller/ActivityController.js
index 542be9195..cbbcf8323 100644
--- a/js/controller/ActivityController.js
+++ b/js/controller/ActivityController.js
@@ -111,10 +111,10 @@ class ActivityController {
 		$target.on('inserted.atwho', function (je, $el) {
 			$(je.target).find(
 				'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
-			).avatar();
+			).avatar(undefined, 16);
 		});
 		$target.on('shown.atwho', function (je) {
-			$target.find('.avatar').avatar();
+			$target.find('.avatar').avatar(undefined, 16);
 		});
 	}
 
diff --git a/templates/part.card.activity.html b/templates/part.card.activity.html
index d4c1fafc2..dde8ad76f 100644
--- a/templates/part.card.activity.html
+++ b/templates/part.card.activity.html
@@ -25,7 +25,7 @@
 			{{ activity.subject_rich[1].user.name }}
 			<div class="app-popover-menu-utils">
 				<button class="button-inline icon-more ng-pristine ng-valid ng-empty ng-touched" aria-label="Actions"></button>
-				<div class="popovermenu hidden">
+				<div class="popovermenu hidden menu-left">
 					<ul>
 						<li><a ng-click="$ctrl.updateComment(activity)" class="menuitem action edit permanent" data-action="edit"><span class="icon icon-rename"></span><span>Edit comment</span></a></li>
 						<li><a ng-click="$ctrl.deleteComment(activity)" class="menuitem action delete permanent" data-action="delete"><span class="icon icon-delete"></span><span>Delete comment</span></a></li>