diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 5a4744a6506..c0bf984e078 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3850,14 +3850,16 @@ function forum_print_discussion_header(&$post, $forum, $group = -1, $datestring
     $postuser = username_load_fields_from_object($postuser, $post, null, $postuserfields);
     $postuser->id = $post->userid;
     echo '<td class="author">';
-    echo '<span class="picture">';
+    echo '<div class="media">';
+    echo '<span class="pull-left">';
     echo $OUTPUT->user_picture($postuser, array('courseid'=>$forum->course));
     echo '</span>';
-    echo '<span class="name">';
     // User name
+    echo '<div class="media-body">';
     $fullname = fullname($postuser, has_capability('moodle/site:viewfullnames', $modcontext));
     echo '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$post->userid.'&amp;course='.$forum->course.'">'.$fullname.'</a>';
-    echo '</span>';
+    echo '</div>';
+    echo '</div>';
     echo "</td>\n";
 
     // Group picture
diff --git a/mod/forum/styles.css b/mod/forum/styles.css
index 147285670bc..9a7d2175bd2 100644
--- a/mod/forum/styles.css
+++ b/mod/forum/styles.css
@@ -122,10 +122,6 @@
     margin: 0 .3em;
 }
 
-.path-mod-forum .forumheaderlist .picture {
-    width: 35px;
-}
-
 .path-mod-forum .forumheaderlist .discussion .starter {
     vertical-align: middle;
 }
@@ -139,8 +135,7 @@
     text-align: right;
 }
 
-.path-mod-forum .forumheaderlist .replies,
-.path-mod-forum .forumheaderlist .discussion .author {
+.path-mod-forum .forumheaderlist .replies {
     white-space: nowrap;
 }
 
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index 040472037e3..984a6fb48f0 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -77,7 +77,6 @@ select {
         }
 
         .discussion {
-            .author,
             .replies,
             .lastpost {
                 white-space: normal;
@@ -91,8 +90,6 @@ select {
             .topic,
             .discussionsubscription,
             .topic.starter,
-            .picture,
-            .author,
             .replies,
             .lastpost {
                 vertical-align: top;
diff --git a/theme/bootstrapbase/less/moodle/modules.less b/theme/bootstrapbase/less/moodle/modules.less
index ac888792c99..e91e5429fe5 100644
--- a/theme/bootstrapbase/less/moodle/modules.less
+++ b/theme/bootstrapbase/less/moodle/modules.less
@@ -104,7 +104,6 @@ body.path-mod-feedback #region-main .mform.feedback_form .feedback-item-pagebrea
             }
         }
         .discussion {
-            .author,
             .replies,
             .lastpost {
                 white-space: normal;
@@ -116,15 +115,10 @@ body.path-mod-feedback #region-main .mform.feedback_form .feedback-item-pagebrea
             .topic,
             .discussionsubscription,
             .topic.starter,
-            .author,
             .replies,
             .lastpost {
                 vertical-align: top;
             }
-            .picture {
-                margin: 0 20px;
-                float: left;
-            }
             .unread {
                 img {
                     margin: 0;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index becc7cbb12e..652aeb12b4f 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -17342,7 +17342,6 @@ body.path-mod-feedback #region-main .mform.feedback_form .feedback-item-pagebrea
   padding-left: 0.5em;
   padding-right: 0.5em;
 }
-.path-mod-forum .forumheaderlist .discussion .author,
 .path-mod-forum .forumheaderlist .discussion .replies,
 .path-mod-forum .forumheaderlist .discussion .lastpost {
   white-space: normal;
@@ -17354,15 +17353,10 @@ body.path-mod-feedback #region-main .mform.feedback_form .feedback-item-pagebrea
 .path-mod-forum .forumheaderlist .discussion .topic,
 .path-mod-forum .forumheaderlist .discussion .discussionsubscription,
 .path-mod-forum .forumheaderlist .discussion .topic.starter,
-.path-mod-forum .forumheaderlist .discussion .author,
 .path-mod-forum .forumheaderlist .discussion .replies,
 .path-mod-forum .forumheaderlist .discussion .lastpost {
   vertical-align: top;
 }
-.path-mod-forum .forumheaderlist .discussion .picture {
-  margin: 0 20px;
-  float: left;
-}
 .path-mod-forum .forumheaderlist .discussion .unread img {
   margin: 0;
 }