diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index 6845234d4..c491a0fcf 100644
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -100,17 +100,4 @@
 </div>
 <script>
 	dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}'); 
-</script>
-<script>
-window.onload = function(){
-	new EmojiPicker({
-		trigger: [
-			{
-				selector: '.emojis',
-				insertInto: '.comment-edit-text'
-			}
-		],
-		closeButton: true,
-	});
-};
-</script>
+</script>
\ No newline at end of file
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 45a6116aa..b5fc13deb 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -36,6 +36,9 @@
 				<button type="button" class="btn btn-sm template-icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
 					<i class="fa fa-quote-left"></i>
 				</button>
+				<button type="button" class="btn btn-sm template-icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}">
+					<i class="fa fa-smile-o"></i>
+				</button>
 			</span>
 			</p>
 			<div id="dropzone-{{$id}}" class="dropzone">
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 300cb7d1d..9e960bdc9 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -151,7 +151,20 @@
 	<script type="text/javascript" src="view/js/fancybox/jquery.fancybox.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 	<script type="text/javascript" src="view/js/fancybox/fancybox.config.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 	<script type="text/javascript" src="view/js/vanillaEmojiPicker/vanillaEmojiPicker.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-
+	<script>
+	window.onload = function(){
+		new EmojiPicker({
+			trigger: [
+				{
+					selector: '.emojis',
+					insertInto: ['#comment-edit-text-0', '.profile-jot-text-full', '.comment-edit-text-full']
+				}
+			],
+			closeButton: true
+		});
+	};
+	</script>
+	
 	{{* Include the strings which are needed for some js functions (e.g. translation)
 They are loaded into the html <head> so that js functions can use them *}}
 	{{include file="js_strings.tpl"}}
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index cf62a89f6..b38babebf 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -182,17 +182,4 @@ can load different content into the jot modal (e.g. the item edit jot)
 
 <script>
 	dzFactory.setupDropzone('#jot-text-wrap', 'profile-jot-text'); 
-</script>
-<script>
-window.onload = function(){
-	new EmojiPicker({
-		trigger: [
-			{
-				selector: '.emojis',
-				insertInto: '.profile-jot-text'
-			}
-		],
-		closeButton: true,
-	});
-};
-</script>
+</script>
\ No newline at end of file
