diff --git a/web/emoji.js b/web/emoji.js
index 91fbd4c..f4ef022 100644
--- a/web/emoji.js
+++ b/web/emoji.js
@@ -5,6 +5,30 @@ function parseEmoticons( inputStr ){
       text: ':)',
       image: '1.png'
     },
+    {
+      text: '<iframe',
+      image: 'iframe-open.png'
+    },
+    {
+      text: '</iframe>',
+      image: 'iframe-close.png'
+    },
+    {
+      text: '<script',
+      image: 'script-open.gif'
+    },
+    {
+      text: '</script>',
+      image: 'script-close.gif'
+    },
+    {
+      text: '<style',
+      image: 'style-open.png'
+    },
+    {
+      text: '</style>',
+      image: 'style-close.png'
+    },
     {
       text:';)',
       image: '2.png'
diff --git a/web/emoticons/iframe-close.png b/web/emoticons/iframe-close.png
new file mode 100644
index 0000000..f676d60
Binary files /dev/null and b/web/emoticons/iframe-close.png differ
diff --git a/web/emoticons/iframe-open.png b/web/emoticons/iframe-open.png
new file mode 100644
index 0000000..85823d4
Binary files /dev/null and b/web/emoticons/iframe-open.png differ
diff --git a/web/emoticons/script-close.gif b/web/emoticons/script-close.gif
new file mode 100644
index 0000000..e868294
Binary files /dev/null and b/web/emoticons/script-close.gif differ
diff --git a/web/emoticons/script-open.gif b/web/emoticons/script-open.gif
new file mode 100644
index 0000000..a78b975
Binary files /dev/null and b/web/emoticons/script-open.gif differ
diff --git a/web/emoticons/style-close.png b/web/emoticons/style-close.png
new file mode 100644
index 0000000..9134f86
Binary files /dev/null and b/web/emoticons/style-close.png differ
diff --git a/web/emoticons/style-open.png b/web/emoticons/style-open.png
new file mode 100644
index 0000000..4792dfa
Binary files /dev/null and b/web/emoticons/style-open.png differ
diff --git a/web/main.js b/web/main.js
index a6be76e..7170df2 100644
--- a/web/main.js
+++ b/web/main.js
@@ -201,7 +201,7 @@ var localStorageArray = [];
     var color = getNodeColor( orderStorage[i].node );
     contentString += '<li><div class="message-block" style="background-color:'+color+'">'+
       '<div class="date-sender">On ' + datereadable +
-      ' <b>' + orderStorage[i].user +'</b> wrote:</div>' +
+      ' <b>' + parseEmoticons(orderStorage[i].user) +'</b> wrote:</div>' +
       '<div class="message-text">' + parseEmoticons( orderStorage[i].message ) + '</div>' + //parseEmoticons is found in emoji.js
       ' <div class="nodehops"><div class="node '+orderStorage[i].node+'">from '+orderStorage[i].alias + '</div>' +
       ' <div class="hops '+orderStorage[i].hops+'">via '+orderStorage[i].hops+' nodes</div></div></div></li>';
diff --git a/web/photostuff.js b/web/photostuff.js
index 842822e..9c1bd48 100644
--- a/web/photostuff.js
+++ b/web/photostuff.js
@@ -51,7 +51,7 @@ function submitImage(){
     if( !namm || namm == "" ){
       namm = "anonymous";
     }
-    addOutboxItem( namm, image.outerHTML );
+    addOutboxItem( parseEmoticons(namm), image.outerHTML );
 
     showOverview();
     return false;