diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 708fabfbd52..97c0327d490 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -363,11 +363,6 @@ a.autolink.glossary:hover {
     font-weight: bold;
 }
 
-img.userpicture,
-.userinitials {
-    margin-right: 0.5rem;
-}
-
 img.resize {
     height: 1em;
     width: 1em;
@@ -2917,3 +2912,13 @@ body.dragging {
         }
     }
 }
+
+.dropdown-toggle::after {
+    content: $fa-var-chevron-down;
+    margin-right: 0;
+    margin-left: 4px;
+    @include fa-icon();
+    font-size: 9px;
+    width: 9px;
+    border: 0;
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 53f97b95ce2..780855d8786 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10180,10 +10180,6 @@ a.autolink.glossary:hover {
 .pagingbar .thispage {
   font-weight: bold; }
 
-img.userpicture,
-.userinitials {
-  margin-right: 0.5rem; }
-
 img.resize {
   height: 1em;
   width: 1em; }
@@ -12216,6 +12212,20 @@ body.dragging .dragging {
     padding-right: 0 !important;
     /* stylelint-disable-line declaration-no-important */ }
 
+.dropdown-toggle::after {
+  content: "";
+  margin-right: 0;
+  margin-left: 4px;
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-size: 9px;
+  width: 9px;
+  border: 0; }
+
 .icon {
   font-size: 16px;
   width: 16px;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 0c1fea70601..98c52053977 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -10180,10 +10180,6 @@ a.autolink.glossary:hover {
 .pagingbar .thispage {
   font-weight: bold; }
 
-img.userpicture,
-.userinitials {
-  margin-right: 0.5rem; }
-
 img.resize {
   height: 1em;
   width: 1em; }
@@ -12216,6 +12212,20 @@ body.dragging .dragging {
     padding-right: 0 !important;
     /* stylelint-disable-line declaration-no-important */ }
 
+.dropdown-toggle::after {
+  content: "";
+  margin-right: 0;
+  margin-left: 4px;
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-size: 9px;
+  width: 9px;
+  border: 0; }
+
 .icon {
   font-size: 16px;
   width: 16px;