diff --git a/src/plugins/chatview/index.js b/src/plugins/chatview/index.js
index 1dff896252..ca6fdf98e8 100644
--- a/src/plugins/chatview/index.js
+++ b/src/plugins/chatview/index.js
@@ -51,7 +51,7 @@ converse.plugins.add('converse-chatview', {
             'time_format': 'HH:mm',
             'use_system_emojis': true,
             'visible_toolbar_buttons': {
-                'call': true,
+                'call': false,
                 'clear': true,
                 'emoji': true,
                 'spoiler': true
diff --git a/src/shared/chat/toolbar.js b/src/shared/chat/toolbar.js
index 0d00489d54..6239a7265d 100644
--- a/src/shared/chat/toolbar.js
+++ b/src/shared/chat/toolbar.js
@@ -54,6 +54,16 @@ export class ChatToolbar extends CustomElement {
             buttons.push(html`<converse-emoji-dropdown .chatview=${chatview}></converse-emoji-dropdown>`);
         }
 
+        if (this.show_call_button) {
+            const color = this.is_groupchat ? '--muc-toolbar-btn-color' : '--chat-toolbar-btn-color';
+            const i18n_start_call = __('Start a call');
+            buttons.push(html`
+                <button class="toggle-call" @click=${this.toggleCall} title="${i18n_start_call}">
+                    <converse-icon color="var(${color})" class="fa fa-phone" size="1em"></converse-icon>
+                </button>`
+            );
+        }
+        
         const message_limit = api.settings.get('message_limit');
         if (message_limit) {
             buttons.push(html`