diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 6edef06fc6..c27e79e208 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -362,6 +362,7 @@ class Conversation
 		$tpl = Renderer::getMarkupTemplate('jot.tpl');
 
 		$o .= Renderer::replaceMacros($tpl, [
+			'$post'                => $this->l10n->t($x['content'] ? 'Post to group' : 'Post'),
 			'$new_post'            => $this->l10n->t('New Post'),
 			'$return_path'         => $this->args->getQueryString(),
 			'$action'              => 'item',
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 83cc15751a..5ac7b86769 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -84,8 +84,6 @@ $(document).ready(function () {
 	let $mentionButton = $("#mention-link-button");
 	if ($mentionButton.length) {
 		$mentionButton.appendTo("#topbar-second > .container > #navbar-button").addClass("pull-right");
-		$("#mention-link").addClass("btn-sm ");
-		$("#mention-link > span i").addClass("fa-2x");
 		if ($mentionButton.hasClass("modal-open")) {
 			$mentionButton.on("click", function (e) {
 				e.preventDefault();
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index cfab144569..d8aa28d4cb 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -1,5 +1,5 @@
 {{* The button to open the jot - in This theme we move the button with js to the second nav bar *}}
-<a class="btn btn-sm btn-primary pull-right{{if !$always_open_compose}} modal-open{{/if}}" id="jotOpen" href="compose/{{$posttype}}{{if $content}}?body={{$content}}{{/if}}" aria-label="{{$new_post}}" title="{{$new_post}}"><i class="fa fa-pencil-square-o fa-2x"></i></a>
+<a class="btn btn-primary pull-right{{if !$always_open_compose}} modal-open{{/if}}" id="jotOpen" href="compose/{{$posttype}}{{if $content}}?body={{$content}}{{/if}}" aria-label="{{$new_post}}" title="{{$new_post}}"><i class="fa fa-pencil-square-o"></i><span class="">{{$post}}</span></a>
 
 <div id="jot-content">
 	<div id="jot-sections">
diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
index b41b206ee1..09ec9f0e66 100644
--- a/view/theme/frio/templates/profile/vcard.tpl
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -70,13 +70,12 @@
 				</button>
 			</div>
 			{{/if}}
-            {{if $profile.addr}}
-			<div id="mention-link-button">
-				<button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$mention_url}}')">
-					<span class=""><i class="fa fa-pencil-square-o"></i></span>
-					<span class="">{{$mention_label}}</span>
-				</button>
-			</div>
+                        {{if $profile.addr}}
+				<div id="mention-link-button">
+					<button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$mention_url}}')" oncontextmenu="openWallMessage('compose/0'); return false;">
+					       <span class=""><i class="fa fa-pencil-square-o"></i></span>
+					       <span class="">{{$mention_label}}</span>
+				</div>
 			{{/if}}
             {{if $network_label}}
 			<div id="showgroup-button">
diff --git a/view/theme/frio/templates/settings/profile/field/edit.tpl b/view/theme/frio/templates/settings/profile/field/edit.tpl
index f28e559f5e..2bfd2fe957 100644
--- a/view/theme/frio/templates/settings/profile/field/edit.tpl
+++ b/view/theme/frio/templates/settings/profile/field/edit.tpl
@@ -26,4 +26,4 @@
 			</div>
 		</div>
 	</div>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl
index fff5a4b0e3..a301f3ea2f 100644
--- a/view/theme/frio/templates/widget/vcard.tpl
+++ b/view/theme/frio/templates/widget/vcard.tpl
@@ -58,7 +58,7 @@
 			{{/if}}
 			{{if $mention_link}}
 				<div id="mention-link-button">
-					<button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('{{$mention_link}}')" title="{{$mention}}" aria-label="{{$mention}}">
+					<button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('{{$mention_link}}')" oncontextmenu="openWallMessage('compose/0'); return false;" title="{{$mention}}" aria-label="{{$mention}}">
 						<span class=""><i class="fa fa-pencil-square-o"></i></span>
 						<span class="">{{$mention}}</span>
 					</button>