diff --git a/css/converse.css b/css/converse.css
index b6ee1a272..452e96f62 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -9634,11 +9634,11 @@ body.reset {
 #conversejs .xmpp-status .fa-dot-circle-o,
 #conversejs .roster-contacts .fa-dot-circle-o {
   color: #E7A151; }
-#conversejs .set-xmpp-status .fa-circle-o,
+#conversejs .set-xmpp-status .far.fa-circle,
 #conversejs .set-xmpp-status .fa-times-circle,
-#conversejs .xmpp-status .fa-circle-o,
+#conversejs .xmpp-status .far.fa-circle,
 #conversejs .xmpp-status .fa-times-circle,
-#conversejs .roster-contacts .fa-circle-o,
+#conversejs .roster-contacts .far.fa-circle,
 #conversejs .roster-contacts .fa-times-circle {
   color: #A8ABA1; }
 #conversejs .room-info {
@@ -10256,7 +10256,7 @@ body.reset {
         color: #f0a794; }
       #conversejs .items-list .list-item.open .fa-dot-circle-o {
         color: #f0c594; }
-      #conversejs .items-list .list-item.open .fa-circle-o,
+      #conversejs .items-list .list-item.open .far .fa-circle,
       #conversejs .items-list .list-item.open .fa-times-circle {
         color: #e6e7e4; }
     #conversejs .items-list .list-item:hover {
diff --git a/dist/converse.js b/dist/converse.js
index 9d5995275..a60e4327c 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -76190,17 +76190,17 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         },
 
         renderRosterItem(item) {
-          let status_icon = 'fa-times-circle';
+          let status_icon = 'fa fa-times-circle';
           const show = item.presence.get('show') || 'offline';
 
           if (show === 'online') {
-            status_icon = 'fa-circle';
+            status_icon = 'fa fa-circle';
           } else if (show === 'away') {
-            status_icon = 'fa-dot-circle-o';
+            status_icon = 'fa fa-dot-circle';
           } else if (show === 'xa') {
-            status_icon = 'fa-circle-o';
+            status_icon = 'far fa-circle';
           } else if (show === 'dnd') {
-            status_icon = 'fa-minus-circle';
+            status_icon = 'fa fa-minus-circle';
           }
 
           const display_name = item.getDisplayName();
@@ -77781,13 +77781,13 @@ __e(o.label_busy) +
  if (o.status === 'away') { ;
 __p += ' checked="checked" ';
  } ;
-__p += '\n                                   type="radio" id="radio-away" value="away" name="chat_status" class="custom-control-input">\n                            <label class="custom-control-label" for="radio-away">\n                                <span class="fa fa-dot-circle-o"></span>&nbsp;' +
+__p += '\n                                   type="radio" id="radio-away" value="away" name="chat_status" class="custom-control-input">\n                            <label class="custom-control-label" for="radio-away">\n                                <span class="fa fa-dot-circle"></span>&nbsp;' +
 __e(o.label_away) +
 '</label>\n                        </div>\n                        <div class="custom-control custom-radio">\n                            <input ';
  if (o.status === 'xa') { ;
 __p += ' checked="checked" ';
  } ;
-__p += '\n                                   type="radio" id="radio-xa" value="xa" name="chat_status" class="custom-control-input">\n                            <label class="custom-control-label" for="radio-xa">\n                                <span class="fa fa-circle-o"></span>&nbsp;' +
+__p += '\n                                   type="radio" id="radio-xa" value="xa" name="chat_status" class="custom-control-input">\n                            <label class="custom-control-label" for="radio-xa">\n                                <span class="far fa-circle"></span>&nbsp;' +
 __e(o.label_xa) +
 '</label>\n                        </div>\n                    </div>\n                    <div class="btn-group w-100">\n                        <input name="status_message" type="text" class="form-control" \n                               value="' +
 __e(o.status_message) +
@@ -79313,7 +79313,7 @@ __p += '</div>';
  } ;
 __p += '\n            ';
  if (o.type !== 'headline' && !o.is_me_message && o.sender === 'me') { ;
-__p += '\n            <div class="chat-msg__actions">\n                <button class="chat-msg__action chat-msg__action-edit fa fa-pencil" title="' +
+__p += '\n            <div class="chat-msg__actions">\n                <button class="chat-msg__action chat-msg__action-edit fa fa-pencil-alt" title="' +
 __e(o.__('Edit this message')) +
 '">&nbsp;</button>\n            </div>\n            ';
  } ;
@@ -79646,29 +79646,29 @@ __p += '\n</div>\n<div class="d-flex xmpp-status">\n    <span class="' +
 __e(o.chat_status) +
 ' w-100 align-self-center" data-value="' +
 __e(o.chat_status) +
-'">\n        <span class="fa\n            ';
+'">\n        <span class="\n            ';
  if (o.chat_status === 'online') { ;
-__p += ' fa-circle ';
+__p += ' fa fa-circle ';
  } ;
 __p += '\n            ';
  if (o.chat_status === 'dnd') { ;
-__p += ' fa-minus-circle ';
+__p += ' fa fa-minus-circle ';
  } ;
 __p += '\n            ';
  if (o.chat_status === 'away') { ;
-__p += ' fa-dot-circle-o ';
+__p += ' fa fa-dot-circle ';
  } ;
 __p += '\n            ';
  if (o.chat_status === 'xa') { ;
-__p += ' fa-circle-o ';
+__p += ' far fa-circle ';
  } ;
 __p += '\n            ';
  if (o.chat_status === 'offline') { ;
-__p += ' fa-times-circle ';
+__p += ' fa fa-times-circle ';
  } ;
 __p += '"></span> ' +
 __e(o.status_message) +
-'</span>\n    <a class="chatbox-btn change-status fa fa-pencil" title="' +
+'</span>\n    <a class="chatbox-btn change-status fa fa-pencil-alt" title="' +
 __e(o.title_change_status) +
 '" data-toggle="modal" data-target="#changeStatusModal"></a>\n</div>\n</div>\n';
 return __p
@@ -80246,7 +80246,7 @@ __p += ' unread-msgs ';
  } ;
 __p += '"\n   title="' +
 __e(o.desc_chat) +
-'" href="#">\n    <span class="fa ' +
+'" href="#">\n    <span class="' +
 __e(o.status_icon) +
 '" title="' +
 __e(o.desc_status) +
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index 9951ad52a..9437a5fbb 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -32,7 +32,7 @@
         .fa-dot-circle-o {
             color: $orange,
         }
-        .fa-circle-o,
+        .far.fa-circle,
         .fa-times-circle {
             color: $subdued-color;
         }
diff --git a/sass/_lists.scss b/sass/_lists.scss
index eda1a8854..5ecf18866 100644
--- a/sass/_lists.scss
+++ b/sass/_lists.scss
@@ -90,7 +90,7 @@
                 .fa-dot-circle-o {
                     color: lighten($orange, 15%);
                 }
-                .fa-circle-o,
+                .far .fa-circle,
                 .fa-times-circle {
                     color: lighten($subdued-color, 25%);
                 }
diff --git a/src/converse-rosterview.js b/src/converse-rosterview.js
index df57cfb3e..e5660db0d 100644
--- a/src/converse-rosterview.js
+++ b/src/converse-rosterview.js
@@ -472,16 +472,16 @@
                 },
 
                 renderRosterItem (item) {
-                    let status_icon = 'fa-times-circle';
+                    let status_icon = 'fa fa-times-circle';
                     const show = item.presence.get('show') || 'offline';
                     if (show === 'online') {
-                        status_icon = 'fa-circle';
+                        status_icon = 'fa fa-circle';
                     } else if (show === 'away') {
-                        status_icon = 'fa-dot-circle-o';
+                        status_icon = 'fa fa-dot-circle';
                     } else if (show === 'xa') {
-                        status_icon = 'fa-circle-o';
+                        status_icon = 'far fa-circle';
                     } else if (show === 'dnd') {
-                        status_icon = 'fa-minus-circle';
+                        status_icon = 'fa fa-minus-circle';
                     }
                     const display_name = item.getDisplayName();
                     this.el.innerHTML = tpl_roster_item(
diff --git a/src/templates/chat_status_modal.html b/src/templates/chat_status_modal.html
index 25bbe9925..fcf6aa90e 100644
--- a/src/templates/chat_status_modal.html
+++ b/src/templates/chat_status_modal.html
@@ -27,13 +27,13 @@
                             <input {[ if (o.status === 'away') { ]} checked="checked" {[ } ]}
                                    type="radio" id="radio-away" value="away" name="chat_status" class="custom-control-input">
                             <label class="custom-control-label" for="radio-away">
-                                <span class="fa fa-dot-circle-o"></span>&nbsp;{{{o.label_away}}}</label>
+                                <span class="fa fa-dot-circle"></span>&nbsp;{{{o.label_away}}}</label>
                         </div>
                         <div class="custom-control custom-radio">
                             <input {[ if (o.status === 'xa') { ]} checked="checked" {[ } ]}
                                    type="radio" id="radio-xa" value="xa" name="chat_status" class="custom-control-input">
                             <label class="custom-control-label" for="radio-xa">
-                                <span class="fa fa-circle-o"></span>&nbsp;{{{o.label_xa}}}</label>
+                                <span class="far fa-circle"></span>&nbsp;{{{o.label_xa}}}</label>
                         </div>
                     </div>
                     <div class="btn-group w-100">
diff --git a/src/templates/message.html b/src/templates/message.html
index 0430fd44f..a886045c0 100644
--- a/src/templates/message.html
+++ b/src/templates/message.html
@@ -26,7 +26,7 @@
             {[ if (!o.is_me_message) { ]}</div>{[ } ]}
             {[ if (o.type !== 'headline' && !o.is_me_message && o.sender === 'me') { ]}
             <div class="chat-msg__actions">
-                <button class="chat-msg__action chat-msg__action-edit fa fa-pencil" title="{{{o.__('Edit this message')}}}">&nbsp;</button>
+                <button class="chat-msg__action chat-msg__action-edit fa fa-pencil-alt" title="{{{o.__('Edit this message')}}}">&nbsp;</button>
             </div>
             {[ } ]}
 
diff --git a/src/templates/profile_view.html b/src/templates/profile_view.html
index a23533d33..af7aa9f65 100644
--- a/src/templates/profile_view.html
+++ b/src/templates/profile_view.html
@@ -12,12 +12,12 @@
 </div>
 <div class="d-flex xmpp-status">
     <span class="{{{o.chat_status}}} w-100 align-self-center" data-value="{{{o.chat_status}}}">
-        <span class="fa
-            {[ if (o.chat_status === 'online') { ]} fa-circle {[ } ]}
-            {[ if (o.chat_status === 'dnd') { ]} fa-minus-circle {[ } ]}
-            {[ if (o.chat_status === 'away') { ]} fa-dot-circle-o {[ } ]}
-            {[ if (o.chat_status === 'xa') { ]} fa-circle-o {[ } ]}
-            {[ if (o.chat_status === 'offline') { ]} fa-times-circle {[ } ]}"></span> {{{o.status_message}}}</span>
-    <a class="chatbox-btn change-status fa fa-pencil" title="{{{o.title_change_status}}}" data-toggle="modal" data-target="#changeStatusModal"></a>
+        <span class="
+            {[ if (o.chat_status === 'online') { ]} fa fa-circle {[ } ]}
+            {[ if (o.chat_status === 'dnd') { ]} fa fa-minus-circle {[ } ]}
+            {[ if (o.chat_status === 'away') { ]} fa fa-dot-circle {[ } ]}
+            {[ if (o.chat_status === 'xa') { ]} far fa-circle {[ } ]}
+            {[ if (o.chat_status === 'offline') { ]} fa fa-times-circle {[ } ]}"></span> {{{o.status_message}}}</span>
+    <a class="chatbox-btn change-status fa fa-pencil-alt" title="{{{o.title_change_status}}}" data-toggle="modal" data-target="#changeStatusModal"></a>
 </div>
 </div>
diff --git a/src/templates/roster_item.html b/src/templates/roster_item.html
index df0d1305d..cfa31bfb3 100644
--- a/src/templates/roster_item.html
+++ b/src/templates/roster_item.html
@@ -1,6 +1,6 @@
 <a class="list-item-link cbox-list-item open-chat w-100 {[ if (o.num_unread) { ]} unread-msgs {[ } ]}"
    title="{{{o.desc_chat}}}" href="#">
-    <span class="fa {{{o.status_icon}}}" title="{{{o.desc_status}}}"></span>
+    <span class="{{{o.status_icon}}}" title="{{{o.desc_status}}}"></span>
     {[ if (o.num_unread) { ]}
     <span class="msgs-indicator">{{{ o.num_unread }}}</span>
     {[ } ]}