diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index b3267fedb42..916902efea3 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -225,6 +225,9 @@ a.autolink.glossary:hover {
 .pagingbar .thispage {
     font-weight: bold;
 }
+img.userpicture {
+    margin-right: 5px;
+}
 img.resize {
     height: 1em;
     width: 1em;
@@ -559,7 +562,6 @@ a.skip:active {
 }
 .notepost .userpicture {
     float: left;
-    margin-right: 5px;
 }
 .notepost .content,
 .notepost .footer {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index aaec798bba6..a7a1f8d2d97 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -195,6 +195,9 @@ a.autolink.glossary:hover {
 .pagingbar .thispage {
   font-weight: bold;
 }
+img.userpicture {
+  margin-right: 5px;
+}
 img.resize {
   height: 1em;
   width: 1em;
@@ -518,7 +521,6 @@ a.skip:active {
 }
 .notepost .userpicture {
   float: left;
-  margin-right: 5px;
 }
 .notepost .content,
 .notepost .footer {