diff --git a/src/plugins/muc-views/templates/muc-sidebar.js b/src/plugins/muc-views/templates/muc-sidebar.js
index fd687d36b..c8d5cc2a6 100644
--- a/src/plugins/muc-views/templates/muc-sidebar.js
+++ b/src/plugins/muc-views/templates/muc-sidebar.js
@@ -8,7 +8,7 @@ export default (o) => {
     return html`
         <div class="occupants-header">
             <i class="hide-occupants" @click=${o.closeSidebar}>
-                <converse-icon color="var(--text-color)" class="fa fa-times" size="1em"></converse-icon>
+                <converse-icon color="var(--subdued-color)" class="fa fa-times" size="1em"></converse-icon>
             </i>
             <div class="occupants-header--title">
                 <span class="occupants-heading">${i18n_participants}</span>
diff --git a/src/plugins/profile/templates/profile.js b/src/plugins/profile/templates/profile.js
index e96f71e72..4fdd4601b 100644
--- a/src/plugins/profile/templates/profile.js
+++ b/src/plugins/profile/templates/profile.js
@@ -8,14 +8,14 @@ import { html } from "lit";
 function tpl_signout (o) {
     const i18n_logout = __('Log out');
     return html`<a class="controlbox-heading__btn logout align-self-center" title="${i18n_logout}" @click=${o.logout}>
-        <converse-icon color="var(--subdued-color)" class="fa fa-sign-out-alt" size="1em"></converse-icon>
+        <converse-icon class="fa fa-sign-out-alt" size="1em"></converse-icon>
     </a>`
 }
 
 function tpl_user_settings_button (o) {
     const i18n_details = __('Show details about this chat client');
     return html`<a class="controlbox-heading__btn show-client-info align-self-center" title="${i18n_details}" @click=${o.showUserSettingsModal}>
-        <converse-icon color="var(--subdued-color)" class="fa fa-cog" size="1em"></converse-icon>
+        <converse-icon class="fa fa-cog" size="1em"></converse-icon>
     </a>`;
 }
 
diff --git a/src/plugins/roomslist/templates/roomslist.js b/src/plugins/roomslist/templates/roomslist.js
index 7a51c0681..660f2ec05 100644
--- a/src/plugins/roomslist/templates/roomslist.js
+++ b/src/plugins/roomslist/templates/roomslist.js
@@ -70,12 +70,12 @@ export default (o) => {
             <a class="controlbox-heading__btn show-list-muc-modal"
                 @click=${(ev) => api.modal.show(MUCListModal, { 'model': o.model }, ev)}
                 title="${i18n_title_list_rooms}" data-toggle="modal" data-target="#muc-list-modal">
-                    <converse-icon class="fa fa-list-ul right" color="var(--subdued-color)" path-prefix="/dist" size="1em"></converse-icon>
+                    <converse-icon class="fa fa-list-ul right" path-prefix="/dist" size="1em"></converse-icon>
             </a>
             <a class="controlbox-heading__btn show-add-muc-modal"
                 @click=${(ev) => api.modal.show(AddMUCModal, { 'model': o.model }, ev)}
                 title="${i18n_title_new_room}" data-toggle="modal" data-target="#add-chatrooms-modal">
-                    <converse-icon class="fa fa-plus right" color="var(--subdued-color)" path-prefix="/dist" size="1em"></converse-icon>
+                    <converse-icon class="fa fa-plus right" path-prefix="/dist" size="1em"></converse-icon>
             </a>
         </div>
 
diff --git a/src/plugins/rosterview/styles/roster.scss b/src/plugins/rosterview/styles/roster.scss
index 08d101565..f82be09f8 100644
--- a/src/plugins/rosterview/styles/roster.scss
+++ b/src/plugins/rosterview/styles/roster.scss
@@ -32,7 +32,6 @@
 
         span {
             padding: 0.3em;
-            cursor: pointer;
             min-width: 25px;
             text-align: center;
         }
@@ -42,6 +41,7 @@
             margin: 0.2em;
             font-size: calc(var(--font-size) - 2px);
         }
+
         .state-type {
             font-size: calc(var(--font-size) - 2px);
             width: 100%;
diff --git a/src/plugins/rosterview/templates/roster.js b/src/plugins/rosterview/templates/roster.js
index 3ba20be5f..e6f4f9837 100644
--- a/src/plugins/rosterview/templates/roster.js
+++ b/src/plugins/rosterview/templates/roster.js
@@ -47,7 +47,7 @@ export default (el) => {
         <div class="d-flex controlbox-padded">
             <span class="w-100 controlbox-heading controlbox-heading--contacts">${i18n_heading_contacts}</span>
             <a class="controlbox-heading__btn sync-contacts" @click=${ev => el.syncContacts(ev)} title="${i18n_title_sync_contacts}">
-                <converse-icon class="fa fa-sync right ${el.syncing_contacts ? 'fa-spin' : ''}" color="var(--subdued-color)" path-prefix="/dist" size="1em"></converse-icon>
+                <converse-icon class="fa fa-sync right ${el.syncing_contacts ? 'fa-spin' : ''}" size="1em"></converse-icon>
             </a>
             ${ api.settings.get('allow_contact_requests') ? html`
                 <a class="controlbox-heading__btn add-contact"
@@ -55,7 +55,7 @@ export default (el) => {
                     title="${i18n_title_add_contact}"
                     data-toggle="modal"
                     data-target="#add-contact-modal">
-                    <converse-icon class="fa fa-user-plus right" color="var(--subdued-color)" path-prefix="/dist" size="1.25em"></converse-icon>
+                    <converse-icon class="fa fa-user-plus right" size="1.25em"></converse-icon>
                 </a>` : '' }
         </div>
         <converse-roster-filter></converse-roster-filter>
diff --git a/src/plugins/rosterview/templates/roster_filter.js b/src/plugins/rosterview/templates/roster_filter.js
index bb87bb47b..faf14a8b8 100644
--- a/src/plugins/rosterview/templates/roster_filter.js
+++ b/src/plugins/rosterview/templates/roster_filter.js
@@ -21,9 +21,9 @@ export default (o) => {
             @submit=${o.submitFilter}>
             <div class="form-inline flex-nowrap">
                 <div class="filter-by d-flex flex-nowrap">
-                    <span @click=${o.changeTypeFilter} class="fa fa-user ${ (o.filter_type === 'contacts') ? 'selected' : '' }" data-type="contacts" title="${title_contact_filter}"></span>
-                    <span @click=${o.changeTypeFilter} class="fa fa-users ${ (o.filter_type === 'groups') ? 'selected' : '' }" data-type="groups" title="${title_group_filter}"></span>
-                    <span @click=${o.changeTypeFilter} class="fa fa-circle ${ (o.filter_type === 'state') ? 'selected' : '' }" data-type="state" title="${title_status_filter}"></span>
+                    <span @click=${o.changeTypeFilter} class="clickable fa fa-user ${ (o.filter_type === 'contacts') ? 'selected' : '' }" data-type="contacts" title="${title_contact_filter}"></span>
+                    <span @click=${o.changeTypeFilter} class="clickable fa fa-users ${ (o.filter_type === 'groups') ? 'selected' : '' }" data-type="groups" title="${title_group_filter}"></span>
+                    <span @click=${o.changeTypeFilter} class="clickable fa fa-circle ${ (o.filter_type === 'state') ? 'selected' : '' }" data-type="state" title="${title_status_filter}"></span>
                 </div>
                 <div class="btn-group">
                     <input .value="${o.filter_text || ''}"
diff --git a/src/shared/components/styles/icon.scss b/src/shared/components/styles/icon.scss
index 113111cde..84bd199b2 100644
--- a/src/shared/components/styles/icon.scss
+++ b/src/shared/components/styles/icon.scss
@@ -2,9 +2,17 @@ converse-icon {
     display: inline-block;
     padding: 0;
     margin: 0;
-    fill: var(--subdued-color);
-
-    &:hover {
-	fill: var(--text-color);
+    svg {
+	fill: var(--subdued-color);
+    }
+}
+
+a, .clickable {
+    converse-icon {
+	svg {
+	    &:hover {
+		fill: var(--icon-hover-color);
+	    }
+	}
     }
 }
diff --git a/src/shared/styles/_core.scss b/src/shared/styles/_core.scss
index 2ba711086..6cef79402 100644
--- a/src/shared/styles/_core.scss
+++ b/src/shared/styles/_core.scss
@@ -211,7 +211,7 @@
       cursor: pointer;
     }
 
-    a, a:visited, a:not([href]):not([tabindex]) {
+    a, a:visited, a:not([href]):not([tabindex]), .clickable {
         text-decoration: none;
         color: var(--link-color);
         text-shadow: none;
@@ -223,14 +223,19 @@
         }
 
         &.fa, &.far, &.fas {
-            fill: var(--subdued-color);
             color: var(--subdued-color);
             &:hover {
-                color: var(--gray-color);
+                color: var(--icon-hover-color);
             }
         }
     }
 
+    .clickable {
+        &:hover {
+            cursor: pointer;
+        }
+    }
+
     svg {
         border-radius: var(--chatbox-border-radius);
     }
@@ -239,10 +244,6 @@
         color: var(--subdued-color);
     }
 
-    .fa:hover, .far:hover, .fas:hover {
-        color: var(--gray-color);
-    }
-
     q {
       quotes: "“" "”" "‘" "’";
       &.reason {
diff --git a/src/shared/styles/themes/classic.scss b/src/shared/styles/themes/classic.scss
index db19b6286..ec6933321 100644
--- a/src/shared/styles/themes/classic.scss
+++ b/src/shared/styles/themes/classic.scss
@@ -19,6 +19,7 @@
 
     // ---
 
+    --icon-hover-color: var(--text-color);
     --info-color: #1E9652; // $dark-green
 
     --chat-status-online: var(--green);
diff --git a/src/shared/styles/themes/dracula.scss b/src/shared/styles/themes/dracula.scss
index 875afa091..ae640c584 100644
--- a/src/shared/styles/themes/dracula.scss
+++ b/src/shared/styles/themes/dracula.scss
@@ -22,6 +22,7 @@
 
     // ---
 
+    --icon-hover-color: var(--cyan);
     --gray-color: var(--comment);
 
     --highlight-color: var(--foreground);