diff --git a/conversejs/custom/sass/_peertubetheme.scss b/conversejs/custom/sass/_peertubetheme.scss
new file mode 100644
index 00000000..fa6b9acc
--- /dev/null
+++ b/conversejs/custom/sass/_peertubetheme.scss
@@ -0,0 +1,14 @@
+#conversejs.theme-peertube {
+  // hidding avatars when screen width is not big enough.
+  @media screen and (max-width: 576px) {
+    .message {
+      .chat-msg__content {
+        width: 100%;
+      }
+
+      .chat-msg__avatar {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/conversejs/custom/sass/livechat.scss b/conversejs/custom/sass/livechat.scss
index b307e995..520e392c 100644
--- a/conversejs/custom/sass/livechat.scss
+++ b/conversejs/custom/sass/livechat.scss
@@ -1,5 +1,6 @@
 @import "./variables";
 @import "sass/converse";
+@import "./peertubetheme";
 
 body.livechat-iframe #conversejs .chat-head {
   // Hidding the chat-head when the plugin is displayed in an iframe.
@@ -7,6 +8,7 @@ body.livechat-iframe #conversejs .chat-head {
 }
 
 #conversejs-bg {
+  // We are using a custom template that differs from the original, this is required.
   .converse-brand__heading {
     img {
       margin-top: 0.3em;