diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 3846c2c3e3..28bc0c4332 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -941,4 +941,36 @@ function toggleDropdownText(elm) {
 function hasClass(elem, cls) {
 	return (" " + elem.className + " ").indexOf(" " + cls + " ") > -1;
 }
+
+function insertEmoji(target, item){
+	let dest = '';
+	switch (target) {
+		case 'comment':
+			dest='#comment-edit-text-' + item;
+			break;
+		case 'jot':
+			dest='.profile-jot-text';
+			break;
+		case 'pn':
+			dest='#comment-edit-text-input';
+	}
+	emojiPicker(dest)
+};
+
+function emojiPicker(dest) {
+	console.log(this);
+	if (typeof this.EmojiPicker == "undefined") {
+
+		new EmojiPicker({
+			trigger: [
+				{
+					selector: '.emojis',
+					insertInto: dest
+				}
+			],
+			closeButton: true,
+		});
+	}
+	console.log(this);
+}
 // @license-end
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 45a6116aa3..b9fc557833 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}}" onclick="insertEmoji('comment',{{$id}});">
+					<i class="fa fa-smile-o"></i>
+				</button>
 			</span>
 			</p>
 			<div id="dropzone-{{$id}}" class="dropzone">
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index cf62a89f69..01475c8dc5 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -108,7 +108,7 @@
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormattingToPost('i');"><i class="fa fa-italic"></i></button></li>
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
 						<li role="presentation"><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
-						<li role="presentation"><button type="button" class="hidden-xs btn-link icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}"><i class="fa fa-smile-o"></i></button></li>
+						<li role="presentation"><button type="button" class="hidden-xs btn-link icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}" onclick="insertEmoji('jot');"><i class="fa fa-smile-o"></i></button></li>
 						<li role="presentation"><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
 						<li role="presentation"><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkDropper(event);" ondragover="return linkDropper(event);" ondrop="linkDrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
 						<li role="presentation"><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
@@ -183,16 +183,3 @@ 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>
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index ce61ffbe8c..3f9ac637df 100644
--- a/view/theme/frio/templates/prv_message.tpl
+++ b/view/theme/frio/templates/prv_message.tpl
@@ -59,6 +59,11 @@
 						<i class="fa fa-quote-left" aria-hidden="true"></i>
 					</button>
 				</li>
+				<li>
+					<button type="button" class="btn-link icton emojis" style="cursor: pointer;" title="{{$edemojis}}" data-role="insert-emoji" data-comment=" " onclick="insertEmoji('pn');">
+						<i class="fa fa-smile-o"></i>
+					</button>
+				</li>
 			</ul>
 
 	<div id="prvmail-text-bb-end"></div>