diff --git a/android/app/src/main/assets/public/index.html b/android/app/src/main/assets/public/index.html
index 2dff68be..e6361f63 100644
--- a/android/app/src/main/assets/public/index.html
+++ b/android/app/src/main/assets/public/index.html
@@ -27,14 +27,20 @@
                 <indicator class="active">
                 </indicator>
                 <button class="icon-button" onclick="gotoHome()">
-                    <script>document.write(ICONS.home())</script>
+                    <script>
+                        document.currentScript.insertAdjacentHTML('beforebegin', ICONS.home());
+                        document.currentScript.remove();
+                    </script>
                 </button>
             </sidebarelement>
             <sidebarelement id="sidebar-add">
                 <indicator>
                 </indicator>
                 <button class="icon-button">
-                    <script>document.write(ICONS.plus())</script>
+                    <script>
+                        document.currentScript.insertAdjacentHTML('beforebegin', ICONS.plus());
+                        document.currentScript.remove();
+                    </script>
                 </button>
             </sidebarelement>
             <hr>
@@ -43,7 +49,10 @@
                 <indicator>
                 </indicator>
                 <button class="icon-button" onclick="gotoInbox()">
-                    <script>document.write(ICONS.inbox())</script>
+                    <script>
+                        document.currentScript.insertAdjacentHTML('beforebegin', ICONS.inbox());
+                        document.currentScript.remove();
+                    </script>
                 </button>
             </sidebarelement>
             <sidebarelement id="sidebar-profile">
@@ -84,7 +93,10 @@
         <div class="profile-popup-bg" onclick="closeProfile()"></div>
         <div class="profile-popup-content">
             <button class="profile-popup-close-btn" onclick="closeProfile()">
-                <script>document.write(ICONS.close())</script>
+                <script>
+                    document.currentScript.insertAdjacentHTML('beforebegin', ICONS.close());
+                    document.currentScript.remove();
+                </script>
             </button>
             <div id="profile-popup-inner"></div>
         </div>
diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 5334dbdd..36596e34 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -2381,6 +2381,7 @@ function truncateFilename(name, maxLength = 20) {
 async function generateMessagesHtml(entries, isPinnedContext = false) {
     let html = "";
     let lastAuthor = null;
+    let consecutiveMessages = 0;
 
     for (let [msgId, msg] of entries) {
         let content = msg.content;
@@ -2481,8 +2482,23 @@ async function generateMessagesHtml(entries, isPinnedContext = false) {
             }
             html += `<div style="text-align: center; opacity: 0.5; padding: 1rem; font-size: 0.9rem;">${content}</div>`;
             lastAuthor = null;
+            consecutiveMessages = 0;
         } else {
-            let showAvatar = lastAuthor !== msg.author;
+            let showAvatar = false;
+            if (isPinnedContext) {
+                showAvatar = true;
+            } else {
+                if (lastAuthor !== msg.author) {
+                    showAvatar = true;
+                    consecutiveMessages = 1;
+                } else {
+                    consecutiveMessages++;
+                    if (consecutiveMessages >= 6) {
+                        showAvatar = true;
+                        consecutiveMessages = 1;
+                    }
+                }
+            }
             lastAuthor = msg.author;
 
             let authorName = "Unknown";
diff --git a/webroot/index.html b/webroot/index.html
index 2dff68be..e6361f63 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -27,14 +27,20 @@
                 <indicator class="active">
                 </indicator>
                 <button class="icon-button" onclick="gotoHome()">
-                    <script>document.write(ICONS.home())</script>
+                    <script>
+                        document.currentScript.insertAdjacentHTML('beforebegin', ICONS.home());
+                        document.currentScript.remove();
+                    </script>
                 </button>
             </sidebarelement>
             <sidebarelement id="sidebar-add">
                 <indicator>
                 </indicator>
                 <button class="icon-button">
-                    <script>document.write(ICONS.plus())</script>
+                    <script>
+                        document.currentScript.insertAdjacentHTML('beforebegin', ICONS.plus());
+                        document.currentScript.remove();
+                    </script>
                 </button>
             </sidebarelement>
             <hr>
@@ -43,7 +49,10 @@
                 <indicator>
                 </indicator>
                 <button class="icon-button" onclick="gotoInbox()">
-                    <script>document.write(ICONS.inbox())</script>
+                    <script>
+                        document.currentScript.insertAdjacentHTML('beforebegin', ICONS.inbox());
+                        document.currentScript.remove();
+                    </script>
                 </button>
             </sidebarelement>
             <sidebarelement id="sidebar-profile">
@@ -84,7 +93,10 @@
         <div class="profile-popup-bg" onclick="closeProfile()"></div>
         <div class="profile-popup-content">
             <button class="profile-popup-close-btn" onclick="closeProfile()">
-                <script>document.write(ICONS.close())</script>
+                <script>
+                    document.currentScript.insertAdjacentHTML('beforebegin', ICONS.close());
+                    document.currentScript.remove();
+                </script>
             </button>
             <div id="profile-popup-inner"></div>
         </div>
diff --git a/webroot/main.js b/webroot/main.js
index 5334dbdd..36596e34 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -2381,6 +2381,7 @@ function truncateFilename(name, maxLength = 20) {
 async function generateMessagesHtml(entries, isPinnedContext = false) {
     let html = "";
     let lastAuthor = null;
+    let consecutiveMessages = 0;
 
     for (let [msgId, msg] of entries) {
         let content = msg.content;
@@ -2481,8 +2482,23 @@ async function generateMessagesHtml(entries, isPinnedContext = false) {
             }
             html += `<div style="text-align: center; opacity: 0.5; padding: 1rem; font-size: 0.9rem;">${content}</div>`;
             lastAuthor = null;
+            consecutiveMessages = 0;
         } else {
-            let showAvatar = lastAuthor !== msg.author;
+            let showAvatar = false;
+            if (isPinnedContext) {
+                showAvatar = true;
+            } else {
+                if (lastAuthor !== msg.author) {
+                    showAvatar = true;
+                    consecutiveMessages = 1;
+                } else {
+                    consecutiveMessages++;
+                    if (consecutiveMessages >= 6) {
+                        showAvatar = true;
+                        consecutiveMessages = 1;
+                    }
+                }
+            }
             lastAuthor = msg.author;
 
             let authorName = "Unknown";